Merge pull request #20 from rwmjones/2025-inspector

Virt-inspector: Add <class> and <windows_group_policy/>

Author: rwmjones

common

@@ -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 ();

inspector/inspector.c

@@ -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>
@@ -212,6 +213,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>

inspector/virt-inspector.rng

@@ -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.