External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 19:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: qemuxml2argv: Add some QEMU_CAPS_CHARDEV annotations

Browse Source 
Several tests are intending to test some serial/console related
bits but aren't setting QEMU_CAPS_CHARDEV. This will soon be enabled
unconditionally so let's add it ahead of time.

* q35-virt-manager-basic: Intended to test a virt-manager q35 config,
    which will include a serial/console device
* console-compat*: console/serial XML compat handling
* bios: Needs a serial device for sgabios CLI

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson 2017-06-26 13:02:57 -04:00
parent 9818c08eed
commit 67a2de414f
5 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/qemuxml2argvdata/qemuxml2argv-bios.args
View File

@ -23,6 +23,7 @@ server,nowait \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
-serial pty \ -chardev pty,id=charserial0 \
-device isa-serial,chardev=charserial0,id=serial0 \
-device usb-tablet,id=input0,bus=usb.0,port=1 \ -device usb-tablet,id=input0,bus=usb.0,port=1 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

3
tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args
View File

@ -21,5 +21,6 @@ server,nowait \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
-serial pty \ -chardev pty,id=charserial0 \
-device isa-serial,chardev=charserial0,id=serial0 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

3
tests/qemuxml2argvdata/qemuxml2argv-console-compat.args
View File

@ -21,4 +21,5 @@ server,nowait \
-usb \ -usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
-serial pty -chardev pty,id=charserial0 \
-device isa-serial,chardev=charserial0,id=serial0

3
tests/qemuxml2argvdata/qemuxml2argv-q35-virt-manager-basic.args
View File

@ -37,7 +37,8 @@ id=virtio-disk0 \
-netdev user,id=hostnet0 \ -netdev user,id=hostnet0 \
-device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:9a:e6:c6,bus=pci.1,\ -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:9a:e6:c6,bus=pci.1,\
addr=0x0 \ addr=0x0 \
-serial pty \ -chardev pty,id=charserial0 \
-device isa-serial,chardev=charserial0,id=serial0 \
-chardev socket,id=charchannel0,\ -chardev socket,id=charchannel0,\
path=/tmp/channel/domain--1-virt-manager-basic/org.qemu.guest_agent.0,server,\ path=/tmp/channel/domain--1-virt-manager-basic/org.qemu.guest_agent.0,server,\
nowait \ nowait \

11
tests/qemuxml2argvtest.c
View File

@ -739,7 +739,9 @@ mymain(void)
DO_TEST("reboot-timeout-enabled", QEMU_CAPS_REBOOT_TIMEOUT); DO_TEST("reboot-timeout-enabled", QEMU_CAPS_REBOOT_TIMEOUT);
DO_TEST_FAILURE("reboot-timeout-enabled", NONE); DO_TEST_FAILURE("reboot-timeout-enabled", NONE);
DO_TEST("bios", QEMU_CAPS_SGA); DO_TEST("bios",
QEMU_CAPS_SGA,
QEMU_CAPS_CHARDEV);
DO_TEST("bios-nvram", NONE); DO_TEST("bios-nvram", NONE);
DO_TEST("bios-nvram-secure", DO_TEST("bios-nvram-secure",
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
@ -1177,8 +1179,10 @@ mymain(void)
QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEPORT); QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEPORT);
DO_TEST("serial-spiceport-nospice", NONE); DO_TEST("serial-spiceport-nospice", NONE);
DO_TEST("console-compat", NONE); DO_TEST("console-compat",
DO_TEST("console-compat-auto", NONE); QEMU_CAPS_CHARDEV);
DO_TEST("console-compat-auto",
QEMU_CAPS_CHARDEV);
DO_TEST("serial-vc-chardev", DO_TEST("serial-vc-chardev",
QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG);
@ -2001,6 +2005,7 @@ mymain(void)
QEMU_CAPS_DEVICE_VIDEO_PRIMARY); QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
DO_TEST("q35-virt-manager-basic", DO_TEST("q35-virt-manager-basic",
QEMU_CAPS_KVM, QEMU_CAPS_KVM,
QEMU_CAPS_CHARDEV,
QEMU_CAPS_RTC, QEMU_CAPS_RTC,
QEMU_CAPS_ICH9_DISABLE_S3, QEMU_CAPS_ICH9_DISABLE_S3,
QEMU_CAPS_ICH9_DISABLE_S4, QEMU_CAPS_ICH9_DISABLE_S4,