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 ba30dbf9ff4666e452b6d471bf21376e6f3b7476..a1cae23161844833d570cec07681bb2cdd52c754 100644 (file)
--- 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>