]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
schemas: Allow interleaving of fsBinary children
authorMichal Privoznik <mprivozn@redhat.com>
Wed, 6 Jan 2021 11:43:05 +0000 (12:43 +0100)
committerMichal Privoznik <mprivozn@redhat.com>
Wed, 6 Jan 2021 12:44:15 +0000 (13:44 +0100)
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>
docs/schemas/domaincommon.rng

index 49654624a908422c7a1d1c4482bef6cbecee0e5a..9f3b65b5461290ffba1ab4f38a7ed58f8ecf837f 100644 (file)
           <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>