[PATCH 1/3] schemas: Allow fsDriver to be interleaved
Our <filesystem/> element can have <driver/> child element. But
with the way our schema is written it can't be interleaved and
has to go first.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
docs/schemas/domaincommon.rng | 42 +++++++++++++++++------------------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 86816e9b1d..49654624a9 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -2628,10 +2628,10 @@
<attribute name="type">
<value>file</value>
</attribute>
- <optional>
- <ref name="fsDriver"/>
- </optional>
<interleave>
+ <optional>
+ <ref name="fsDriver"/>
+ </optional>
<element name="source">
<attribute name="file">
<ref name="absFilePath"/>
@@ -2644,10 +2644,10 @@
<attribute name="type">
<value>block</value>
</attribute>
- <optional>
- <ref name="fsDriver"/>
- </optional>
<interleave>
+ <optional>
+ <ref name="fsDriver"/>
+ </optional>
<element name="source">
<attribute name="dev">
<ref name="absFilePath"/>
@@ -2663,13 +2663,13 @@
<value>mount</value>
</attribute>
</optional>
- <optional>
- <ref name="fsDriver"/>
- </optional>
- <optional>
- <ref name="fsBinary"/>
- </optional>
<interleave>
+ <optional>
+ <ref name="fsDriver"/>
+ </optional>
+ <optional>
+ <ref name="fsBinary"/>
+ </optional>
<element name="source">
<attribute name="dir">
<ref name="absDirPath"/>
@@ -2684,10 +2684,10 @@
<value>bind</value>
</attribute>
</optional>
- <optional>
- <ref name="fsDriver"/>
- </optional>
<interleave>
+ <optional>
+ <ref name="fsDriver"/>
+ </optional>
<element name="source">
<attribute name="dir">
<ref name="absDirPath"/>
@@ -2700,10 +2700,10 @@
<attribute name="type">
<value>template</value>
</attribute>
- <optional>
- <ref name="fsDriver"/>
- </optional>
<interleave>
+ <optional>
+ <ref name="fsDriver"/>
+ </optional>
<element name="source">
<attribute name="name">
<ref name="genericName"/>
@@ -2716,10 +2716,10 @@
<attribute name="type">
<value>ram</value>
</attribute>
- <optional>
- <ref name="fsDriver"/>
- </optional>
<interleave>
+ <optional>
+ <ref name="fsDriver"/>
+ </optional>
<element name="source">
<attribute name="usage">
<ref name="unsignedLong"/>
--
2.26.2