提交 1ed32989 编写于 作者: M Michal Privoznik

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: NMichal Privoznik <mprivozn@redhat.com>
Reviewed-by: NFabiano Fidêncio <fidencio@redhat.com>
Reviewed-by: NCole Robinson <crobinso@redhat.com>
上级 6c6d93bc
...@@ -6295,37 +6295,41 @@ ...@@ -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>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册