From 337f21af9c33ddb55706977841841d71c1ea05d8 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 1 Feb 2023 13:55:42 +0100
Subject: Update libvirt rng files

---
 src/main/resources/libvirt/rng/cputypes.rng | 88 +++++++++++++++++++++--------
 1 file changed, 65 insertions(+), 23 deletions(-)

(limited to 'src/main/resources/libvirt/rng/cputypes.rng')

diff --git a/src/main/resources/libvirt/rng/cputypes.rng b/src/main/resources/libvirt/rng/cputypes.rng
index 77c8fa7..3e79bdd 100644
--- a/src/main/resources/libvirt/rng/cputypes.rng
+++ b/src/main/resources/libvirt/rng/cputypes.rng
@@ -250,6 +250,11 @@
             <attribute name="target">
               <ref name="unsignedInt"/>
             </attribute>
+            <optional>
+              <attribute name="cache">
+                <ref name="unsignedInt"/>
+              </attribute>
+            </optional>
             <attribute name="type">
               <choice>
                 <value>access</value>
@@ -300,31 +305,49 @@
     </element>
   </define>
 
-  <define name="hostcpu">
-    <element name="cpu">
-      <element name="arch">
-        <ref name="archnames"/>
-      </element>
+  <define name="cpuMaxPhysAddr">
+    <element name="maxphysaddr">
+      <attribute name="mode">
+        <choice>
+          <value>emulate</value>
+          <value>passthrough</value>
+        </choice>
+      </attribute>
       <optional>
-        <element name="features">
-          <optional>
-            <element name="pae"><empty/></element>
-          </optional>
-          <optional>
-            <element name="nonpae"><empty/></element>
-          </optional>
-          <optional>
-            <element name="vmx"><empty/></element>
-          </optional>
-          <optional>
-            <element name="svm"><empty/></element>
-          </optional>
-        </element>
+        <attribute name="bits">
+          <ref name="unsignedInt"/>
+        </attribute>
       </optional>
-      <optional>
-        <element name="model">
-          <text/>
+    </element>
+  </define>
+
+  <define name="hostcpu">
+    <element name="cpu">
+      <interleave>
+        <element name="arch">
+          <ref name="archnames"/>
         </element>
+        <optional>
+          <element name="features">
+            <optional>
+              <element name="pae"><empty/></element>
+            </optional>
+            <optional>
+              <element name="nonpae"><empty/></element>
+            </optional>
+            <optional>
+              <element name="vmx"><empty/></element>
+            </optional>
+            <optional>
+              <element name="svm"><empty/></element>
+            </optional>
+          </element>
+        </optional>
+        <optional>
+          <element name="model">
+            <text/>
+          </element>
+        </optional>
         <optional>
           <element name="vendor">
             <text/>
@@ -337,6 +360,19 @@
             </attribute>
           </element>
         </optional>
+        <optional>
+          <element name="signature">
+            <attribute name="family">
+              <ref name="positiveInteger"/>
+            </attribute>
+            <attribute name="model">
+              <ref name="unsignedInt"/>
+            </attribute>
+            <attribute name="stepping">
+              <ref name="unsignedInt"/>
+            </attribute>
+          </element>
+        </optional>
         <optional>
           <element name="counter">
             <attribute name="name">
@@ -353,6 +389,9 @@
         <optional>
           <ref name="cpuTopology"/>
         </optional>
+        <optional>
+          <ref name="cpuMaxPhysAddr"/>
+        </optional>
         <zeroOrMore>
           <element name="feature">
             <attribute name="name">
@@ -375,7 +414,7 @@
             </attribute>
           </element>
         </zeroOrMore>
-      </optional>
+      </interleave>
     </element>
   </define>
 
@@ -414,6 +453,9 @@
         <optional>
           <ref name="cpuCache"/>
         </optional>
+        <optional>
+          <ref name="cpuMaxPhysAddr"/>
+        </optional>
       </interleave>
     </element>
   </define>
-- 
cgit v1.2.3-55-g7522