[libvirt] [PATCH v3 08/16] conf, schema: add support for memnode elements

Eric Blake eblake at redhat.com
Wed Jul 16 21:02:58 UTC 2014


On 07/16/2014 02:53 PM, Eric Blake wrote:

>>>>       <zeroOrMore>
>>>> +        <interleave>
> 
> <interleave> makes no difference here.  As the <zeroOrMore> has only one
> <element> child, there is nothing to be interleaved.  I meant for it to
> go one level higher, outside the <zeroOrMore>, where it can also
> interleave with <memory>.
> 
>>>>           <element name="memnode">
>>>
>>> I'm assuming the odd spacing here is due to pasting into the email body,
>>> not how it actually looked in the diff.  That, and diff -w already plays
>>> games with spacing.
>>>
>>
>> diff -w looked OK when I pasted it in the mail body, but somewhere on
>> the way it got smudged.
> 
> As penance, I'm proposing this followup:

and also squashing in this change to the testsuite, to expose the
difference:

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode.xml
b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode.xml
index 49b328c..440413b 100644
--- 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>

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 604 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20140716/53017190/attachment-0001.sig>


More information about the libvir-list mailing list