From b930ad166b287246ddda130a74e558e38960af70 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 26 Apr 2023 12:25:25 +0200
Subject: [libvirt] Update rng files

---
 src/main/resources/libvirt/rng/capability.rng     |   1 +
 src/main/resources/libvirt/rng/cputypes.rng       |   5 +
 src/main/resources/libvirt/rng/domaincaps.rng     |  10 +
 src/main/resources/libvirt/rng/domaincommon.rng   | 227 ++++++++++++++++------
 src/main/resources/libvirt/rng/domainsnapshot.rng |  10 +
 src/main/resources/libvirt/rng/nodedev.rng        | 103 +++++-----
 src/main/resources/libvirt/rng/storagecommon.rng  |  38 ++--
 7 files changed, 268 insertions(+), 126 deletions(-)

diff --git a/src/main/resources/libvirt/rng/capability.rng b/src/main/resources/libvirt/rng/capability.rng
index c7e72c6..83b4149 100644
--- a/src/main/resources/libvirt/rng/capability.rng
+++ b/src/main/resources/libvirt/rng/capability.rng
@@ -428,6 +428,7 @@
           <value>lxc</value>
           <value>openvz</value>
           <value>test</value>
+          <value>hvf</value>
         </choice>
       </attribute>
 
diff --git a/src/main/resources/libvirt/rng/cputypes.rng b/src/main/resources/libvirt/rng/cputypes.rng
index 3e79bdd..db1aa57 100644
--- a/src/main/resources/libvirt/rng/cputypes.rng
+++ b/src/main/resources/libvirt/rng/cputypes.rng
@@ -318,6 +318,11 @@
           <ref name="unsignedInt"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="limit">
+          <ref name="unsignedInt"/>
+        </attribute>
+      </optional>
     </element>
   </define>
 
diff --git a/src/main/resources/libvirt/rng/domaincaps.rng b/src/main/resources/libvirt/rng/domaincaps.rng
index 4b96e89..28f545b 100644
--- a/src/main/resources/libvirt/rng/domaincaps.rng
+++ b/src/main/resources/libvirt/rng/domaincaps.rng
@@ -204,6 +204,9 @@
       <optional>
         <ref name="channel"/>
       </optional>
+      <optional>
+        <ref name="crypto"/>
+      </optional>
     </element>
   </define>
 
@@ -270,6 +273,13 @@
     </element>
   </define>
 
+  <define name="crypto">
+    <element name="crypto">
+      <ref name="supported"/>
+      <ref name="enum"/>
+    </element>
+  </define>
+
   <define name="features">
     <element name="features">
       <optional>
diff --git a/src/main/resources/libvirt/rng/domaincommon.rng b/src/main/resources/libvirt/rng/domaincommon.rng
index 6cb0a20..6158ed7 100644
--- a/src/main/resources/libvirt/rng/domaincommon.rng
+++ b/src/main/resources/libvirt/rng/domaincommon.rng
@@ -257,30 +257,40 @@
       <ref name="osexe"/>
     </choice>
   </define>
+
   <define name="osxen">
     <choice>
       <group>
-        <optional>
-          <ref name="bootloader"/>
-        </optional>
-        <element name="os">
-          <ref name="ostypexen"/>
-          <ref name="osbootkernel"/>
-        </element>
-      </group>
-      <group>
-        <ref name="bootloader"/>
-        <optional>
+        <interleave>
+          <optional>
+            <ref name="bootloader"/>
+          </optional>
           <element name="os">
-            <ref name="ostypexen"/>
-            <optional>
+            <interleave>
+              <ref name="ostypexen"/>
               <ref name="osbootkernel"/>
-            </optional>
+            </interleave>
           </element>
-        </optional>
+        </interleave>
+      </group>
+      <group>
+        <interleave>
+          <ref name="bootloader"/>
+          <optional>
+            <element name="os">
+              <interleave>
+                <ref name="ostypexen"/>
+                <optional>
+                  <ref name="osbootkernel"/>
+                </optional>
+              </interleave>
+            </element>
+          </optional>
+        </interleave>
       </group>
     </choice>
   </define>
+
   <define name="oshvm">
     <interleave>
       <optional>
@@ -339,6 +349,9 @@
                   <ref name="virYesNo"/>
                 </attribute>
               </optional>
