From: Michal Privoznik <mprivozn@redhat.com>
Date: Wed, 6 Jan 2021 11:43:05 +0000 (+0100)
Subject: schemas: Allow interleaving of fsBinary children
X-Git-Tag: v7.0.0-rc1~77
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=374502867ecbbf2abfabb1296f5e1619e9f3bafd;p=thirdparty%2Flibvirt.git

schemas: Allow interleaving of fsBinary children

The <binary/> element of <filesystem/> can have children elements
(<cache/> and <lock/>). Allow them to be interleaved.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 49654624a9..9f3b65b546 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -2861,32 +2861,34 @@
           <ref name="virOnOff"/>
         </attribute>
       </optional>
-      <optional>
-        <element name="cache">
-          <optional>
-            <attribute name="mode">
-              <choice>
-                <value>none</value>
-                <value>always</value>
-              </choice>
-            </attribute>
-          </optional>
-        </element>
-      </optional>
-      <optional>
-        <element name="lock">
-          <optional>
-            <attribute name="posix">
-              <ref name="virOnOff"/>
-            </attribute>
-          </optional>
-          <optional>
-            <attribute name="flock">
-              <ref name="virOnOff"/>
-            </attribute>
-          </optional>
-        </element>
-      </optional>
+      <interleave>
+        <optional>
+          <element name="cache">
+            <optional>
+              <attribute name="mode">
+                <choice>
+                  <value>none</value>
+                  <value>always</value>
+                </choice>
+              </attribute>
+            </optional>
+          </element>
+        </optional>
+        <optional>
+          <element name="lock">
+            <optional>
+              <attribute name="posix">
+                <ref name="virOnOff"/>
+              </attribute>
+            </optional>
+            <optional>
+              <attribute name="flock">
+                <ref name="virOnOff"/>
+              </attribute>
+            </optional>
+          </element>
+        </optional>
+      </interleave>
     </element>
   </define>