search for: compare_xattrs

...ex 6a374af..72e95a1 100644 --- a/diff/diff.c +++ b/diff/diff.c @@ -58,6 +58,11 @@ const char *libvirt_uri = NULL; int inspector = 1; static int atime = 0; +static int compare_extra_stats = 1; +static int compare_perms = 1; +static int compare_times = 1; +static int compare_uids = 1; +static int compare_xattrs = 1; static int csv = 0; static int dir_links = 0; static int dir_times = 0; @@ -104,6 +109,11 @@ usage (int status) " --atime Don't ignore access time changes\n" " -A image Add image from second guest\n"...

...--git a/diff/diff.c b/diff/diff.c > index 6a374af..426184e 100644 > --- a/diff/diff.c > +++ b/diff/diff.c > @@ -66,6 +66,11 @@ static int enable_extra_stats = 0; > static int enable_times = 0; > static int enable_uids = 0; > static int enable_xattrs = 0; > +static int no_compare_xattrs = 0; > +static int no_compare_perms = 0; > +static int no_compare_extra_stats = 0; > +static int no_compare_times = 0; > +static int no_compare_uids = 0; Instead of "no_compare_XXXX", I'd name them "compare_XXX" defaulting to 1, as avoids some mind twisting in e...

...you suggest should be the name of the argument to show all the compare=False informations ? > > "len" in _list structs indicates the number of items in the list > itself, so I'd avoid resetting it to 0 otherwise this information is > lost. > Much better to check (no_)compare_xattrs in compare_stats. > Even better, if the xattrs comparison is off, then just avoid copying > xattrs_orig. > what is the problem if the information is lost ? there's the same information in xattrs_orig. Anyway, the second proposal is feasible but not similar to the strategies for other...

...ll + * always return -E2BIG (RHBZ#1811539). So we can't read it even if + * we wanted to. + * + * (4) The Linux kernel itself hides other attributes. + */ +static bool +not_hidden_xattr (const char *attrname) +{ + return STRNEQ (attrname, "user.WofCompressedData"); +} + static int compare_xattrs (const void *vxa1, const void *vxa2) { @@ -132,6 +157,7 @@ getxattrs (const char *path, { ssize_t len, vlen; CLEANUP_FREE char *buf = NULL; + CLEANUP_FREE /* not string list */ char **names_unfiltered = NULL; CLEANUP_FREE /* not string list */ char **names = NULL; size_t i; guestf...

v1 here: https://www.redhat.com/archives/libguestfs/2020-March/msg00099.html This one fixes most of the points picked up in review, and does not strdup the strings which should keep down memory usage if that is a concern. Rich.

https://bugzilla.redhat.com/show_bug.cgi?id=1811539 Commands including virt-diff which read extended attributes will sometimes fail on NTFS filesystems that are using system compressed. The reason is complex, see comment 5 of the bug linked above. This patch filters out the troublesome xattr. For justification, see the comment I added in patch 3. Patch 1 & 2 are refactoring. I was on the

...en (&buf[i]) + 1) { + if (add_string (&ret, &buf[i]) == -1) { + free_stringsbuf (&ret); + return NULL; + } + } + if (end_stringsbuf (&ret) == -1) { + free_stringsbuf (&ret); + return NULL; + } + + return take_stringsbuf (&ret); +} + static int compare_xattrs (const void *vxa1, const void *vxa2) { @@ -106,7 +135,8 @@ getxattrs (const char *path, { ssize_t len, vlen; CLEANUP_FREE char *buf = NULL; - size_t i, j; + CLEANUP_FREE_STRING_LIST char **names = NULL; + size_t i; guestfs_int_xattr_list *r = NULL; buf = _listxattrs (path, listxa...

...size_t i; + DECLARE_STRINGSBUF (ret); + + for (i = 0; i < len; i += strlen (&buf[i]) + 1) { + if (add_string_nodup (&ret, &buf[i]) == -1) + return NULL; + } + if (end_stringsbuf (&ret) == -1) + return NULL; + + return take_stringsbuf (&ret); +} + static int compare_xattrs (const void *vxa1, const void *vxa2) { @@ -106,7 +132,8 @@ getxattrs (const char *path, { ssize_t len, vlen; CLEANUP_FREE char *buf = NULL; - size_t i, j; + CLEANUP_FREE /* not string list */ char **names = NULL; + size_t i; guestfs_int_xattr_list *r = NULL; buf = _listxattrs (pa...

Hi, we needed these changes when we had to build a guest image compatible with a starting guest image but not backed by it in any way? We needed some tool to check our progress, comparing original and? rebuilt (from scratch) images, and virt-diff seemed the best option, but? we had to soften the comparison to reduce the noise in the output. I added some options to ignore certain informations when