[libvirt PATCH 01/10] schema: Wrap hyperv element in choice and group

[Tim Wiederhake]

This does not change the schema, but will make upcoming changes
easier.

Signed-off-by: Tim Wiederhake <twiederh at redhat.com>
---
 docs/schemas/domaincommon.rng | 164 +++++++++++++++++-----------------
 1 file changed, 84 insertions(+), 80 deletions(-)

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index f01b7a6470..3d57d417ca 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -7087,90 +7087,94 @@
   <!-- Optional HyperV Enlightenment features -->
   <define name="hyperv">
     <element name="hyperv">
-      <interleave>
-        <optional>
-          <element name="relaxed">
-            <ref name="featurestate"/>
-          </element>
-        </optional>
-        <optional>
-          <element name="vapic">
-            <ref name="featurestate"/>
-          </element>
-        </optional>
-        <optional>
-          <element name="spinlocks">
-            <ref name="featurestate"/>
+      <choice>
+        <group>
+          <interleave>
             <optional>
-              <attribute name="retries">
-                <data type="unsignedInt"/>
-              </attribute>
+              <element name="relaxed">
+                <ref name="featurestate"/>
+              </element>
             </optional>
-          </element>
-        </optional>
-        <optional>
-          <element name="vpindex">
-            <ref name="featurestate"/>
-          </element>
-        </optional>
-        <optional>
-          <element name="runtime">
-            <ref name="featurestate"/>
-          </element>
-        </optional>
-        <optional>
-          <element name="synic">
-            <ref name="featurestate"/>
-          </element>
-        </optional>
-        <optional>
-          <element name="stimer">
-            <ref name="stimer"/>
-          </element>
-        </optional>
-        <optional>
-          <element name="reset">
-            <ref name="featurestate"/>
-          </element>
-        </optional>
-        <optional>
-          <element name="vendor_id">
-            <ref name="featurestate"/>
             <optional>
-              <attribute name="value">
-                <data type="string">
-                  <param name="pattern">[^,]{0,12}</param>
-                </data>
-              </attribute>
+              <element name="vapic">
+                <ref name="featurestate"/>
+              </element>
             </optional>
-          </element>
-        </optional>
-        <optional>
-          <element name="frequencies">
-            <ref name="featurestate"/>
-          </element>
-        </optional>
-        <optional>
-          <element name="reenlightenment">
-            <ref name="featurestate"/>
-          </element>
-        </optional>
-        <optional>
-          <element name="tlbflush">
-            <ref name="featurestate"/>
-          </element>
-        </optional>
-        <optional>
-          <element name="ipi">
-            <ref name="featurestate"/>
-          </element>
-        </optional>
-        <optional>
-          <element name="evmcs">
-            <ref name="featurestate"/>
-          </element>
-        </optional>
-      </interleave>
+            <optional>
+              <element name="spinlocks">
+                <ref name="featurestate"/>
+                <optional>
+                  <attribute name="retries">
+                    <data type="unsignedInt"/>
+                  </attribute>
+                </optional>
+              </element>
+            </optional>
+            <optional>
+              <element name="vpindex">
+                <ref name="featurestate"/>
+              </element>
+            </optional>
+            <optional>
+              <element name="runtime">
+                <ref name="featurestate"/>
+              </element>
+            </optional>
+            <optional>
+              <element name="synic">
+                <ref name="featurestate"/>
+              </element>
+            </optional>
+            <optional>
+              <element name="stimer">
+                <ref name="stimer"/>
+              </element>
+            </optional>
+            <optional>
+              <element name="reset">
+                <ref name="featurestate"/>
+              </element>
+            </optional>
+            <optional>
+              <element name="vendor_id">
+                <ref name="featurestate"/>
+                <optional>
+                  <attribute name="value">
+                    <data type="string">
+                      <param name="pattern">[^,]{0,12}</param>
+                    </data>
+                  </attribute>
+                </optional>
+              </element>
+            </optional>
+            <optional>
+              <element name="frequencies">
+                <ref name="featurestate"/>
+              </element>
+            </optional>
+            <optional>
+              <element name="reenlightenment">
+                <ref name="featurestate"/>
+              </element>
+            </optional>
+            <optional>
+              <element name="tlbflush">
+                <ref name="featurestate"/>
+              </element>
+            </optional>
+            <optional>
+              <element name="ipi">
+                <ref name="featurestate"/>
+              </element>
+            </optional>
+            <optional>
+              <element name="evmcs">
+                <ref name="featurestate"/>
+              </element>
+            </optional>
+          </interleave>
+        </group>
+      </choice>
     </element>
   </define>
 
-- 
2.31.1