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

[Martin Kletzander]

On Wed, Jul 16, 2014 at 12:21:24PM -0600, Eric Blake wrote:
>On 07/16/2014 08:42 AM, Martin Kletzander wrote:
>> Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
>> ---
[...]
>> +++ b/docs/schemas/domaincommon.rng
>> @@ -789,6 +789,23 @@
>>                </choice>
>>          </element>
>>        </optional>
>> +      <zeroOrMore>
>> +        <element name="memnode">
>> +          <attribute name="cellid">
>> +            <ref name="unsignedInt"/>
>> +          </attribute>
>> +          <attribute name="mode">
>> +            <choice>
>> +              <value>strict</value>
>> +              <value>preferred</value>
>> +              <value>interleave</value>
>> +            </choice>
>> +          </attribute>
>> +          <attribute name='nodeset'>
>> +            <ref name='cpuset'/>
>> +          </attribute>
>> +        </element>
>> +      </zeroOrMore>
>>      </element>
>
>Missing an <interleave> here (<memory> and <memnode> should be swappable
>with one another).
>

Oh!  My bad.  So sorry :-(

Good point, is this OK to push as trivial (git diff -w):

diff --git i/docs/schemas/domaincommon.rng w/docs/schemas/domaincommon.rng
index a0ea300..fb5bdb3 100644
--- i/docs/schemas/domaincommon.rng
+++ w/docs/schemas/domaincommon.rng
@@ -790,6 +790,7 @@
         </element>
       </optional>
       <zeroOrMore>
+        <interleave>
           <element name="memnode">
             <attribute name="cellid">
               <ref name="unsignedInt"/>
@@ -805,6 +806,7 @@
               <ref name='cpuset'/>
             </attribute>
           </element>
+        </interleave>
       </zeroOrMore>
     </element>
   </define>
--

Martin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20140716/15d91643/attachment-0001.sig>