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>

docs/schemas/domaincommon.rng

@@ -759,6 +759,7 @@
   <!-- All the NUMA related tunables would go in the numatune -->
   <define name="numatune">
     <element name="numatune">
+      <interleave>
         <optional>
           <element name="memory">
             <optional>
@@ -790,7 +791,6 @@
           </element>
         </optional>
         <zeroOrMore>
-        <interleave>
           <element name="memnode">
             <attribute name="cellid">
               <ref name="unsignedInt"/>
@@ -806,8 +806,8 @@
               <ref name='cpuset'/>
             </attribute>
           </element>
-        </interleave>
         </zeroOrMore>
+      </interleave>
     </element>
   </define>
 

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>