|
 |
d76c62 |
From f37eb0d50ba30f036e08e8144bd52b3ebc1751e1 Mon Sep 17 00:00:00 2001
|
|
|
d76c62 |
Message-Id: <f37eb0d50ba30f036e08e8144bd52b3ebc1751e1@dist-git>
|
|
|
d76c62 |
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
|
|
|
d76c62 |
Date: Wed, 4 Mar 2020 12:42:35 +0100
|
|
|
d76c62 |
Subject: [PATCH] schema: wrap fsDriver in a choice group
|
|
|
d76c62 |
MIME-Version: 1.0
|
|
|
d76c62 |
Content-Type: text/plain; charset=UTF-8
|
|
|
d76c62 |
Content-Transfer-Encoding: 8bit
|
|
|
d76c62 |
|
|
|
d76c62 |
Allow adding new groups without changing indentation.
|
|
|
d76c62 |
|
|
|
d76c62 |
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
|
|
d76c62 |
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
|
|
|
d76c62 |
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
d76c62 |
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
|
d76c62 |
Tested-by: Andrea Bolognani <abologna@redhat.com>
|
|
|
d76c62 |
(cherry picked from commit 3913abd476cfe663db978d9110daa8bdc6d4e5b6)
|
|
|
d76c62 |
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
|
|
d76c62 |
https://bugzilla.redhat.com/show_bug.cgi?id=1694166
|
|
|
d76c62 |
Message-Id: <a802f84a40623bf55d9c1b1307a117b6e133daad.1583322090.git.jtomko@redhat.com>
|
|
|
d76c62 |
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
d76c62 |
---
|
|
|
d76c62 |
docs/schemas/domaincommon.rng | 50 +++++++++++++++++++----------------
|
|
|
d76c62 |
1 file changed, 27 insertions(+), 23 deletions(-)
|
|
|
d76c62 |
|
|
|
d76c62 |
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
|
|
|
d76c62 |
index 38aef19e89..bfd8786ea8 100644
|
|
|
d76c62 |
--- a/docs/schemas/domaincommon.rng
|
|
|
d76c62 |
+++ b/docs/schemas/domaincommon.rng
|
|
|
d76c62 |
@@ -2620,29 +2620,33 @@
|
|
|
d76c62 |
for this kind of info, and 'type' for the
|
|
|
d76c62 |
storage format. We need the latter too, so
|
|
|
d76c62 |
had to invent a new attribute name -->
|
|
|
d76c62 |
- <optional>
|
|
|
d76c62 |
- <attribute name="type">
|
|
|
d76c62 |
- <choice>
|
|
|
d76c62 |
- <value>path</value>
|
|
|
d76c62 |
- <value>handle</value>
|
|
|
d76c62 |
- <value>loop</value>
|
|
|
d76c62 |
- <value>nbd</value>
|
|
|
d76c62 |
- <value>ploop</value>
|
|
|
d76c62 |
- </choice>
|
|
|
d76c62 |
- </attribute>
|
|
|
d76c62 |
- </optional>
|
|
|
d76c62 |
- <optional>
|
|
|
d76c62 |
- <attribute name="format">
|
|
|
d76c62 |
- <ref name="storageFormat"/>
|
|
|
d76c62 |
- </attribute>
|
|
|
d76c62 |
- </optional>
|
|
|
d76c62 |
- <optional>
|
|
|
d76c62 |
- <attribute name="wrpolicy">
|
|
|
d76c62 |
- <value>immediate</value>
|
|
|
d76c62 |
- </attribute>
|
|
|
d76c62 |
- </optional>
|
|
|
d76c62 |
- <ref name='virtioOptions'/>
|
|
|
d76c62 |
- <empty/>
|
|
|
d76c62 |
+ <choice>
|
|
|
d76c62 |
+ <group>
|
|
|
d76c62 |
+ <optional>
|
|
|
d76c62 |
+ <attribute name="type">
|
|
|
d76c62 |
+ <choice>
|
|
|
d76c62 |
+ <value>path</value>
|
|
|
d76c62 |
+ <value>handle</value>
|
|
|
d76c62 |
+ <value>loop</value>
|
|
|
d76c62 |
+ <value>nbd</value>
|
|
|
d76c62 |
+ <value>ploop</value>
|
|
|
d76c62 |
+ </choice>
|
|
|
d76c62 |
+ </attribute>
|
|
|
d76c62 |
+ </optional>
|
|
|
d76c62 |
+ <optional>
|
|
|
d76c62 |
+ <attribute name="format">
|
|
|
d76c62 |
+ <ref name="storageFormat"/>
|
|
|
d76c62 |
+ </attribute>
|
|
|
d76c62 |
+ </optional>
|
|
|
d76c62 |
+ <optional>
|
|
|
d76c62 |
+ <attribute name="wrpolicy">
|
|
|
d76c62 |
+ <value>immediate</value>
|
|
|
d76c62 |
+ </attribute>
|
|
|
d76c62 |
+ </optional>
|
|
|
d76c62 |
+ <ref name='virtioOptions'/>
|
|
|
d76c62 |
+ </group>
|
|
|
d76c62 |
+ <empty/>
|
|
|
d76c62 |
+ </choice>
|
|
|
d76c62 |
</element>
|
|
|
d76c62 |
</define>
|
|
|
d76c62 |
|
|
|
d76c62 |
--
|
|
|
d76c62 |
2.25.1
|
|
|
d76c62 |
|