From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 20 Apr 2017 15:32:42 +0000 (+0200)
Subject: docs: schemas: Remove <interleave> from file/block/dir/volume disks
X-Git-Tag: v3.3.0-rc1~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a99095cc6bb20719c438cf212216a9a306559da;p=thirdparty%2Flibvirt.git

docs: schemas: Remove <interleave> from file/block/dir/volume disks

They don't contain any elements to interleave.
---

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 7a9b4b7024..5c354eb647 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -1430,65 +1430,59 @@
         <value>file</value>
       </attribute>
     </optional>
-    <interleave>
-      <optional>
-        <element name="source">
-          <optional>
-            <attribute name="file">
-              <ref name="absFilePath"/>
-            </attribute>
-          </optional>
-          <optional>
-            <ref name="storageStartupPolicy"/>
-          </optional>
-          <zeroOrMore>
-            <ref name='devSeclabel'/>
-          </zeroOrMore>
-        </element>
-      </optional>
-    </interleave>
+    <optional>
+      <element name="source">
+        <optional>
+          <attribute name="file">
+            <ref name="absFilePath"/>
+          </attribute>
+        </optional>
+        <optional>
+          <ref name="storageStartupPolicy"/>
+        </optional>
+        <zeroOrMore>
+          <ref name='devSeclabel'/>
+        </zeroOrMore>
+      </element>
+    </optional>
   </define>
 
   <define name="diskSourceBlock">
     <attribute name="type">
       <value>block</value>
     </attribute>
-    <interleave>
-      <optional>
-        <element name="source">
-          <optional>
-            <attribute name="dev">
-              <ref name="absFilePath"/>
-            </attribute>
-          </optional>
-          <optional>
-            <ref name="storageStartupPolicy"/>
-          </optional>
-          <zeroOrMore>
-            <ref name='devSeclabel'/>
-          </zeroOrMore>
-        </element>
-      </optional>
-    </interleave>
+    <optional>
+      <element name="source">
+        <optional>
+          <attribute name="dev">
+            <ref name="absFilePath"/>
+          </attribute>
+        </optional>
+        <optional>
+          <ref name="storageStartupPolicy"/>
+        </optional>
+        <zeroOrMore>
+          <ref name='devSeclabel'/>
+        </zeroOrMore>
+      </element>
+    </optional>
   </define>
 
   <define name="diskSourceDir">
     <attribute name="type">
       <value>dir</value>
     </attribute>
-    <interleave>
-      <optional>
-        <element name="source">
-          <attribute name="dir">
-            <ref name="absFilePath"/>
-          </attribute>
-          <optional>
-            <ref name="storageStartupPolicy"/>
-          </optional>
-          <empty/>
-        </element>
-      </optional>
-    </interleave>
+    <optional>
+      <element name="source">
+        <attribute name="dir">
+          <ref name="absFilePath"/>
+        </attribute>
+        <optional>
+          <ref name="storageStartupPolicy"/>
+        </optional>
+        <empty/>
+      </element>
+    </optional>
   </define>
 
   <define name="diskSourceNetwork">
@@ -1574,32 +1568,30 @@
     <attribute name="type">
       <value>volume</value>
     </attribute>
-    <interleave>
-      <optional>
-        <element name="source">
-          <attribute name="pool">
-            <ref name="genericName"/>
-          </attribute>
-          <attribute name="volume">
-            <ref name="volName"/>
+    <optional>
+      <element name="source">
+        <attribute name="pool">
+          <ref name="genericName"/>
+        </attribute>
+        <attribute name="volume">
+          <ref name="volName"/>
+        </attribute>
+        <optional>
+          <attribute name="mode">
+            <choice>
+              <value>host</value>
+              <value>direct</value>
+            </choice>
           </attribute>
-          <optional>
-            <attribute name="mode">
-              <choice>
-                <value>host</value>
-                <value>direct</value>
-              </choice>
-            </attribute>
-          </optional>
-          <optional>
-            <ref name="storageStartupPolicy"/>
-          </optional>
-          <zeroOrMore>
-            <ref name='devSeclabel'/>
-          </zeroOrMore>
-        </element>
-      </optional>
-    </interleave>
+        </optional>
+        <optional>
+          <ref name="storageStartupPolicy"/>
+        </optional>
+        <zeroOrMore>
+          <ref name='devSeclabel'/>
+        </zeroOrMore>
+      </element>
+    </optional>
   </define>
 
   <define name="diskTarget">