--- tests/qemuhotplugtest.c | 48 ++++++------ ....xml => qemuhotplug-base+qemu-agent-detach.xml} | 0 ...u-agent.xml => qemuhotplug-base+qemu-agent.xml} | 0 ...csi.xml => qemuhotplug-base-live+disk-scsi.xml} | 0 ...-usb.xml => qemuhotplug-base-live+disk-usb.xml} | 0 ...o.xml => qemuhotplug-base-live+disk-virtio.xml} | 0 ...=> qemuhotplug-base-live+qemu-agent-detach.xml} | 0 ...nt.xml => qemuhotplug-base-live+qemu-agent.xml} | 0 .../qemuhotplug-base-live.xml} | 0 ...base-with-scsi-controller-live+disk-scsi-2.xml} | 0 ...qemuhotplug-base-with-scsi-controller-live.xml} | 0 ...e-without-scsi-controller-live+disk-scsi-2.xml} | 0 ...uhotplug-base-without-scsi-controller-live.xml} | 0 .../qemuhotplug-console-compat-2-live.xml} | 0 .../qemuhotplugtestdata/qemuhotplug-disk-cdrom.xml | 37 +++++++++ ...plug-graphics-spice-listen-network-password.xml | 11 +++ .../qemuhotplug-graphics-spice-listen-network.xml | 36 ++++++++- .../qemuhotplug-graphics-spice-timeout.xml | 87 ++++++++++++++++++++++ .../qemuhotplug-graphics-spice.xml} | 26 ++++--- 19 files changed, 208 insertions(+), 37 deletions(-) rename tests/qemuhotplugtestdata/{qemuhotplug-hotplug-base-live+qemu-agent-detach.xml => qemuhotplug-base+qemu-agent-detach.xml} (100%) rename tests/qemuhotplugtestdata/{qemuhotplug-hotplug-base-live+qemu-agent.xml => qemuhotplug-base+qemu-agent.xml} (100%) rename tests/qemuhotplugtestdata/{qemuhotplug-hotplug-base-live+disk-scsi.xml => qemuhotplug-base-live+disk-scsi.xml} (100%) rename tests/qemuhotplugtestdata/{qemuhotplug-hotplug-base-live+disk-usb.xml => qemuhotplug-base-live+disk-usb.xml} (100%) rename tests/qemuhotplugtestdata/{qemuhotplug-hotplug-base-live+disk-virtio.xml => qemuhotplug-base-live+disk-virtio.xml} (100%) rename tests/qemuhotplugtestdata/{qemuhotplug-hotplug-base+qemu-agent-detach.xml => qemuhotplug-base-live+qemu-agent-detach.xml} (100%) rename tests/qemuhotplugtestdata/{qemuhotplug-hotplug-base+qemu-agent.xml => qemuhotplug-base-live+qemu-agent.xml} (100%) rename tests/{qemuxml2argvdata/qemuxml2argv-hotplug-base-live.xml => qemuhotplugtestdata/qemuhotplug-base-live.xml} (100%) rename tests/qemuhotplugtestdata/{qemuhotplug-hotplug-base-with-scsi-controller-live+disk-scsi-2.xml => qemuhotplug-base-with-scsi-controller-live+disk-scsi-2.xml} (100%) rename tests/{qemuxml2argvdata/qemuxml2argv-hotplug-base-with-scsi-controller-live.xml => qemuhotplugtestdata/qemuhotplug-base-with-scsi-controller-live.xml} (100%) rename tests/qemuhotplugtestdata/{qemuhotplug-hotplug-base-without-scsi-controller-live+disk-scsi-2.xml => qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml} (100%) rename tests/{qemuxml2argvdata/qemuxml2argv-hotplug-base-without-scsi-controller-live.xml => qemuhotplugtestdata/qemuhotplug-base-without-scsi-controller-live.xml} (100%) rename tests/{qemuxml2argvdata/qemuxml2argv-console-compat-2-live.xml => qemuhotplugtestdata/qemuhotplug-console-compat-2-live.xml} (100%) create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-disk-cdrom.xml create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-listen-network-password.xml create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-timeout.xml rename tests/{qemuxml2argvdata/qemuxml2argv-graphics-spice-listen-network.xml => qemuhotplugtestdata/qemuhotplug-graphics-spice.xml} (57%) diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index ae57c0a..369d27e 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -225,7 +225,7 @@ testQemuHotplug(const void *data) qemuMonitorTestPtr test_mon = NULL; qemuDomainObjPrivatePtr priv = NULL; - if (virAsprintf(&domain_filename, "%s/qemuxml2argvdata/qemuxml2argv-%s.xml", + if (virAsprintf(&domain_filename, "%s/qemuhotplugtestdata/qemuhotplug-%s.xml", abs_srcdir, test->domain_filename) < 0 || virAsprintf(&device_filename, "%s/qemuhotplugtestdata/qemuhotplug-%s.xml", abs_srcdir, test->device_filename) < 0 || @@ -423,7 +423,7 @@ mymain(void) DO_TEST_UPDATE("graphics-spice-timeout", "graphics-spice-timeout-password", false, false, "set_password", QMP_OK, "expire_password", QMP_OK); DO_TEST_UPDATE("graphics-spice", "graphics-spice-listen", true, false, NULL); - DO_TEST_UPDATE("graphics-spice-listen-network", "graphics-spice-listen-network", false, false, + DO_TEST_UPDATE("graphics-spice-listen-network", "graphics-spice-listen-network-password", false, false, "set_password", QMP_OK, "expire_password", QMP_OK); /* Strange huh? Currently, only graphics can be updated :-P */ DO_TEST_UPDATE("disk-cdrom", "disk-cdrom-nochange", true, false, NULL); @@ -436,58 +436,58 @@ mymain(void) "device_del", QMP_OK, "chardev-remove", QMP_OK); - DO_TEST_ATTACH("hotplug-base-live", "disk-virtio", false, true, + DO_TEST_ATTACH("base-live", "disk-virtio", false, true, "human-monitor-command", HMP("OK\\r\\n"), "device_add", QMP_OK); - DO_TEST_DETACH("hotplug-base-live", "disk-virtio", false, false, + DO_TEST_DETACH("base-live", "disk-virtio", false, false, "device_del", QMP_OK, "human-monitor-command", HMP("")); - DO_TEST_ATTACH_EVENT("hotplug-base-live", "disk-virtio", false, true, + DO_TEST_ATTACH_EVENT("base-live", "disk-virtio", false, true, "human-monitor-command", HMP("OK\\r\\n"), "device_add", QMP_OK); - DO_TEST_DETACH("hotplug-base-live", "disk-virtio", true, true, + DO_TEST_DETACH("base-live", "disk-virtio", true, true, "device_del", QMP_OK, "human-monitor-command", HMP("")); - DO_TEST_DETACH("hotplug-base-live", "disk-virtio", false, false, + DO_TEST_DETACH("base-live", "disk-virtio", false, false, "device_del", QMP_DEVICE_DELETED("virtio-disk4") QMP_OK, "human-monitor-command", HMP("")); - DO_TEST_ATTACH("hotplug-base-live", "disk-usb", false, true, + DO_TEST_ATTACH("base-live", "disk-usb", false, true, "human-monitor-command", HMP("OK\\r\\n"), "device_add", QMP_OK); - DO_TEST_DETACH("hotplug-base-live", "disk-usb", false, false, + DO_TEST_DETACH("base-live", "disk-usb", false, false, "device_del", QMP_OK, "human-monitor-command", HMP("")); - DO_TEST_ATTACH_EVENT("hotplug-base-live", "disk-usb", false, true, + DO_TEST_ATTACH_EVENT("base-live", "disk-usb", false, true, "human-monitor-command", HMP("OK\\r\\n"), "device_add", QMP_OK); - DO_TEST_DETACH("hotplug-base-live", "disk-usb", true, true, + DO_TEST_DETACH("base-live", "disk-usb", true, true, "device_del", QMP_OK, "human-monitor-command", HMP("")); - DO_TEST_DETACH("hotplug-base-live", "disk-usb", false, false, + DO_TEST_DETACH("base-live", "disk-usb", false, false, "device_del", QMP_DEVICE_DELETED("usb-disk16") QMP_OK, "human-monitor-command", HMP("")); - DO_TEST_ATTACH("hotplug-base-live", "disk-scsi", false, true, + DO_TEST_ATTACH("base-live", "disk-scsi", false, true, "human-monitor-command", HMP("OK\\r\\n"), "device_add", QMP_OK); - DO_TEST_DETACH("hotplug-base-live", "disk-scsi", false, false, + DO_TEST_DETACH("base-live", "disk-scsi", false, false, "device_del", QMP_OK, "human-monitor-command", HMP("")); - DO_TEST_ATTACH_EVENT("hotplug-base-live", "disk-scsi", false, true, + DO_TEST_ATTACH_EVENT("base-live", "disk-scsi", false, true, "human-monitor-command", HMP("OK\\r\\n"), "device_add", QMP_OK); - DO_TEST_DETACH("hotplug-base-live", "disk-scsi", true, true, + DO_TEST_DETACH("base-live", "disk-scsi", true, true, "device_del", QMP_OK, "human-monitor-command", HMP("")); - DO_TEST_DETACH("hotplug-base-live", "disk-scsi", false, false, + DO_TEST_DETACH("base-live", "disk-scsi", false, false, "device_del", QMP_DEVICE_DELETED("scsi0-0-0-5") QMP_OK, "human-monitor-command", HMP("")); - DO_TEST_ATTACH("hotplug-base-without-scsi-controller-live", "disk-scsi-2", false, true, + DO_TEST_ATTACH("base-without-scsi-controller-live", "disk-scsi-2", false, true, /* Four controllers added */ "device_add", QMP_OK, "device_add", QMP_OK, @@ -496,11 +496,11 @@ mymain(void) "human-monitor-command", HMP("OK\\r\\n"), /* Disk added */ "device_add", QMP_OK); - DO_TEST_DETACH("hotplug-base-with-scsi-controller-live", "disk-scsi-2", false, false, + DO_TEST_DETACH("base-with-scsi-controller-live", "disk-scsi-2", false, false, "device_del", QMP_OK, "human-monitor-command", HMP("")); - DO_TEST_ATTACH_EVENT("hotplug-base-without-scsi-controller-live", "disk-scsi-2", false, true, + DO_TEST_ATTACH_EVENT("base-without-scsi-controller-live", "disk-scsi-2", false, true, /* Four controllers added */ "device_add", QMP_OK, "device_add", QMP_OK, @@ -509,17 +509,17 @@ mymain(void) "human-monitor-command", HMP("OK\\r\\n"), /* Disk added */ "device_add", QMP_OK); - DO_TEST_DETACH("hotplug-base-with-scsi-controller-live", "disk-scsi-2", true, true, + DO_TEST_DETACH("base-with-scsi-controller-live", "disk-scsi-2", true, true, "device_del", QMP_OK, "human-monitor-command", HMP("")); - DO_TEST_DETACH("hotplug-base-with-scsi-controller-live", "disk-scsi-2", false, false, + DO_TEST_DETACH("base-with-scsi-controller-live", "disk-scsi-2", false, false, "device_del", QMP_DEVICE_DELETED("scsi3-0-5-7") QMP_OK, "human-monitor-command", HMP("")); - DO_TEST_ATTACH("hotplug-base-live", "qemu-agent", false, true, + DO_TEST_ATTACH("base-live", "qemu-agent", false, true, "chardev-add", QMP_OK, "device_add", QMP_OK); - DO_TEST_DETACH("hotplug-base-live", "qemu-agent-detach", false, false, + DO_TEST_DETACH("base-live", "qemu-agent-detach", false, false, "device_del", QMP_OK, "chardev-remove", QMP_OK); diff --git a/tests/qemuhotplugtestdata/qemuhotplug-hotplug-base-live+qemu-agent-detach.xml b/tests/qemuhotplugtestdata/qemuhotplug-base+qemu-agent-detach.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-hotplug-base-live+qemu-agent-detach.xml rename to tests/qemuhotplugtestdata/qemuhotplug-base+qemu-agent-detach.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-hotplug-base-live+qemu-agent.xml b/tests/qemuhotplugtestdata/qemuhotplug-base+qemu-agent.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-hotplug-base-live+qemu-agent.xml rename to tests/qemuhotplugtestdata/qemuhotplug-base+qemu-agent.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-hotplug-base-live+disk-scsi.xml b/tests/qemuhotplugtestdata/qemuhotplug-base-live+disk-scsi.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-hotplug-base-live+disk-scsi.xml rename to tests/qemuhotplugtestdata/qemuhotplug-base-live+disk-scsi.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-hotplug-base-live+disk-usb.xml b/tests/qemuhotplugtestdata/qemuhotplug-base-live+disk-usb.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-hotplug-base-live+disk-usb.xml rename to tests/qemuhotplugtestdata/qemuhotplug-base-live+disk-usb.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-hotplug-base-live+disk-virtio.xml b/tests/qemuhotplugtestdata/qemuhotplug-base-live+disk-virtio.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-hotplug-base-live+disk-virtio.xml rename to tests/qemuhotplugtestdata/qemuhotplug-base-live+disk-virtio.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-hotplug-base+qemu-agent-detach.xml b/tests/qemuhotplugtestdata/qemuhotplug-base-live+qemu-agent-detach.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-hotplug-base+qemu-agent-detach.xml rename to tests/qemuhotplugtestdata/qemuhotplug-base-live+qemu-agent-detach.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-hotplug-base+qemu-agent.xml b/tests/qemuhotplugtestdata/qemuhotplug-base-live+qemu-agent.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-hotplug-base+qemu-agent.xml rename to tests/qemuhotplugtestdata/qemuhotplug-base-live+qemu-agent.xml diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hotplug-base-live.xml b/tests/qemuhotplugtestdata/qemuhotplug-base-live.xml similarity index 100% rename from tests/qemuxml2argvdata/qemuxml2argv-hotplug-base-live.xml rename to tests/qemuhotplugtestdata/qemuhotplug-base-live.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-hotplug-base-with-scsi-controller-live+disk-scsi-2.xml b/tests/qemuhotplugtestdata/qemuhotplug-base-with-scsi-controller-live+disk-scsi-2.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-hotplug-base-with-scsi-controller-live+disk-scsi-2.xml rename to tests/qemuhotplugtestdata/qemuhotplug-base-with-scsi-controller-live+disk-scsi-2.xml diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hotplug-base-with-scsi-controller-live.xml b/tests/qemuhotplugtestdata/qemuhotplug-base-with-scsi-controller-live.xml similarity index 100% rename from tests/qemuxml2argvdata/qemuxml2argv-hotplug-base-with-scsi-controller-live.xml rename to tests/qemuhotplugtestdata/qemuhotplug-base-with-scsi-controller-live.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-hotplug-base-without-scsi-controller-live+disk-scsi-2.xml b/tests/qemuhotplugtestdata/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-hotplug-base-without-scsi-controller-live+disk-scsi-2.xml rename to tests/qemuhotplugtestdata/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hotplug-base-without-scsi-controller-live.xml b/tests/qemuhotplugtestdata/qemuhotplug-base-without-scsi-controller-live.xml similarity index 100% rename from tests/qemuxml2argvdata/qemuxml2argv-hotplug-base-without-scsi-controller-live.xml rename to tests/qemuhotplugtestdata/qemuhotplug-base-without-scsi-controller-live.xml diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-2-live.xml b/tests/qemuhotplugtestdata/qemuhotplug-console-compat-2-live.xml similarity index 100% rename from tests/qemuxml2argvdata/qemuxml2argv-console-compat-2-live.xml rename to tests/qemuhotplugtestdata/qemuhotplug-console-compat-2-live.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-disk-cdrom.xml b/tests/qemuhotplugtestdata/qemuhotplug-disk-cdrom.xml new file mode 100644 index 0000000..04f4976 --- /dev/null +++ b/tests/qemuhotplugtestdata/qemuhotplug-disk-cdrom.xml @@ -0,0 +1,37 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw'/> + <source file='/root/boot.iso'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-listen-network-password.xml b/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-listen-network-password.xml new file mode 100644 index 0000000..426a14d --- /dev/null +++ b/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-listen-network-password.xml @@ -0,0 +1,11 @@ + <graphics autoport='yes' connected='disconnect' keymap='en-us' passwd='password2' passwdValidTo='2013-06-20T01:34:37' port='5900' tlsPort='5901' type='spice'> + <listen address='10.65.210.231' network='vdsm-rhevm' type='network'/> + <channel mode='secure' name='main'/> + <channel mode='secure' name='display'/> + <channel mode='secure' name='inputs'/> + <channel mode='secure' name='cursor'/> + <channel mode='secure' name='playback'/> + <channel mode='secure' name='record'/> + <channel mode='secure' name='smartcard'/> + <channel mode='secure' name='usbredir'/> + </graphics> diff --git a/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-listen-network.xml b/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-listen-network.xml index 426a14d..34971fe 100644 --- a/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-listen-network.xml +++ b/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-listen-network.xml @@ -1,4 +1,29 @@ - <graphics autoport='yes' connected='disconnect' keymap='en-us' passwd='password2' passwdValidTo='2013-06-20T01:34:37' port='5900' tlsPort='5901' type='spice'> +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <graphics autoport='yes' connected='disconnect' keymap='en-us' passwd='password' passwdValidTo='2013-06-20T01:34:37' port='5900' tlsPort='5901' type='spice'> <listen address='10.65.210.231' network='vdsm-rhevm' type='network'/> <channel mode='secure' name='main'/> <channel mode='secure' name='display'/> @@ -9,3 +34,12 @@ <channel mode='secure' name='smartcard'/> <channel mode='secure' name='usbredir'/> </graphics> + <video> + <model type='qxl' ram='65536' vram='18432' heads='1'/> + </video> + <video> + <model type='qxl' ram='65536' vram='32768' heads='1'/> + </video> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-timeout.xml b/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-timeout.xml new file mode 100644 index 0000000..bfb189c --- /dev/null +++ b/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-timeout.xml @@ -0,0 +1,87 @@ +<domain type='kvm'> + <name>f14</name> + <uuid>553effab-b5e1-2d80-dfe3-da4344826c43</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>2</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='cdrom'/> + <boot dev='hd'/> + <bootmenu enable='yes'/> + </os> + <features> + <acpi/> + <apic/> + <pae/> + </features> + <cpu match='exact'> + <model>core2duo</model> + <vendor>Intel</vendor> + <topology sockets='1' cores='2' threads='1'/> + <feature policy='require' name='lahf_lm'/> + <feature policy='require' name='xtpr'/> + <feature policy='require' name='cx16'/> + <feature policy='require' name='tm2'/> + <feature policy='require' name='est'/> + <feature policy='require' name='vmx'/> + <feature policy='require' name='ds_cpl'/> + <feature policy='require' name='pbe'/> + <feature policy='require' name='tm'/> + <feature policy='require' name='ht'/> + <feature policy='require' name='ss'/> + <feature policy='require' name='acpi'/> + <feature policy='require' name='ds'/> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/bin/qemu-kvm</emulator> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2'/> + <source file='/var/lib/libvirt/images/f14.img'/> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </disk> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw'/> + <source file='/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='virtio-serial' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> + </controller> + <interface type='ethernet'> + <mac address='52:54:00:71:70:89'/> + <script path='/etc/qemu-ifup'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> + </interface> + <serial type='pty'> + <target port='0'/> + </serial> + <console type='pty'> + <target type='serial' port='0'/> + </console> + <input type='tablet' bus='usb'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <graphics type='spice' port='5900' autoport='no' passwd='sercet' passwdValidTo='2011-05-31T16:11:22' connected='disconnect'/> + <sound model='ac97'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </sound> + <video> + <model type='vga' vram='16384' heads='1'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </video> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> + </memballoon> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-listen-network.xml b/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice.xml similarity index 57% rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-listen-network.xml rename to tests/qemuhotplugtestdata/qemuhotplug-graphics-spice.xml index 34971fe..0c61ee5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-listen-network.xml +++ b/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice.xml @@ -23,22 +23,24 @@ <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> - <graphics autoport='yes' connected='disconnect' keymap='en-us' passwd='password' passwdValidTo='2013-06-20T01:34:37' port='5900' tlsPort='5901' type='spice'> - <listen address='10.65.210.231' network='vdsm-rhevm' type='network'/> - <channel mode='secure' name='main'/> - <channel mode='secure' name='display'/> - <channel mode='secure' name='inputs'/> - <channel mode='secure' name='cursor'/> - <channel mode='secure' name='playback'/> - <channel mode='secure' name='record'/> - <channel mode='secure' name='smartcard'/> - <channel mode='secure' name='usbredir'/> + <input type='keyboard' bus='ps2'/> + <graphics type='spice' port='5903' tlsPort='5904' autoport='no' listen='127.0.0.1' defaultMode='secure'> + <listen type='address' address='127.0.0.1'/> + <channel name='main' mode='secure'/> + <channel name='inputs' mode='insecure'/> + <image compression='auto_glz'/> + <jpeg compression='auto'/> + <zlib compression='auto'/> + <playback compression='on'/> + <streaming mode='filter'/> + <clipboard copypaste='no'/> + <filetransfer enable='no'/> </graphics> <video> - <model type='qxl' ram='65536' vram='18432' heads='1'/> + <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1'/> </video> <video> - <model type='qxl' ram='65536' vram='32768' heads='1'/> + <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1'/> </video> <memballoon model='virtio'/> </devices> -- 2.7.4 (Apple Git-66)