From: Michal Privoznik <mprivozn@redhat.com>
Date: Mon, 31 Aug 2020 09:35:47 +0000 (+0200)
Subject: RNG: Allow interleaving of /domain/cpu/numa/cell children
X-Git-Tag: v6.7.0~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd2ad818b29ca56904dd228f0774f553f99c1157;p=thirdparty%2Flibvirt.git

RNG: Allow interleaving of /domain/cpu/numa/cell children

So far, the <cell/> element can have two types of children
elements: <distances/> and <cache/> (which can be repeated more
times). However, there is no reason to require specific order in
input XML. Allow elements to be interleaved.

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

diff --git a/docs/schemas/cputypes.rng b/docs/schemas/cputypes.rng
index ba30dbf9ff..a1cae23161 100644
--- a/docs/schemas/cputypes.rng
+++ b/docs/schemas/cputypes.rng
@@ -146,16 +146,18 @@
           <ref name="virYesNo"/>
         </attribute>
       </optional>
-      <optional>
-        <element name="distances">
-          <oneOrMore>
-            <ref name="numaDistance"/>
-          </oneOrMore>
-        </element>
-      </optional>
-      <zeroOrMore>
-        <ref name="numaCache"/>
-      </zeroOrMore>
+      <interleave>
+        <optional>
+          <element name="distances">
+            <oneOrMore>
+              <ref name="numaDistance"/>
+            </oneOrMore>
+          </element>
+        </optional>
+        <zeroOrMore>
+          <ref name="numaCache"/>
+        </zeroOrMore>
+      </interleave>
     </element>
   </define>