inspector: Include <hostname> in output.

Cherry picked from commit 36d3a4ce53317b104d48b60c9fe1ed679065d1d4
and rebased for stable-1.8 branch.

diff --git a/inspector/example-debian.xml b/inspector/example-debian.xml
index cead573..089df4e 100644 (file)
--- a/inspector/example-debian.xml
+++ b/inspector/example-debian.xml
@@ -10,6 +10,7 @@
     <minor_version>0</minor_version>
     <package_format>deb</package_format>
     <package_management>apt</package_management>
+    <hostname>debian.invalid</hostname>
     <mountpoints>
       <mountpoint dev="/dev/debian/root">/</mountpoint>
       <mountpoint dev="/dev/debian/usr">/usr</mountpoint>

diff --git a/inspector/example-fedora.xml b/inspector/example-fedora.xml
index 6e03a12..73769f8 100644 (file)
--- a/inspector/example-fedora.xml
+++ b/inspector/example-fedora.xml
@@ -10,6 +10,7 @@
     <minor_version>0</minor_version>
     <package_format>rpm</package_format>
     <package_management>yum</package_management>
+    <hostname>fedora.invalid</hostname>
     <mountpoints>
       <mountpoint dev="/dev/VG/Root">/</mountpoint>
       <mountpoint dev="/dev/sda1">/boot</mountpoint>

diff --git a/inspector/example-ubuntu.xml b/inspector/example-ubuntu.xml
index 61338e1..572ffb5 100644 (file)
--- a/inspector/example-ubuntu.xml
+++ b/inspector/example-ubuntu.xml
@@ -10,6 +10,7 @@
     <minor_version>10</minor_version>
     <package_format>deb</package_format>
     <package_management>apt</package_management>
+    <hostname>ubuntu.invalid</hostname>
     <mountpoints>
       <mountpoint dev="/dev/sda2">/</mountpoint>
       <mountpoint dev="/dev/sda1">/boot</mountpoint>

diff --git a/inspector/example-windows.xml b/inspector/example-windows.xml
index 346b2ed..67d099a 100644 (file)
--- a/inspector/example-windows.xml
+++ b/inspector/example-windows.xml
@@ -9,6 +9,7 @@
     <major_version>6</major_version>
     <minor_version>1</minor_version>
     <windows_systemroot>/Windows</windows_systemroot>
+    <hostname>windows.invalid</hostname>
     <mountpoints>
       <mountpoint dev="/dev/sda2">/</mountpoint>
     </mountpoints>

diff --git a/inspector/virt-inspector.c b/inspector/virt-inspector.c
index 4d2824c..2e3449e 100644 (file)
--- a/inspector/virt-inspector.c
+++ b/inspector/virt-inspector.c
@@ -408,6 +408,14 @@ output_root (xmlTextWriterPtr xo, char *root)
     free (str);
   );
 
+  str = guestfs_inspect_get_hostname (g, root);
+  if (!str) exit (EXIT_FAILURE);
+  if (STRNEQ (str, "unknown"))
+    XMLERROR (-1,
+      xmlTextWriterWriteElement (xo, BAD_CAST "hostname",
+                                 BAD_CAST str));
+  free (str);
+
   output_mountpoints (xo, root);
 
   output_filesystems (xo, root);

diff --git a/inspector/virt-inspector.rng b/inspector/virt-inspector.rng
index 10aa6db..d35e752 100644 (file)
--- a/inspector/virt-inspector.rng
+++ b/inspector/virt-inspector.rng
@@ -39,6 +39,7 @@
 
             <optional><element name="package_format"><text/></element></optional>
             <optional><element name="package_management"><text/></element></optional>
+            <optional><element name="hostname"><text/></element></optional>
 
             <ref name="mountpoints"/>
             <ref name="filesystems"/>