+              <optional>
+                <ref name="pflashFormat"/>
+              </optional>
               <optional>
                 <ref name="absFilePath"/>
               </optional>
@@ -351,6 +364,9 @@
                   <ref name="absFilePath"/>
                 </attribute>
               </optional>
+              <optional>
+                <ref name="pflashFormat"/>
+              </optional>
               <optional>
                 <choice>
                   <group>
@@ -477,12 +493,14 @@
           </element>
         </optional>
         <optional>
-          <element name="inituser">
-            <ref name="genericName"/>
-          </element>
-          <element name="initgroup">
-            <ref name="genericName"/>
-          </element>
+          <interleave>
+            <element name="inituser">
+              <ref name="genericName"/>
+            </element>
+            <element name="initgroup">
+              <ref name="genericName"/>
+            </element>
+          </interleave>
         </optional>
       </interleave>
     </element>
@@ -2187,6 +2205,9 @@
         </optional>
         <ref name="diskSourceCommon"/>
         <ref name="diskSourceNetworkHost"/>
+        <optional>
+          <ref name="reconnect"/>
+        </optional>
         <optional>
           <ref name="encryption"/>
         </optional>
@@ -4481,6 +4502,11 @@
                 <ref name="virYesNo"/>
               </attribute>
             </optional>
+            <optional>
+              <attribute name="blob">
+                <ref name="virOnOff"/>
+              </attribute>
+            </optional>
             <optional>
               <element name="acceleration">
                 <optional>
@@ -5345,6 +5371,7 @@
             <value>i6300esb</value>
             <value>ib700</value>
             <value>diag288</value>
+            <value>itco</value>
           </choice>
         </attribute>
         <optional>
@@ -5558,49 +5585,57 @@
       </interleave>
     </element>
   </define>
+
   <define name="smartcard">
     <element name="smartcard">
-      <choice>
-        <group>
-          <attribute name="mode">
-            <value>host</value>
-          </attribute>
-          <!-- might need to add optional database element here later -->
-        </group>
-        <group>
-          <attribute name="mode">
-            <value>host-certificates</value>
-          </attribute>
-          <ref name="certificate"/>
-          <ref name="certificate"/>
-          <ref name="certificate"/>
-          <optional>
-            <element name="database">
-              <ref name="absDirPath"/>
-            </element>
-          </optional>
-        </group>
-        <group>
-          <attribute name="mode">
-            <value>passthrough</value>
-          </attribute>
-          <ref name="qemucdevSrcType"/>
-          <interleave>
-            <ref name="qemucdevSrcDef"/>
-            <optional>
-              <ref name="qemucdevTgtDef"/>
-            </optional>
-          </interleave>
-        </group>
-      </choice>
-      <optional>
-        <ref name="acpi"/>
-      </optional>
-      <optional>
-        <ref name="address"/>
-      </optional>
+      <interleave>
+        <choice>
+          <group>
+            <attribute name="mode">
+              <value>host</value>
+            </attribute>
+            <!-- might need to add optional database element here later -->
+          </group>
+          <group>
+            <interleave>
+              <attribute name="mode">
+                <value>host-certificates</value>
+              </attribute>
+              <group>
+                <ref name="certificate"/>
+                <ref name="certificate"/>
+                <ref name="certificate"/>
+              </group>
+              <optional>
+                <element name="database">
+                  <ref name="absDirPath"/>
+                </element>
+              </optional>
+            </interleave>
+          </group>
+          <group>
+            <attribute name="mode">
+              <value>passthrough</value>
+            </attribute>
+            <ref name="qemucdevSrcType"/>
+            <interleave>
+              <ref name="qemucdevSrcDef"/>
+              <optional>
+                <ref name="qemucdevTgtDef"/>
+              </optional>
+            </interleave>
+          </group>
+        </choice>
+        <optional>
+          <ref name="acpi"/>
+        </optional>
+        <optional>
+          <ref name="address"/>
+        </optional>
+      </interleave>
     </element>
   </define>
+
   <define name="certificate">
     <element name="certificate">
       <text/>
@@ -6426,11 +6461,12 @@
             <ref name="tpm"/>
             <ref name="shmem"/>
             <ref name="memorydev"/>
+            <ref name="crypto"/>
           </choice>
         </zeroOrMore>
-        <optional>
+        <zeroOrMore>
           <ref name="watchdog"/>
-        </optional>
+        </zeroOrMore>
         <optional>
           <ref name="memballoon"/>
         </optional>
@@ -7196,6 +7232,63 @@
     </element>
   </define>
 
+  <define name="crypto">
+    <element name="crypto">
+      <attribute name="model">
+        <choice>
+          <value>virtio</value>
+        </choice>
+      </attribute>
+      <attribute name="type">
+        <choice>
+          <value>qemu</value>
+        </choice>
+      </attribute>
+      <interleave>
+        <ref name="crypto-backend"/>
+        <optional>
+          <element name="driver">
+            <ref name="virtioOptions"/>
+          </element>
+        </optional>
+        <optional>
+          <ref name="alias"/>
+        </optional>
+        <optional>
+          <ref name="address"/>
+        </optional>
+      </interleave>
+    </element>
+  </define>
+
+  <define name="crypto-backend">
+    <element name="backend">
+      <choice>
+        <group>
+          <attribute name="model">
+            <value>builtin</value>
+          </attribute>
+          <optional>
+            <attribute name="queues">
+              <ref name="positiveInteger"/>
+            </attribute>
+          </optional>
+        </group>
+        <group>
+          <attribute name="model">
+            <value>lkcf</value>
+          </attribute>
+          <optional>
+            <attribute name="queues">
+              <ref name="positiveInteger"/>
+            </attribute>
+          </optional>
+        </group>
+      </choice>
+    </element>
+  </define>
+
+
   <define name="virtioOptions">
     <optional>
       <attribute name="iommu">
@@ -7459,6 +7552,15 @@
     </element>
   </define>
 
+  <define name="pflashFormat">
+    <attribute name="format">
+      <choice>
+        <value>raw</value>
+        <value>qcow2</value>
+      </choice>
+    </attribute>
+  </define>
+
   <!-- Optional HyperV Enlightenment features -->
   <define name="hyperv">
     <element name="hyperv">
@@ -8210,6 +8312,7 @@
             <value>pseries</value>
             <value>hyperv</value>
             <value>s390</value>
+            <value>pvpanic</value>
           </choice>
         </attribute>
       </optional>
diff --git a/src/main/resources/libvirt/rng/domainsnapshot.rng b/src/main/resources/libvirt/rng/domainsnapshot.rng
index 4048266..45f01b9 100644
--- a/src/main/resources/libvirt/rng/domainsnapshot.rng
+++ b/src/main/resources/libvirt/rng/domainsnapshot.rng
@@ -123,6 +123,14 @@
     <ref name="disksnapshotdriver"/>
   </define>
 
+  <define name="snapshotDeleteInProgress">
+    <optional>
+      <element name="snapshotDeleteInProgress">
+        <empty/>
+      </element>
+    </optional>
+  </define>
+
   <define name="disksnapshot">
     <element name="disk">
       <attribute name="name">
@@ -175,6 +183,7 @@
                   </element>
                 </optional>
                 <ref name="storageSourceExtra"/>
+                <ref name="snapshotDeleteInProgress"/>
               </interleave>
             </group>
             <group>
@@ -200,6 +209,7 @@
                   </element>
                 </optional>
                 <ref name="storageSourceExtra"/>
+                <ref name="snapshotDeleteInProgress"/>
               </interleave>
             </group>
             <ref name="diskSourceNetwork"/>
diff --git a/src/main/resources/libvirt/rng/nodedev.rng b/src/main/resources/libvirt/rng/nodedev.rng
index 6299c52..fba4021 100644
--- a/src/main/resources/libvirt/rng/nodedev.rng
+++ b/src/main/resources/libvirt/rng/nodedev.rng
@@ -9,41 +9,38 @@
 
   <define name="device">
     <element name="device">
-      <!-- The name of the network, used to refer to it through the API
-         and in virsh -->
-      <element name="name"><text/></element>
-      <optional>
-        <element name="path"><text/></element>
-      </optional>
-      <optional>
-        <element name="devnode">
-          <attribute name="type">
-            <value>dev</value>
-          </attribute>
-          <text/>
-        </element>
-      </optional>
-      <zeroOrMore>
-        <element name="devnode">
-          <attribute name="type">
-            <value>link</value>
-          </attribute>
-          <text/>
-        </element>
-      </zeroOrMore>
-      <optional>
-        <ref name="parent"/>
-      </optional>
+      <interleave>
+        <!-- The name of the network, used to refer to it through the API
+        and in virsh -->
+        <element name="name"><text/></element>
+        <optional>
+          <element name="path"><text/></element>
+        </optional>
+        <zeroOrMore>
+          <element name="devnode">
+            <attribute name="type">
+              <choice>
+                <value>dev</value>
+                <value>link</value>
+              </choice>
+            </attribute>
+            <text/>
+          </element>
+        </zeroOrMore>
+        <optional>
+          <ref name="parent"/>
+        </optional>
 
-      <optional>
-        <element name="driver">
-          <element name="name"><text/></element>
-        </element>
-      </optional>
+        <optional>
+          <element name="driver">
+            <element name="name"><text/></element>
+          </element>
+        </optional>
 
-      <zeroOrMore>
-        <ref name="capability"/>
-      </zeroOrMore>
+        <zeroOrMore>
+          <ref name="capability"/>
+        </zeroOrMore>
+      </interleave>
     </element>
   </define>
 
@@ -659,15 +656,17 @@
   </define>
 
   <define name="capccwaddress">
-    <element name="cssid">
-      <ref name="ccwCssidRange"/>
-    </element>
-    <element name="ssid">
-      <ref name="ccwSsidRange"/>
-    </element>
-    <element name="devno">
-      <ref name="ccwDevnoRange"/>
-    </element>
+    <interleave>
+      <element name="cssid">
+        <ref name="ccwCssidRange"/>
+      </element>
+      <element name="ssid">
+        <ref name="ccwSsidRange"/>
+      </element>
+      <element name="devno">
+        <ref name="ccwDevnoRange"/>
+      </element>
+    </interleave>
   </define>
 
   <define name="capccwdev">
@@ -681,15 +680,17 @@
     <attribute name="type">
       <value>css</value>
     </attribute>
-    <ref name="capccwaddress"/>
-    <optional>
-      <element name="channel_dev_addr">
-        <ref name="capccwaddress"/>
-      </element>
-    </optional>
-    <optional>
-      <ref name="mdev_types"/>
-    </optional>
+    <interleave>
+      <ref name="capccwaddress"/>
+      <optional>
+        <element name="channel_dev_addr">
+          <ref name="capccwaddress"/>
+        </element>
+      </optional>
+      <optional>
+        <ref name="mdev_types"/>
+      </optional>
+    </interleave>
   </define>
 
   <define name="capvdpa">
diff --git a/src/main/resources/libvirt/rng/storagecommon.rng b/src/main/resources/libvirt/rng/storagecommon.rng
index 76714c9..14704c7 100644
--- a/src/main/resources/libvirt/rng/storagecommon.rng
+++ b/src/main/resources/libvirt/rng/storagecommon.rng
@@ -14,6 +14,7 @@
           <value>qcow</value>
           <value>luks</value>
           <value>luks2</value>
+          <value>luks-any</value>
         </choice>
       </attribute>
       <optional>
@@ -26,14 +27,18 @@
       </optional>
       <optional>
         <interleave>
-          <ref name="secret"/>
+          <oneOrMore>
+            <ref name="secret"/>
+          </oneOrMore>
           <optional>
-            <element name="cipher">
-              <ref name="keycipher"/>
-            </element>
-            <element name="ivgen">
-              <ref name="keyivgen"/>
-            </element>
+            <interleave>
+              <element name="cipher">
+                <ref name="keycipher"/>
+              </element>
+              <element name="ivgen">
+                <ref name="keyivgen"/>
+              </element>
+            </interleave>
           </optional>
         </interleave>
       </optional>
@@ -53,14 +58,21 @@
 
   <define name="reconnect">
     <element name="reconnect">
-      <attribute name="enabled">
-        <ref name="virYesNo"/>
-      </attribute>
-      <optional>
-        <attribute name="timeout">
+      <choice>
+        <group>
+          <attribute name="enabled">
+            <ref name="virYesNo"/>
+          </attribute>
+          <optional>
+            <attribute name="timeout">
+              <ref name="unsignedInt"/>
+            </attribute>
+          </optional>
+        </group>
+        <attribute name="delay">
           <ref name="unsignedInt"/>
         </attribute>
-      </optional>
+      </choice>
     </element>
   </define>
 
-- 
cgit v1.2.3-55-g7522