From: Michal Privoznik <mprivozn@redhat.com>
Date: Wed, 6 Jan 2021 11:41:40 +0000 (+0100)
Subject: schemas: Allow fsDriver to be interleaved
X-Git-Tag: v7.0.0-rc1~78
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=56fe81af7067c817aa187a95bcdd526a588c9c7c;p=thirdparty%2Flibvirt.git

schemas: Allow fsDriver to be interleaved

Our <filesystem/> element can have <driver/> child element. But
with the way our schema is written it can't be interleaved and
has to go first.

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 86816e9b1d..49654624a9 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -2628,10 +2628,10 @@
           <attribute name="type">
             <value>file</value>
           </attribute>
-          <optional>
-            <ref name="fsDriver"/>
-          </optional>
           <interleave>
+            <optional>
+              <ref name="fsDriver"/>
+            </optional>
             <element name="source">
               <attribute name="file">
                 <ref name="absFilePath"/>
@@ -2644,10 +2644,10 @@
           <attribute name="type">
             <value>block</value>
           </attribute>
-          <optional>
-            <ref name="fsDriver"/>
-          </optional>
           <interleave>
+            <optional>
+              <ref name="fsDriver"/>
+            </optional>
             <element name="source">
               <attribute name="dev">
                 <ref name="absFilePath"/>
@@ -2663,13 +2663,13 @@
               <value>mount</value>
             </attribute>
           </optional>
-          <optional>
-            <ref name="fsDriver"/>
-          </optional>
-          <optional>
-            <ref name="fsBinary"/>
-          </optional>
           <interleave>
+            <optional>
+              <ref name="fsDriver"/>
+            </optional>
+            <optional>
+              <ref name="fsBinary"/>
+            </optional>
             <element name="source">
               <attribute name="dir">
                 <ref name="absDirPath"/>
@@ -2684,10 +2684,10 @@
               <value>bind</value>
             </attribute>
           </optional>
-          <optional>
-            <ref name="fsDriver"/>
-          </optional>
           <interleave>
+            <optional>
+              <ref name="fsDriver"/>
+            </optional>
             <element name="source">
               <attribute name="dir">
                 <ref name="absDirPath"/>
@@ -2700,10 +2700,10 @@
           <attribute name="type">
             <value>template</value>
           </attribute>
-          <optional>
-            <ref name="fsDriver"/>
-          </optional>
           <interleave>
+            <optional>
+              <ref name="fsDriver"/>
+            </optional>
             <element name="source">
               <attribute name="name">
                 <ref name="genericName"/>
@@ -2716,10 +2716,10 @@
           <attribute name="type">
             <value>ram</value>
           </attribute>
-          <optional>
-            <ref name="fsDriver"/>
-          </optional>
           <interleave>
+            <optional>
+              <ref name="fsDriver"/>
+            </optional>
             <element name="source">
               <attribute name="usage">
                 <ref name="unsignedLong"/>