search for: xattrs_orig

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

...gt; program_name, long_options[option_index].name, option_index); > @@ -404,6 +429,8 @@ struct file { > char *path; > struct guestfs_statns *stat; > struct guestfs_xattr_list *xattrs; > + struct guestfs_statns *stat_orig; > + struct guestfs_xattr_list *xattrs_orig; > char *csum; /* Checksum. If NULL, use file times and size. */ > }; > > @@ -466,6 +493,8 @@ visit_entry (const char *dir, const char *name, > char *path = NULL, *csum = NULL; > struct guestfs_statns *stat = NULL; > struct guestfs_xattr_list *xa...

...wn long option: %s (%d)\n"), program_name, long_options[option_index].name, option_index); @@ -404,6 +434,8 @@ struct file { char *path; struct guestfs_statns *stat; struct guestfs_xattr_list *xattrs; + struct guestfs_statns *stat_orig; + struct guestfs_xattr_list *xattrs_orig; char *csum; /* Checksum. If NULL, use file times and size. */ }; @@ -416,6 +448,8 @@ free_tree (struct tree *t) free (t->files[i].path); guestfs_free_statns (t->files[i].stat); guestfs_free_xattr_list (t->files[i].xattrs); + guestfs_free_statns (t-...

...wn long option: %s (%d)\n"), program_name, long_options[option_index].name, option_index); @@ -404,6 +429,8 @@ struct file { char *path; struct guestfs_statns *stat; struct guestfs_xattr_list *xattrs; + struct guestfs_statns *stat_orig; + struct guestfs_xattr_list *xattrs_orig; char *csum; /* Checksum. If NULL, use file times and size. */ }; @@ -466,6 +493,8 @@ visit_entry (const char *dir, const char *name, char *path = NULL, *csum = NULL; struct guestfs_statns *stat = NULL; struct guestfs_xattr_list *xattrs = NULL; + struct guestfs_stat...

...n" 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 others "ignore flags" (that is flatten) and for example cannot be done with extra-stats. I can do it, but...

...e * visit_guest (guestfs_h *g) @@ -454,13 +454,13 @@ visit_guest (guestfs_h *g) */ static int visit_entry (const char *dir, const char *name, - const struct guestfs_stat *stat_orig, + const struct guestfs_statns *stat_orig, const struct guestfs_xattr_list *xattrs_orig, void *vt) { struct tree *t = vt; char *path = NULL, *csum = NULL; - struct guestfs_stat *stat = NULL; + struct guestfs_statns *stat = NULL; struct guestfs_xattr_list *xattrs = NULL; size_t i; @@ -469,7 +469,7 @@ visit_entry (const char *dir, const char *name, /* C...