search for: guestfs_int_merge_fs_inspections

...n NULL; >> + } > Although this is stylistic, I think it's easier to understand if > you change the if condition to: > > if (collect_coreos_inspection_info (g) == -1) { > ... > Since we 'll be using safe_realloc, I don't think there is a need for any of: * guestfs_int_merge_fs_inspections() * collect_coreos_inspection_info() to be returning a value at all. So, I'll remove the if check completely. Nikos P.S. You have a check like this one on guestfs_int_check_for_filesystem_on() a few lines above :-) > Rich. > > >

Add a new guestfs_int_merge_fs_inspections() function that merges the OS inspection information of two inspect_fs instances into one. This function is useful if the inspection information for an OS are gathered by inspecting multiple filesystems. Signed-off-by: Nikos Skalkotos <skalkoto@grnet.gr> --- src/guestfs-internal.h | 1 +...

Add a new guestfs_int_merge_fs_inspections() function that merges the OS inspection information of two inspect_fs instances into one. This function is useful if the inspection information for an OS are gathered by inspecting multiple filesystems. Signed-off-by: Nikos Skalkotos <skalkoto@grnet.gr> --- src/guestfs-internal.h | 1 +...

...| 73 ++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 104 insertions(+), 2 deletions(-) diff --git a/src/guestfs-internal.h b/src/guestfs-internal.h index d10191d..fbbfb90 100644 --- a/src/guestfs-internal.h +++ b/src/guestfs-internal.h @@ -864,6 +864,7 @@ extern void guestfs_int_merge_fs_inspections (guestfs_h *g, struct inspect_fs *d /* inspect-fs-unix.c */ extern int guestfs_int_check_linux_root (guestfs_h *g, struct inspect_fs *fs); +extern int guestfs_int_check_linux_usr (guestfs_h *g, struct inspect_fs *fs); extern int guestfs_int_check_freebsd_root (guestfs_h *g, struct inspect_fs *...

Hi, this patch series improves the way /usr filesystems are handled: tag them appropriately, so later on we can find them and merge results they contain directly back for the root filesystem. Changes in v2: - removed patches #1 and #2, already pushed - drop patch #3, no more needed - replace patch #4 with a better suggestion from Rich - change if into assert in patch #5 Thanks, Pino Toscano

...if (usr && + (usr->major_version > fs->major_version || + (usr->major_version == fs->major_version && + usr->minor_version > fs->minor_version))) + continue; + + usr = fs; + } + + if (usr == NULL) + return 0; + + return guestfs_int_merge_fs_inspections (g, root, usr); +} + /* On *BSD systems, sometimes /dev/sda[1234] is a shadow of the real root * filesystem that is probably /dev/sda5 * (see: http://www.freebsd.org/doc/handbook/disk-organization.html) @@ -201,6 +262,7 @@ guestfs_impl_inspect_get_distro (guestfs_h *g, const char *root) cas...

...is stylistic, I think it's easier to understand if > > you change the if condition to: > > > > if (collect_coreos_inspection_info (g) == -1) { > > ... > > > Since we 'll be using safe_realloc, I don't think there is a need for > any of: > * guestfs_int_merge_fs_inspections() > * collect_coreos_inspection_info() > to be returning a value at all. So, I'll remove the if check completely. > > Nikos > > P.S. You have a check like this one on > guestfs_int_check_for_filesystem_on() a few lines above :-) In extend_fses? That's a bug .. Ric...

...39;s easier to understand if >>> you change the if condition to: >>> >>> if (collect_coreos_inspection_info (g) == -1) { >>> ... >>> >> Since we 'll be using safe_realloc, I don't think there is a need for >> any of: >> * guestfs_int_merge_fs_inspections() >> * collect_coreos_inspection_info() >> to be returning a value at all. So, I'll remove the if check completely. >> >> Nikos >> >> P.S. You have a check like this one on >> guestfs_int_check_for_filesystem_on() a few lines above :-) > In extend_f...

Hi, this patch series improves the way /usr filesystems are handled: tag them appropriately, so later on we can find them and merge results they contain directly back for the root filesystem. The series includes also a new private debug API, and its usage to fix the resolution of /dev/mapper/.. devices found in fstab; without it, LVM /usr filesystems are not recognized as belonging to their

...*/ + if (usr && + (usr->major_version > fs->major_version || + (usr->major_version == fs->major_version && + usr->minor_version > fs->minor_version))) + continue; + + usr = fs; + } + + if (usr == NULL) + return; + + guestfs_int_merge_fs_inspections (g, root, usr); +} + /* On *BSD systems, sometimes /dev/sda[1234] is a shadow of the real root * filesystem that is probably /dev/sda5 * (see: http://www.freebsd.org/doc/handbook/disk-organization.html) @@ -201,6 +259,7 @@ guestfs_impl_inspect_get_distro (guestfs_h *g, const char *root) cas...

..._MANAGEMENT_YUM; - else if (fs->major_version >= 2) + else if (guestfs_int_version_ge (&fs->version, 2, 0, 0)) fs->package_management = OS_PACKAGE_MANAGEMENT_UP2DATE; else /* Probably parsing the release file failed, see RHBZ#1332025. */ @@ -732,10 +719,8 @@ guestfs_int_merge_fs_inspections (guestfs_h *g, struct inspect_fs *dst, struct i src->product_variant = NULL; } - if (dst->major_version == 0 && dst->minor_version == 0) { - dst->major_version = src->major_version; - dst->minor_version = src->minor_version; - } + if (version_is_null...

Hi, this adds an helper version struct, and uses it in the backends (for the libvirt and qemu versions) and inspection code. This also moves common code to that, so it is not repeated in many places. This should help with the small refactoring proposed with https://www.redhat.com/archives/libguestfs/2016-May/msg00070.html Thanks, Pino Toscano (2): src: start unifying version handling

Hi, this adds an helper version struct, and uses it in the backends (for the libvirt and qemu versions) and inspection code. This also moves common code to that, so it is not repeated in many places. This should help with the small refactoring proposed with https://www.redhat.com/archives/libguestfs/2016-May/msg00070.html Thanks, Pino Toscano (2): src: start unifying version handling

This is the (incomplete) patch which reimplements inspection APIs in the daemon. All ‘XXX’s in this patch indicate areas which are not yet implemented or need further work. Rich.

v9 was here: https://www.redhat.com/archives/libguestfs/2017-July/msg00139.html This depends on these three series (the first two being single minor patches): https://www.redhat.com/archives/libguestfs/2017-July/msg00207.html https://www.redhat.com/archives/libguestfs/2017-July/msg00209.html https://www.redhat.com/archives/libguestfs/2017-July/msg00215.html There is no substantive change. I

This depends on the patch series "[PATCH 00/27] Reimplement many daemon APIs in OCaml." (https://www.redhat.com/archives/libguestfs/2017-July/msg00098.html) v8 was posted here: https://www.redhat.com/archives/libguestfs/2017-June/msg00274.html v9: - I split up the mega-patch into a more reviewable series of smaller, incremental patches. There are some other changes vs v8, but

This fixes almost everything. Note that it adds an extra commit which fixes the whole utf8/iconv business. It's probably better to list what isn't fixed: (1) I didn't leave the osinfo code around because I'm still haven't looked too closely at virt-builder-repository. Can't we just fetch this code from the git history when we need it? (2) I didn't change the way

v10: https://www.redhat.com/archives/libguestfs/2017-July/msg00245.html No actual change here, but I rebased and retested. Also this series now does not depend on any other patch series since everything else needed is upstream. Rich.

v6 was posted here: https://www.redhat.com/archives/libguestfs/2017-June/msg00103.html and this requires the utilities refactoring posted here: https://www.redhat.com/archives/libguestfs/2017-June/msg00169.html Inspection is now complete[*], although not very well tested. I'm intending to compare the output of many guests using old & new virt-inspector to see if I can find any

v5: https://www.redhat.com/archives/libguestfs/2017-June/msg00065.html Since v5, this now implements inspection almost completely for Linux and Windows guests. Rich.