diff --git a/inspector/example-debian.xml b/inspector/example-debian.xml
index c699d77a3..5b60092e4 100644
--- a/inspector/example-debian.xml
+++ b/inspector/example-debian.xml
@@ -10,6 +10,7 @@
0
deb
apt
+ debian.invalid
installed
/
diff --git a/inspector/example-fedora.xml b/inspector/example-fedora.xml
index 797aa58aa..f2bf40e7f 100644
--- a/inspector/example-fedora.xml
+++ b/inspector/example-fedora.xml
@@ -10,6 +10,7 @@
0
rpm
yum
+ fedora.invalid
installed
/
diff --git a/inspector/example-ubuntu.xml b/inspector/example-ubuntu.xml
index 61697814c..ab08b0cf3 100644
--- a/inspector/example-ubuntu.xml
+++ b/inspector/example-ubuntu.xml
@@ -10,6 +10,7 @@
10
deb
apt
+ ubuntu.invalid
installed
/
diff --git a/inspector/example-windows.xml b/inspector/example-windows.xml
index 8b3b8a706..55b11df4e 100644
--- a/inspector/example-windows.xml
+++ b/inspector/example-windows.xml
@@ -11,6 +11,7 @@
1
/Windows
ControlSet001
+ windows.invalid
installed
/
diff --git a/inspector/virt-inspector.c b/inspector/virt-inspector.c
index 69c4ea9a9..607e5ae09 100644
--- a/inspector/virt-inspector.c
+++ b/inspector/virt-inspector.c
@@ -428,6 +428,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);
+
str = guestfs_inspect_get_format (g, root);
if (!str) exit (EXIT_FAILURE);
if (STRNEQ (str, "unknown"))
diff --git a/inspector/virt-inspector.rng b/inspector/virt-inspector.rng
index 669e8bc66..f59311c0f 100644
--- a/inspector/virt-inspector.rng
+++ b/inspector/virt-inspector.rng
@@ -40,6 +40,7 @@
+