From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 13 Oct 2022 15:40:18 +0000 (+0200)
Subject: schema: domain: Allow interleaving of elements in 'osxen' definition
X-Git-Tag: v9.1.0-rc1~114
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4e189bb2fae583217c1afbc2abbc5af04ceb35c;p=thirdparty%2Flibvirt.git

schema: domain: Allow interleaving of elements in 'osxen' definition

The 'osxen' RNG type defines options for the <os> element in certain
modes. Allow interleaving of subelements recursively.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
index f966285641..765306f094 100644
--- a/src/conf/schemas/domaincommon.rng
+++ b/src/conf/schemas/domaincommon.rng
@@ -257,30 +257,40 @@
       <ref name="osexe"/>
     </choice>
   </define>
+
   <define name="osxen">
     <choice>
       <group>
-        <optional>
-          <ref name="bootloader"/>
-        </optional>
-        <element name="os">
-          <ref name="ostypexen"/>
-          <ref name="osbootkernel"/>
-        </element>
-      </group>
-      <group>
-        <ref name="bootloader"/>
-        <optional>
+        <interleave>
+          <optional>
+            <ref name="bootloader"/>
+          </optional>
           <element name="os">
-            <ref name="ostypexen"/>
-            <optional>
+            <interleave>
+              <ref name="ostypexen"/>
               <ref name="osbootkernel"/>
-            </optional>
+            </interleave>
           </element>
-        </optional>
+        </interleave>
+      </group>
+      <group>
+        <interleave>
+          <ref name="bootloader"/>
+          <optional>
+            <element name="os">
+              <interleave>
+                <ref name="ostypexen"/>
+                <optional>
+                  <ref name="osbootkernel"/>
+                </optional>
+              </interleave>
+            </element>
+          </optional>
+        </interleave>
       </group>
     </choice>
   </define>
+
   <define name="oshvm">
     <interleave>
       <optional>