From: Tim Wiederhake <twiederh@redhat.com>
Date: Wed, 30 Sep 2020 11:55:00 +0000 (+0200)
Subject: schema: Move guest cpu definition to cputypes.rng
X-Git-Tag: v6.9.0-rc1~289
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dfa5231934ea3c742887b4a3983a0366318b273c;p=thirdparty%2Flibvirt.git

schema: Move guest cpu definition to cputypes.rng

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
---

diff --git a/docs/schemas/cputypes.rng b/docs/schemas/cputypes.rng
index a2d4dbe9d1..88f6904343 100644
--- a/docs/schemas/cputypes.rng
+++ b/docs/schemas/cputypes.rng
@@ -373,4 +373,43 @@
     </element>
   </define>
 
+  <define name="guestcpu">
+    <element name="cpu">
+      <optional>
+        <ref name="cpuMode"/>
+      </optional>
+      <optional>
+        <ref name="cpuMatch"/>
+      </optional>
+      <optional>
+        <ref name="cpuCheck"/>
+      </optional>
+      <optional>
+        <attribute name="migratable">
+          <ref name="virOnOff"/>
+        </attribute>
+      </optional>
+      <interleave>
+        <optional>
+          <ref name="cpuModel"/>
+        </optional>
+        <optional>
+          <ref name="cpuVendor"/>
+        </optional>
+        <optional>
+          <ref name="cpuTopology"/>
+        </optional>
+        <zeroOrMore>
+          <ref name="cpuFeature"/>
+        </zeroOrMore>
+        <optional>
+          <ref name="cpuNuma"/>
+        </optional>
+        <optional>
+          <ref name="cpuCache"/>
+        </optional>
+      </interleave>
+    </element>
+  </define>
+
 </grammar>
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 575b527743..7d4b105981 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -44,7 +44,7 @@
           <ref name="metadata"/>
         </optional>
         <optional>
-          <ref name="cpu"/>
+          <ref name="guestcpu"/>
         </optional>
         <zeroOrMore>
           <ref name="sysinfo"/>
@@ -5536,47 +5536,6 @@
       </element>
     </optional>
   </define>
-  <!--
-      CPU specification
-      -->
-  <define name="cpu">
-    <element name="cpu">
-      <optional>
-        <ref name="cpuMode"/>
-      </optional>
-      <optional>
-        <ref name="cpuMatch"/>
-      </optional>
-      <optional>
-        <ref name="cpuCheck"/>
-      </optional>
-      <optional>
-        <attribute name="migratable">
-          <ref name="virOnOff"/>
-        </attribute>
-      </optional>
-      <interleave>
-        <optional>
-          <ref name="cpuModel"/>
-        </optional>
-        <optional>
-          <ref name="cpuVendor"/>
-        </optional>
-        <optional>
-          <ref name="cpuTopology"/>
-        </optional>
-        <zeroOrMore>
-          <ref name="cpuFeature"/>
-        </zeroOrMore>
-        <optional>
-          <ref name="cpuNuma"/>
-        </optional>
-        <optional>
-          <ref name="cpuCache"/>
-        </optional>
-      </interleave>
-    </element>
-  </define>
 
   <!--
       System information specification: