File 67a2de41-tests-caps-chardev.patch of Package libvirt.10106

Overview Repositories Revisions Requests Users Attributes Meta

File 67a2de41-tests-caps-chardev.patch of Package libvirt.10106

commit 67a2de414fcdf47ff9ccf53254a63694f5f2644d
Author: Cole Robinson <crobinso@redhat.com>
Date:   Mon Jun 26 13:02:57 2017 -0400

tests: qemuxml2argv: Add some QEMU_CAPS_CHARDEV annotations
    
    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>

Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-bios.args
===================================================================
--- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-bios.args
+++ libvirt-3.3.0/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
Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args
===================================================================
--- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args
+++ libvirt-3.3.0/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
Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args
===================================================================
--- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args
+++ libvirt-3.3.0/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
Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-q35-virt-manager-basic.args
===================================================================
--- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-q35-virt-manager-basic.args
+++ libvirt-3.3.0/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 \
Index: libvirt-3.3.0/tests/qemuxml2argvtest.c
===================================================================
--- libvirt-3.3.0.orig/tests/qemuxml2argvtest.c
+++ libvirt-3.3.0/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,
@@ -1171,8 +1173,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);
@@ -1984,6 +1988,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,

Places

File 67a2de41-tests-caps-chardev.patch of Package libvirt.10106

Places