From: Ján Tomko <jtomko@redhat.com>
Date: Tue, 21 Jan 2020 08:02:58 +0000 (+0100)
Subject: schema: wrap fsDriver in a choice group
X-Git-Tag: v6.2.0-rc1~308
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3913abd476cfe663db978d9110daa8bdc6d4e5b6;p=thirdparty%2Flibvirt.git

schema: wrap fsDriver in a choice group

Allow adding new groups without changing indentation.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Tested-by: Andrea Bolognani <abologna@redhat.com>
---

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index c00ace7d9c..0e7b8d389e 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -2620,29 +2620,33 @@
            for this kind of info, and 'type' for the
            storage format. We need the latter too, so
            had to invent a new attribute name -->
-      <optional>
-        <attribute name="type">
-          <choice>
-            <value>path</value>
-            <value>handle</value>
-            <value>loop</value>
-            <value>nbd</value>
-            <value>ploop</value>
-          </choice>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="format">
-          <ref name="storageFormat"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="wrpolicy">
-          <value>immediate</value>
-        </attribute>
-      </optional>
-      <ref name='virtioOptions'/>
-      <empty/>
+      <choice>
+        <group>
+          <optional>
+            <attribute name="type">
+              <choice>
+                <value>path</value>
+                <value>handle</value>
+                <value>loop</value>
+                <value>nbd</value>
+                <value>ploop</value>
+              </choice>
+            </attribute>
+          </optional>
+          <optional>
+            <attribute name="format">
+              <ref name="storageFormat"/>
+            </attribute>
+          </optional>
+          <optional>
+            <attribute name="wrpolicy">
+              <value>immediate</value>
+            </attribute>
+          </optional>
+          <ref name='virtioOptions'/>
+        </group>
+        <empty/>
+      </choice>
     </element>
   </define>