From: Tim Wiederhake <twiederh@redhat.com>
Date: Thu, 25 Nov 2021 18:57:49 +0000 (+0100)
Subject: schema: Wrap hyperv element in choice and group
X-Git-Tag: v8.0.0-rc1~187
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa0789cc0cb615d2cd488874feb9f136f6c06485;p=thirdparty%2Flibvirt.git

schema: Wrap hyperv element in choice and group

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

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 736cb35d4e..862647a4e6 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -7100,90 +7100,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>