External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 04:15:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

schema: put interleave at correct level

Browse Source 
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>
This commit is contained in:
Eric Blake 2014-07-16 14:53:32 -06:00
parent 861eced6f4
commit 7f1ca3d6fe
2 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
docs/schemas/domaincommon.rng
View File

@ -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>

2
tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode.xml
View File

@ -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>