X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=inspector%2Fvirt-inspector.rng;h=480467ed23becf7722f1c39551423b61d33cb1cd;hb=6da45feaec91180673d9edce6994339d8b36d8c9;hp=10aa6dbb1a05d1ee5c3a320bc76ec9e0367058d7;hpb=2cfd89d631319cf791c38b5b9f5a8a6331dc2ef2;p=libguestfs.git

diff --git a/inspector/virt-inspector.rng b/inspector/virt-inspector.rng
index 10aa6db..480467e 100644
--- a/inspector/virt-inspector.rng
+++ b/inspector/virt-inspector.rng
@@ -1,11 +1,11 @@
 <grammar xmlns="http://relaxng.org/ns/structure/1.0">
   <!-- -*- xml -*-
-  This is a RELAX NG schema for the output of 'virt-inspector - -xml'.
+  This is a RELAX NG schema for the output of 'virt-inspector'.
 
   To validate an existing document against this schema, you can
   use xmllint, like this:
 
-    virt-inspector - -xml Foo > output.xml
+    virt-inspector -d Foo > output.xml
     xmllint - -noout - -relaxng virt-inspector.rng output.xml
 
   (Note that because of limitations of XML, I have had to put spaces
@@ -30,18 +30,25 @@
                 <value>windows</value>
               </choice>
             </element>
-            <element name="arch"><text/></element>
+            <optional><element name="arch"><text/></element></optional>
             <optional><element name="distro"><text/></element></optional>
             <optional><element name="product_name"><text/></element></optional>
+            <optional><element name="product_variant"><text/></element></optional>
             <element name="major_version"><text/></element>
             <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="package_format"><text/></element></optional>
             <optional><element name="package_management"><text/></element></optional>
+            <optional><element name="hostname"><text/></element></optional>
+            <optional><element name="format"><text/></element></optional>
+            <optional><element name="live"><empty/></element></optional>
+            <optional><element name="netinst"><empty/></element></optional>
+            <optional><element name="multipart"><empty/></element></optional>
 
             <ref name="mountpoints"/>
             <ref name="filesystems"/>
+            <optional><ref name="drive_mappings"/></optional>
             <optional><ref name="applications"/></optional>
 
           </interleave>
@@ -78,6 +85,18 @@
     </element>
   </define>
 
+  <!-- drive mappings (for Windows) -->
+  <define name="drive_mappings">
+    <element name="drive_mappings">
+      <oneOrMore>
+        <element name="drive_mapping">
+          <attribute name="name"><text/></attribute>
+          <text/>
+        </element>
+      </oneOrMore>
+    </element>
+  </define>
+
   <!-- applications installed -->
   <define name="applications">
     <element name="applications">