From: Michal Privoznik <mprivozn@redhat.com>
Date: Fri, 20 Dec 2019 09:24:07 +0000 (+0100)
Subject: schemas: Allow additional qemu cmd line arguments/env variables and qemuCaps to be... 
X-Git-Tag: v6.0.0-rc1~105
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ed32989ea27589c34f8f3f4f79dde4bfb0b40bb;p=thirdparty%2Flibvirt.git

schemas: Allow additional qemu cmd line arguments/env variables and qemuCaps to be interleaved

While command line arguments are sort of positional (because you
have to have two entries, one for "-arg" the other for "value"),
it doesn't really matter whether env variables come before or
after command line arguments.

And it matters even less when playing with qemu capabilities.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
Reviewed-by: Cole Robinson <crobinso@redhat.com>
---

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 3d9fc5f216..9b555d6acb 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -6295,37 +6295,41 @@
     -->
   <define name="qemucmdline">
     <element name="commandline" ns="http://libvirt.org/schemas/domain/qemu/1.0">
-      <zeroOrMore>
-        <element name="arg">
-          <attribute name='value'/>
-        </element>
-      </zeroOrMore>
-      <zeroOrMore>
-        <element name="env">
-          <attribute name='name'>
-            <ref name="filter-param-name"/>
-          </attribute>
-          <optional>
+      <interleave>
+        <zeroOrMore>
+          <element name="arg">
             <attribute name='value'/>
-          </optional>
-          <empty/>
-        </element>
-      </zeroOrMore>
+          </element>
+        </zeroOrMore>
+        <zeroOrMore>
+          <element name="env">
+            <attribute name='name'>
+              <ref name="filter-param-name"/>
+            </attribute>
+            <optional>
+              <attribute name='value'/>
+            </optional>
+            <empty/>
+          </element>
+        </zeroOrMore>
+      </interleave>
     </element>
   </define>
 
   <define name="qemucapabilities">
     <element name="capabilities" ns="http://libvirt.org/schemas/domain/qemu/1.0">
-      <zeroOrMore>
-        <element name="add">
-          <attribute name="capability"/>
-        </element>
-      </zeroOrMore>
-      <zeroOrMore>
-        <element name="del">
-          <attribute name="capability"/>
-        </element>
-      </zeroOrMore>
+      <interleave>
+        <zeroOrMore>
+          <element name="add">
+            <attribute name="capability"/>
+          </element>
+        </zeroOrMore>
+        <zeroOrMore>
+          <element name="del">
+            <attribute name="capability"/>
+          </element>
+        </zeroOrMore>
+      </interleave>
     </element>
   </define>