mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-05 22:05:47 +00:00
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>
This commit is contained in:
parent
6c6d93bc62
commit
1ed32989ea
@ -6295,37 +6295,41 @@
|
|||||||
-->
|
-->
|
||||||
<define name="qemucmdline">
|
<define name="qemucmdline">
|
||||||
<element name="commandline" ns="http://libvirt.org/schemas/domain/qemu/1.0">
|
<element name="commandline" ns="http://libvirt.org/schemas/domain/qemu/1.0">
|
||||||
<zeroOrMore>
|
<interleave>
|
||||||
<element name="arg">
|
<zeroOrMore>
|
||||||
<attribute name='value'/>
|
<element name="arg">
|
||||||
</element>
|
|
||||||
</zeroOrMore>
|
|
||||||
<zeroOrMore>
|
|
||||||
<element name="env">
|
|
||||||
<attribute name='name'>
|
|
||||||
<ref name="filter-param-name"/>
|
|
||||||
</attribute>
|
|
||||||
<optional>
|
|
||||||
<attribute name='value'/>
|
<attribute name='value'/>
|
||||||
</optional>
|
</element>
|
||||||
<empty/>
|
</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>
|
</element>
|
||||||
</define>
|
</define>
|
||||||
|
|
||||||
<define name="qemucapabilities">
|
<define name="qemucapabilities">
|
||||||
<element name="capabilities" ns="http://libvirt.org/schemas/domain/qemu/1.0">
|
<element name="capabilities" ns="http://libvirt.org/schemas/domain/qemu/1.0">
|
||||||
<zeroOrMore>
|
<interleave>
|
||||||
<element name="add">
|
<zeroOrMore>
|
||||||
<attribute name="capability"/>
|
<element name="add">
|
||||||
</element>
|
<attribute name="capability"/>
|
||||||
</zeroOrMore>
|
</element>
|
||||||
<zeroOrMore>
|
</zeroOrMore>
|
||||||
<element name="del">
|
<zeroOrMore>
|
||||||
<attribute name="capability"/>
|
<element name="del">
|
||||||
</element>
|
<attribute name="capability"/>
|
||||||
</zeroOrMore>
|
</element>
|
||||||
|
</zeroOrMore>
|
||||||
|
</interleave>
|
||||||
</element>
|
</element>
|
||||||
</define>
|
</define>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user