schema: put interleave at correct level

The previous commit 09d4d26 put the interleave at the wrong point;
it didn't allow interleaving with <memory>.

* docs/schema/domaincommon.rng (numatune): Fix interleave location.
* tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode.xml: Adjust test.

Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index fb5bdb3a24e4c136ee5d42ec432b2d23ef87272f..2caeef992c2e9ce25ff20af8ed2b61390329f944 100644 (file)
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -759,38 +759,38 @@
   <!-- All the NUMA related tunables would go in the numatune -->
   <define name="numatune">
     <element name="numatune">
-      <optional>
-        <element name="memory">
-          <optional>
-            <attribute name="mode">
-              <choice>
-                <value>strict</value>
-                <value>preferred</value>
-                <value>interleave</value>
-              </choice>
-            </attribute>
-          </optional>
-          <choice>
-            <group>
-              <optional>
-                <attribute name='placement'>
-                  <value>static</value>
-                </attribute>
-              </optional>
-              <optional>
-                <attribute name='nodeset'>
-                  <ref name='cpuset'/>
-                </attribute>
-              </optional>
-            </group>
-            <attribute name='placement'>
-              <value>auto</value>
-            </attribute>
-              </choice>
-        </element>
-      </optional>
-      <zeroOrMore>
-        <interleave>
+      <interleave>
+        <optional>
+          <element name="memory">
+            <optional>
+              <attribute name="mode">
+                <choice>
+                  <value>strict</value>
+                  <value>preferred</value>
+                  <value>interleave</value>
+                </choice>
+              </attribute>
+            </optional>
+            <choice>
+              <group>
+                <optional>
+                  <attribute name='placement'>
+                    <value>static</value>
+                  </attribute>
+                </optional>
+                <optional>
+                  <attribute name='nodeset'>
+                    <ref name='cpuset'/>
+                  </attribute>
+                </optional>
+              </group>
+              <attribute name='placement'>
+                <value>auto</value>
+              </attribute>
+            </choice>
+          </element>
+        </optional>
+        <zeroOrMore>
           <element name="memnode">
             <attribute name="cellid">
               <ref name="unsignedInt"/>
@@ -806,8 +806,8 @@
               <ref name='cpuset'/>
             </attribute>
           </element>
-        </interleave>
-      </zeroOrMore>
+        </zeroOrMore>
+      </interleave>
     </element>
   </define>
 

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode.xml b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode.xml
index 49b328cb18a543e00a5f56535f123f53b1108652..440413bfc456811b17e0cdf7c27549a67109c2c6 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode.xml
@@ -5,8 +5,8 @@
   <currentMemory unit='KiB'>24682468</currentMemory>
   <vcpu placement='static'>32</vcpu>
   <numatune>
-    <memory mode='strict' nodeset='0-7'/>
     <memnode cellid='0' mode='preferred' nodeset='3'/>
+    <memory mode='strict' nodeset='0-7'/>
     <memnode cellid='2' mode='strict' nodeset='1-2,5-7,^6'/>
   </numatune>
   <os>