提交 7f1ca3d6 编写于 作者: E Eric Blake

schema: put interleave at correct level

The previous commit 09d4d261 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: NEric Blake <eblake@redhat.com>
上级 861eced6
...@@ -759,38 +759,38 @@ ...@@ -759,38 +759,38 @@
<!-- All the NUMA related tunables would go in the numatune --> <!-- All the NUMA related tunables would go in the numatune -->
<define name="numatune"> <define name="numatune">
<element name="numatune"> <element name="numatune">
<optional> <interleave>
<element name="memory"> <optional>
<optional> <element name="memory">
<attribute name="mode"> <optional>
<choice> <attribute name="mode">
<value>strict</value> <choice>
<value>preferred</value> <value>strict</value>
<value>interleave</value> <value>preferred</value>
</choice> <value>interleave</value>
</attribute> </choice>
</optional> </attribute>
<choice> </optional>
<group> <choice>
<optional> <group>
<attribute name='placement'> <optional>
<value>static</value> <attribute name='placement'>
</attribute> <value>static</value>
</optional> </attribute>
<optional> </optional>
<attribute name='nodeset'> <optional>
<ref name='cpuset'/> <attribute name='nodeset'>
</attribute> <ref name='cpuset'/>
</optional> </attribute>
</group> </optional>
<attribute name='placement'> </group>
<value>auto</value> <attribute name='placement'>
</attribute> <value>auto</value>
</choice> </attribute>
</element> </choice>
</optional> </element>
<zeroOrMore> </optional>
<interleave> <zeroOrMore>
<element name="memnode"> <element name="memnode">
<attribute name="cellid"> <attribute name="cellid">
<ref name="unsignedInt"/> <ref name="unsignedInt"/>
...@@ -806,8 +806,8 @@ ...@@ -806,8 +806,8 @@
<ref name='cpuset'/> <ref name='cpuset'/>
</attribute> </attribute>
</element> </element>
</interleave> </zeroOrMore>
</zeroOrMore> </interleave>
</element> </element>
</define> </define>
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
<currentMemory unit='KiB'>24682468</currentMemory> <currentMemory unit='KiB'>24682468</currentMemory>
<vcpu placement='static'>32</vcpu> <vcpu placement='static'>32</vcpu>
<numatune> <numatune>
<memory mode='strict' nodeset='0-7'/>
<memnode cellid='0' mode='preferred' nodeset='3'/> <memnode cellid='0' mode='preferred' nodeset='3'/>
<memory mode='strict' nodeset='0-7'/>
<memnode cellid='2' mode='strict' nodeset='1-2,5-7,^6'/> <memnode cellid='2' mode='strict' nodeset='1-2,5-7,^6'/>
</numatune> </numatune>
<os> <os>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册