From 53e59d0189dc71d78559478c4924f1a1a994c455 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 3 Nov 2025 15:26:19 +0000
Subject: [PATCH 1/2] inspector: Add new <class> field to output of
 virt-inspector

Rebase common submodule to pick up:

  Richard W.M. Jones (1):
      structs/structs-print.c: Update this generated file

Fixes: https://issues.redhat.com/browse/RHEL-125955
---
 common                       | 2 +-
 inspector/inspector.c        | 2 ++
 inspector/virt-inspector.rng | 1 +
 m4/guestfs-libraries.m4      | 3 ++-
 4 files changed, 6 insertions(+), 2 deletions(-)

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..cccc209d 100644
--- a/inspector/inspector.c
+++ b/inspector/inspector.c
@@ -697,6 +697,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..e30686d4 100644
--- a/inspector/virt-inspector.rng
+++ b/inspector/virt-inspector.rng
@@ -212,6 +212,7 @@
           <optional><element name="source_package"><text/></element></optional>
           <optional><element name="summary"><text/></element></optional>
           <optional><element name="description"><text/></element></optional>
+          <optional><element name="class"><text/></element></optional>
         </element>
       </zeroOrMore>
     </element>
diff --git a/m4/guestfs-libraries.m4 b/m4/guestfs-libraries.m4
index 82e62d54..4ca86161 100644
--- a/m4/guestfs-libraries.m4
+++ b/m4/guestfs-libraries.m4
@@ -20,7 +20,8 @@ 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.
+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.

From d56129cfccedd26739ee5b813060e7547d977c53 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 3 Nov 2025 15:56:56 +0000
Subject: [PATCH 2/2] inspector: Add <windows_group_policy/> is Windows GPOs
 detected in guest

Fixes: https://issues.redhat.com/browse/RHEL-125955
---
 inspector/inspector.c        | 3 +++
 inspector/virt-inspector.rng | 1 +
 m4/guestfs-libraries.m4      | 1 +
 3 files changed, 5 insertions(+)

diff --git a/inspector/inspector.c b/inspector/inspector.c
index cccc209d..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);
diff --git a/inspector/virt-inspector.rng b/inspector/virt-inspector.rng
index e30686d4..90f74cf7 100644
--- a/inspector/virt-inspector.rng
+++ b/inspector/virt-inspector.rng
@@ -35,6 +35,7 @@
             <element name="minor_version"><text/></element>
             <optional><element name="windows_systemroot"><text/></element></optional>
             <optional><element name="windows_current_control_set"><text/></element></optional>
+            <optional><element name="windows_group_policy"><empty/></element></optional>
             <optional><ref name="ospackageformat"/></optional>
             <optional><ref name="ospackagemanagement"/></optional>
             <optional><element name="hostname"><text/></element></optional>
diff --git a/m4/guestfs-libraries.m4 b/m4/guestfs-libraries.m4
index 4ca86161..02f2281f 100644
--- a/m4/guestfs-libraries.m4
+++ b/m4/guestfs-libraries.m4
@@ -21,6 +21,7 @@ dnl Of course we need libguestfs.
 dnl
 dnl We need libguestfs 1.57.1 for guestfs_setfiles.
 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