RNG: Allow interleaving of /domain/cpu/numa/cell children

[PATCH] RNG: Allow interleaving of /domain/cpu/numa/cell children

Michal Privoznik posted 1 patch 3 years, 7 months ago

Download mbox

Test syntax-check failed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/02da2c635eacc5478ef37105f1f82c4f76cd40ae.1598867392.git.mprivozn@redhat.com

docs/schemas/cputypes.rng | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)

Expand all Fold all

[PATCH] RNG: Allow interleaving of /domain/cpu/numa/cell children

Posted by Michal Privoznik 3 years, 7 months ago

So far, the <cell/> element can have two types of children
elements: <distances/> and <cache/> (which can be repeated more
times). However, there is no reason to require specific order in
input XML. Allow elements to be interleaved.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 docs/schemas/cputypes.rng | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/docs/schemas/cputypes.rng b/docs/schemas/cputypes.rng
index ba30dbf9ff..a1cae23161 100644
--- a/docs/schemas/cputypes.rng
+++ b/docs/schemas/cputypes.rng
@@ -146,16 +146,18 @@
           <ref name="virYesNo"/>
         </attribute>
       </optional>
-      <optional>
-        <element name="distances">
-          <oneOrMore>
-            <ref name="numaDistance"/>
-          </oneOrMore>
-        </element>
-      </optional>
-      <zeroOrMore>
-        <ref name="numaCache"/>
-      </zeroOrMore>
+      <interleave>
+        <optional>
+          <element name="distances">
+            <oneOrMore>
+              <ref name="numaDistance"/>
+            </oneOrMore>
+          </element>
+        </optional>
+        <zeroOrMore>
+          <ref name="numaCache"/>
+        </zeroOrMore>
+      </interleave>
     </element>
   </define>
 
-- 
2.26.2

Re: [PATCH] RNG: Allow interleaving of /domain/cpu/numa/cell children

Posted by Ján Tomko 3 years, 7 months ago

On a Monday in 2020, Michal Privoznik wrote:
>So far, the <cell/> element can have two types of children
>elements: <distances/> and <cache/> (which can be repeated more
>times). However, there is no reason to require specific order in
>input XML. Allow elements to be interleaved.
>
>Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
>---
> docs/schemas/cputypes.rng | 22 ++++++++++++----------
> 1 file changed, 12 insertions(+), 10 deletions(-)
>

Reviewed-by: Ján Tomko <jtomko@redhat.com>

Jano