External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-30 13:37:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Misc test case fixes for SPICE

Browse Source 
* 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:
Daniel P. Berrange 2010-11-09 13:51:21 +00:00
parent fb76151c28
commit ff2bb29ca9
3 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
docs/schemas/domain.rng
View File

@ -1093,27 +1093,6 @@
<text/>
</attribute>
</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>
<attribute name="type">
@ -1152,6 +1131,28 @@
<text/>
</attribute>
</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>
<attribute name="type">

3
tests/qemuhelptest.c
View File

@ -153,7 +153,8 @@ mymain(int argc, char **argv)
QEMUD_CMD_FLAG_NO_KVM_PIT |
QEMUD_CMD_FLAG_TDF |
QEMUD_CMD_FLAG_DRIVE_READONLY |
QEMUD_CMD_FLAG_SMBIOS_TYPE,
QEMUD_CMD_FLAG_SMBIOS_TYPE |
QEMUD_CMD_FLAG_SPICE,
9001, 1, 83);
DO_TEST("qemu-0.10.5",
QEMUD_CMD_FLAG_KQEMU |

1
tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml
View File

@ -31,5 +31,6 @@
<video>
<model type='qxl' vram='65536' heads='1'/>
</video>
<memballoon model='virtio'/>
</devices>
</domain>