diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bios.args b/tests/qemuxml2argvdata/qemuxml2argv-bios.args index 6f4d66de4e1e7389af656b8b4fe6e003d89b08c7..048d4ff96b3fc829377fccbc34f11d973b9c806a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-bios.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-bios.args @@ -23,6 +23,7 @@ server,nowait \ -usb \ -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 \ --serial pty \ +-chardev pty,id=charserial0 \ +-device isa-serial,chardev=charserial0,id=serial0 \ -device usb-tablet,id=input0,bus=usb.0,port=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args index 5b267336794143332e2322072a7c9e45296c2c8e..cab47dbb55428dece445c939932fac1603371910 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args @@ -21,5 +21,6 @@ server,nowait \ -usb \ -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 \ --serial pty \ +-chardev pty,id=charserial0 \ +-device isa-serial,chardev=charserial0,id=serial0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args b/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args index be3ed2e30a2bfb6df30a327c96e3598dd52730b3..fb96946f1ca4fe46d8ff2b742a32993c65345951 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args @@ -21,4 +21,5 @@ server,nowait \ -usb \ -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 \ --serial pty +-chardev pty,id=charserial0 \ +-device isa-serial,chardev=charserial0,id=serial0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-virt-manager-basic.args b/tests/qemuxml2argvdata/qemuxml2argv-q35-virt-manager-basic.args index 0d659590c05d937af896738fdbefe96776491e74..96d2ae5924b63c9a99e3d64469bbae2e9fb11031 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-q35-virt-manager-basic.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-q35-virt-manager-basic.args @@ -37,7 +37,8 @@ id=virtio-disk0 \ -netdev user,id=hostnet0 \ -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:9a:e6:c6,bus=pci.1,\ addr=0x0 \ --serial pty \ +-chardev pty,id=charserial0 \ +-device isa-serial,chardev=charserial0,id=serial0 \ -chardev socket,id=charchannel0,\ path=/tmp/channel/domain--1-virt-manager-basic/org.qemu.guest_agent.0,server,\ nowait \ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index d0b94671d7217881eab0580df06ab6cea19434a3..402601d6a45bb01f1b8f3a9dfada50e2baaa94ae 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -739,7 +739,9 @@ mymain(void) DO_TEST("reboot-timeout-enabled", QEMU_CAPS_REBOOT_TIMEOUT); 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-secure", QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, @@ -1177,8 +1179,10 @@ mymain(void) QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEPORT); DO_TEST("serial-spiceport-nospice", NONE); - DO_TEST("console-compat", NONE); - DO_TEST("console-compat-auto", NONE); + DO_TEST("console-compat", + QEMU_CAPS_CHARDEV); + DO_TEST("console-compat-auto", + QEMU_CAPS_CHARDEV); DO_TEST("serial-vc-chardev", QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); @@ -2001,6 +2005,7 @@ mymain(void) QEMU_CAPS_DEVICE_VIDEO_PRIMARY); DO_TEST("q35-virt-manager-basic", QEMU_CAPS_KVM, + QEMU_CAPS_CHARDEV, QEMU_CAPS_RTC, QEMU_CAPS_ICH9_DISABLE_S3, QEMU_CAPS_ICH9_DISABLE_S4,