From: Tim Wiederhake <twiederh@redhat.com>
Date: Tue, 15 Dec 2020 12:16:48 +0000 (+0100)
Subject: schema: Allow counter element in host cpu definition
X-Git-Tag: v7.0.0-rc1~170
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=37ffe24968e52819a2a057fb07a8445146fa5ee8;p=thirdparty%2Flibvirt.git

schema: Allow counter element in host cpu definition

If the capabilities include a counter element, e.g.
  <counter name='tsc' frequency='2591999000' scaling='no'/>
the XML could not be validated:
  $ virsh capabilities > cap.xml
  $ virsh [hypervisor-]cpu-compare cap.xml --validate
  error: Failed to compare hypervisor CPU with cap.txt
  error: XML document failed to validate against schema: Unable to validate doc against /usr/share/libvirt/schemas/cpu.rng
  Did not expect element counter there

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 c4e7621659..f66bc62ba7 100644
--- a/docs/schemas/cputypes.rng
+++ b/docs/schemas/cputypes.rng
@@ -336,6 +336,19 @@
             </attribute>
           </element>
         </optional>
+        <optional>
+          <element name="counter">
+            <attribute name="name">
+              <text/>
+            </attribute>
+            <attribute name="frequency">
+              <ref name="positiveInteger"/>
+            </attribute>
+            <attribute name="scaling">
+              <ref name="virYesNo"/>
+            </attribute>
+          </element>
+        </optional>
         <optional>
           <ref name="cpuTopology"/>
         </optional>