From: Tim Wiederhake <twiederh@redhat.com>
Date: Tue, 15 Dec 2020 12:16:47 +0000 (+0100)
Subject: schemas: Deduplicate cpuTopology in cputypes.rng
X-Git-Tag: v7.0.0-rc1~171
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07cc8b007f80e3e0241014359df9238424224dd8;p=thirdparty%2Flibvirt.git

schemas: Deduplicate cpuTopology in cputypes.rng

The duplicate had the "dies" attribute missing, causing
  $ virsh capabilities > cap.xml
  $ virsh [hypervisor-]cpu-compare cap.xml --validate
to fail with
  error: Failed to compare hypervisor CPU with cap.xml
  error: XML document failed to validate against schema: Unable to validate doc against /usr/share/libvirt/schemas/cpu.rng
  Invalid attribute dies for element topology

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/docs/schemas/cputypes.rng b/docs/schemas/cputypes.rng
index aea6ff0267..c4e7621659 100644
--- a/docs/schemas/cputypes.rng
+++ b/docs/schemas/cputypes.rng
@@ -337,17 +337,7 @@
           </element>
         </optional>
         <optional>
-          <element name="topology">
-            <attribute name="sockets">
-              <ref name="positiveInteger"/>
-            </attribute>
-            <attribute name="cores">
-              <ref name="positiveInteger"/>
-            </attribute>
-            <attribute name="threads">
-              <ref name="positiveInteger"/>
-            </attribute>
-          </element>
+          <ref name="cpuTopology"/>
         </optional>
         <zeroOrMore>
           <element name="feature">