From: Han Han <hhan@redhat.com>
Date: Fri, 22 Jun 2018 05:24:02 +0000 (+0800)
Subject: docs: schema: Add missing <interleave> to devices
X-Git-Tag: v4.5.0-rc1~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f78b73e68e4d68970af16ad7f7a5360efa3afff7;p=thirdparty%2Flibvirt.git

docs: schema: Add missing <interleave> to devices

For input,hub,redirdev devices, their sub-elements should be interleaved.

input device: interleave for <driver>, <alias>, <address>
hub device: interleave for <alias>, <address>
redirdev device: interleave for <source>, <alias>, <address>, <boot>

Signed-off-by: Han Han <hhan@redhat.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 4a454dddb4..611bbef138 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -4270,51 +4270,53 @@
 
   <define name="input">
     <element name="input">
-      <optional>
-        <element name="driver">
-          <ref name="virtioOptions"/>
-        </element>
-      </optional>
-      <choice>
-        <group>
-          <attribute name="type">
-            <choice>
-              <value>tablet</value>
-              <value>mouse</value>
-              <value>keyboard</value>
-            </choice>
-          </attribute>
-          <optional>
-            <attribute name="bus">
+      <interleave>
+        <optional>
+          <element name="driver">
+            <ref name="virtioOptions"/>
+          </element>
+        </optional>
+        <choice>
+          <group>
+            <attribute name="type">
               <choice>
-                <value>ps2</value>
-                <value>usb</value>
-                <value>xen</value>
-                <value>virtio</value>
+                <value>tablet</value>
+                <value>mouse</value>
+                <value>keyboard</value>
               </choice>
             </attribute>
-          </optional>
-        </group>
-        <group>
-          <attribute name="type">
-            <value>passthrough</value>
-          </attribute>
-          <attribute name="bus">
-            <value>virtio</value>
-          </attribute>
-          <element name="source">
-            <attribute name="evdev">
-              <ref name="absFilePath"/>
+            <optional>
+              <attribute name="bus">
+                <choice>
+                  <value>ps2</value>
+                  <value>usb</value>
+                  <value>xen</value>
+                  <value>virtio</value>
+                </choice>
+              </attribute>
+            </optional>
+          </group>
+          <group>
+            <attribute name="type">
+              <value>passthrough</value>
             </attribute>
-          </element>
-        </group>
-      </choice>
-      <optional>
-        <ref name="alias"/>
-      </optional>
-      <optional>
-        <ref name="address"/>
-      </optional>
+            <attribute name="bus">
+              <value>virtio</value>
+            </attribute>
+            <element name="source">
+              <attribute name="evdev">
+                <ref name="absFilePath"/>
+              </attribute>
+            </element>
+          </group>
+        </choice>
+        <optional>
+          <ref name="alias"/>
+        </optional>
+        <optional>
+          <ref name="address"/>
+        </optional>
+      </interleave>
     </element>
   </define>
   <define name="hub">
@@ -4322,12 +4324,14 @@
       <attribute name="type">
         <value>usb</value>
       </attribute>
-      <optional>
-        <ref name="alias"/>
-      </optional>
-      <optional>
-        <ref name="address"/>
-      </optional>
+      <interleave>
+        <optional>
+          <ref name="alias"/>
+        </optional>
+        <optional>
+          <ref name="address"/>
+        </optional>
+      </interleave>
     </element>
   </define>
   <define name="redirdev">
@@ -4338,16 +4342,18 @@
       <attribute name="type">
         <ref name="qemucdevSrcTypeChoice"/>
       </attribute>
-      <ref name="qemucdevSrcDef"/>
-      <optional>
-        <ref name="alias"/>
-      </optional>
-      <optional>
-        <ref name="address"/>
-      </optional>
-      <optional>
-        <ref name="deviceBoot"/>
-      </optional>
+      <interleave>
+        <ref name="qemucdevSrcDef"/>
+        <optional>
+          <ref name="alias"/>
+        </optional>
+        <optional>
+          <ref name="address"/>
+        </optional>
+        <optional>
+          <ref name="deviceBoot"/>
+        </optional>
+      </interleave>
     </element>
   </define>
   <define name="redirfilter">