diff --git a/common b/common index 90399dd1..b54ba203 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 90399dd18a27cb179fe86d71da2f806e63f5bb12 +Subproject commit b54ba2031a37026401a827ee85988be76d8637e0 diff --git a/inspector/inspector.c b/inspector/inspector.c index 1177f44a..6b5d5015 100644 --- a/inspector/inspector.c +++ b/inspector/inspector.c @@ -439,6 +439,9 @@ output_root (xmlTextWriterPtr xo, char *root) if (str) single_element ("windows_current_control_set", str); free (str); + i = guestfs_inspect_get_windows_group_policy (g, root); + if (i > 0) + empty_element ("windows_group_policy"); guestfs_pop_error_handler (g); str = guestfs_inspect_get_hostname (g, root); @@ -697,6 +700,8 @@ output_applications (xmlTextWriterPtr xo, char *root) single_element ("summary", apps->val[i].app2_summary); if (apps->val[i].app2_description && apps->val[i].app2_description[0]) single_element ("description", apps->val[i].app2_description); + if (apps->val[i].app2_class && apps->val[i].app2_class[0]) + single_element ("class", apps->val[i].app2_class); } end_element (); } } end_element (); diff --git a/inspector/virt-inspector.rng b/inspector/virt-inspector.rng index 29c5798e..90f74cf7 100644 --- a/inspector/virt-inspector.rng +++ b/inspector/virt-inspector.rng @@ -35,6 +35,7 @@ + @@ -212,6 +213,7 @@ + diff --git a/m4/guestfs-libraries.m4 b/m4/guestfs-libraries.m4 index 82e62d54..02f2281f 100644 --- a/m4/guestfs-libraries.m4 +++ b/m4/guestfs-libraries.m4 @@ -20,7 +20,9 @@ dnl Any C libraries required by the libguestfs C library (not the daemon). dnl Of course we need libguestfs. dnl dnl We need libguestfs 1.57.1 for guestfs_setfiles. -PKG_CHECK_MODULES([LIBGUESTFS], [libguestfs >= 1.57.1]) +dnl We need libguestfs 1.57.6 for guestfs_inspect_get_applications2 app2_class. +dnl We need libguestfs 1.57.6 for guestfs_inspect_get_windows_group_policy +PKG_CHECK_MODULES([LIBGUESTFS], [libguestfs >= 1.57.6]) printf "libguestfs version is "; $PKG_CONFIG --modversion libguestfs dnl Test if it's GNU or XSI strerror_r.