|
 |
397dc2 |
From e37b1531942872a229b9f45524ea4679f3b1e8d6 Mon Sep 17 00:00:00 2001
|
|
|
397dc2 |
Message-Id: <e37b1531942872a229b9f45524ea4679f3b1e8d6@dist-git>
|
|
|
397dc2 |
From: Michal Privoznik <mprivozn@redhat.com>
|
|
|
397dc2 |
Date: Mon, 9 Nov 2020 17:22:33 +0100
|
|
|
397dc2 |
Subject: [PATCH] RNG: Allow interleaving of /domain/cpu/numa/cell children
|
|
|
397dc2 |
MIME-Version: 1.0
|
|
|
397dc2 |
Content-Type: text/plain; charset=UTF-8
|
|
|
397dc2 |
Content-Transfer-Encoding: 8bit
|
|
|
397dc2 |
|
|
|
397dc2 |
So far, the <cell/> element can have two types of children
|
|
|
397dc2 |
elements: <distances/> and <cache/> (which can be repeated more
|
|
|
397dc2 |
times). However, there is no reason to require specific order in
|
|
|
397dc2 |
input XML. Allow elements to be interleaved.
|
|
|
397dc2 |
|
|
|
397dc2 |
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
397dc2 |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
397dc2 |
(cherry picked from commit fd2ad818b29ca56904dd228f0774f553f99c1157)
|
|
|
397dc2 |
|
|
|
397dc2 |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1749518
|
|
|
397dc2 |
|
|
|
397dc2 |
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
397dc2 |
Message-Id: <48b8e99ea6fbc6bcab0f7b3d17e7824ef1b232e2.1604938847.git.mprivozn@redhat.com>
|
|
|
397dc2 |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
397dc2 |
---
|
|
|
397dc2 |
docs/schemas/cputypes.rng | 22 ++++++++++++----------
|
|
|
397dc2 |
1 file changed, 12 insertions(+), 10 deletions(-)
|
|
|
397dc2 |
|
|
|
397dc2 |
diff --git a/docs/schemas/cputypes.rng b/docs/schemas/cputypes.rng
|
|
|
397dc2 |
index ba30dbf9ff..a1cae23161 100644
|
|
|
397dc2 |
--- a/docs/schemas/cputypes.rng
|
|
|
397dc2 |
+++ b/docs/schemas/cputypes.rng
|
|
|
397dc2 |
@@ -146,16 +146,18 @@
|
|
|
397dc2 |
<ref name="virYesNo"/>
|
|
|
397dc2 |
</attribute>
|
|
|
397dc2 |
</optional>
|
|
|
397dc2 |
- <optional>
|
|
|
397dc2 |
- <element name="distances">
|
|
|
397dc2 |
- <oneOrMore>
|
|
|
397dc2 |
- <ref name="numaDistance"/>
|
|
|
397dc2 |
- </oneOrMore>
|
|
|
397dc2 |
- </element>
|
|
|
397dc2 |
- </optional>
|
|
|
397dc2 |
- <zeroOrMore>
|
|
|
397dc2 |
- <ref name="numaCache"/>
|
|
|
397dc2 |
- </zeroOrMore>
|
|
|
397dc2 |
+ <interleave>
|
|
|
397dc2 |
+ <optional>
|
|
|
397dc2 |
+ <element name="distances">
|
|
|
397dc2 |
+ <oneOrMore>
|
|
|
397dc2 |
+ <ref name="numaDistance"/>
|
|
|
397dc2 |
+ </oneOrMore>
|
|
|
397dc2 |
+ </element>
|
|
|
397dc2 |
+ </optional>
|
|
|
397dc2 |
+ <zeroOrMore>
|
|
|
397dc2 |
+ <ref name="numaCache"/>
|
|
|
397dc2 |
+ </zeroOrMore>
|
|
|
397dc2 |
+ </interleave>
|
|
|
397dc2 |
</element>
|
|
|
397dc2 |
</define>
|
|
|
397dc2 |
|
|
|
397dc2 |
--
|
|
|
397dc2 |
2.29.2
|
|
|
397dc2 |
|