mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-20 04:59:49 +00:00
Misc test case fixes for SPICE
* docs/schemas/domain.rng: Fix merge error which left SPICE channel elements under VNC schema. * tests/qemuhelptest.c: Add SPICE flag to kvm-83 test * tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml: Add <memballoon> element
This commit is contained in:
parent
fb76151c28
commit
ff2bb29ca9
@ -1093,27 +1093,6 @@
|
|||||||
<text/>
|
<text/>
|
||||||
</attribute>
|
</attribute>
|
||||||
</optional>
|
</optional>
|
||||||
<zeroOrMore>
|
|
||||||
<element name="channel">
|
|
||||||
<attribute name="name">
|
|
||||||
<choice>
|
|
||||||
<value>main</value>
|
|
||||||
<value>display</value>
|
|
||||||
<value>inputs</value>
|
|
||||||
<value>cursor</value>
|
|
||||||
<value>playback</value>
|
|
||||||
<value>record</value>
|
|
||||||
</choice>
|
|
||||||
</attribute>
|
|
||||||
<attribute name="mode">
|
|
||||||
<choice>
|
|
||||||
<value>any</value>
|
|
||||||
<value>secure</value>
|
|
||||||
<value>insecure</value>
|
|
||||||
</choice>
|
|
||||||
</attribute>
|
|
||||||
</element>
|
|
||||||
</zeroOrMore>
|
|
||||||
</group>
|
</group>
|
||||||
<group>
|
<group>
|
||||||
<attribute name="type">
|
<attribute name="type">
|
||||||
@ -1152,6 +1131,28 @@
|
|||||||
<text/>
|
<text/>
|
||||||
</attribute>
|
</attribute>
|
||||||
</optional>
|
</optional>
|
||||||
|
<zeroOrMore>
|
||||||
|
<element name="channel">
|
||||||
|
<attribute name="name">
|
||||||
|
<choice>
|
||||||
|
<value>main</value>
|
||||||
|
<value>display</value>
|
||||||
|
<value>inputs</value>
|
||||||
|
<value>cursor</value>
|
||||||
|
<value>playback</value>
|
||||||
|
<value>record</value>
|
||||||
|
</choice>
|
||||||
|
</attribute>
|
||||||
|
<attribute name="mode">
|
||||||
|
<choice>
|
||||||
|
<value>any</value>
|
||||||
|
<value>secure</value>
|
||||||
|
<value>insecure</value>
|
||||||
|
</choice>
|
||||||
|
</attribute>
|
||||||
|
<empty/>
|
||||||
|
</element>
|
||||||
|
</zeroOrMore>
|
||||||
</group>
|
</group>
|
||||||
<group>
|
<group>
|
||||||
<attribute name="type">
|
<attribute name="type">
|
||||||
|
@ -153,7 +153,8 @@ mymain(int argc, char **argv)
|
|||||||
QEMUD_CMD_FLAG_NO_KVM_PIT |
|
QEMUD_CMD_FLAG_NO_KVM_PIT |
|
||||||
QEMUD_CMD_FLAG_TDF |
|
QEMUD_CMD_FLAG_TDF |
|
||||||
QEMUD_CMD_FLAG_DRIVE_READONLY |
|
QEMUD_CMD_FLAG_DRIVE_READONLY |
|
||||||
QEMUD_CMD_FLAG_SMBIOS_TYPE,
|
QEMUD_CMD_FLAG_SMBIOS_TYPE |
|
||||||
|
QEMUD_CMD_FLAG_SPICE,
|
||||||
9001, 1, 83);
|
9001, 1, 83);
|
||||||
DO_TEST("qemu-0.10.5",
|
DO_TEST("qemu-0.10.5",
|
||||||
QEMUD_CMD_FLAG_KQEMU |
|
QEMUD_CMD_FLAG_KQEMU |
|
||||||
|
@ -31,5 +31,6 @@
|
|||||||
<video>
|
<video>
|
||||||
<model type='qxl' vram='65536' heads='1'/>
|
<model type='qxl' vram='65536' heads='1'/>
|
||||||
</video>
|
</video>
|
||||||
|
<memballoon model='virtio'/>
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
Loading…
Reference in New Issue
Block a user