External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-27 13:52:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Fix use of virtio-serial for aarch64/virt

Browse Source 
virtio-serial is an alias for virtio-serial-pci, which
should not have been used for a PCIe-less aarch64/virt
guest but it ended up being used anyway because the
virtio-mmio capability was missing and the algorithm
is buggy.

Fix the test case so that we can fix the algorithm next.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Andrea Bolognani 2018-08-30 18:03:58 +02:00
parent ca7ad978a9
commit 0770587d28
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/qemuxml2argvdata/mach-virt-console-virtio.args
View File

@ -20,6 +20,6 @@ server,nowait \
-rtc base=utc \
-no-shutdown \
-no-acpi \
-device virtio-serial,id=virtio-serial0 \
-device virtio-serial-device,id=virtio-serial0 \
-chardev pty,id=charconsole0 \
-device virtconsole,chardev=charconsole0,id=console0

3
tests/qemuxml2argvtest.c
View File

@ -1976,7 +1976,8 @@ mymain(void)
QEMU_CAPS_DEVICE_USB_SERIAL);
DO_TEST("mach-virt-console-native",
QEMU_CAPS_DEVICE_PL011);
DO_TEST("mach-virt-console-virtio", NONE);
DO_TEST("mach-virt-console-virtio",
QEMU_CAPS_DEVICE_VIRTIO_MMIO);
DO_TEST_PARSE_ERROR("mach-virt-serial-invalid-machine", NONE);
DO_TEST("disk-ide-split",

4
tests/qemuxml2xmloutdata/mach-virt-console-virtio.xml
View File

@ -18,7 +18,9 @@
<devices>
<emulator>/usr/bin/qemu-system-aarch64</emulator>
<controller type='usb' index='0' model='none'/>
<controller type='virtio-serial' index='0'/>
<controller type='virtio-serial' index='0'>
<address type='virtio-mmio'/>
</controller>
<console type='pty'>
<target type='virtio' port='0'/>
</console>

6
tests/qemuxml2xmltest.c
View File

@ -644,8 +644,10 @@ mymain(void)
QEMU_CAPS_DEVICE_PCIE_ROOT_PORT,
QEMU_CAPS_DEVICE_QEMU_XHCI,
QEMU_CAPS_DEVICE_USB_SERIAL);
DO_TEST("mach-virt-console-native", NONE);
DO_TEST("mach-virt-console-virtio", NONE);
DO_TEST("mach-virt-console-native",
QEMU_CAPS_DEVICE_PL011);
DO_TEST("mach-virt-console-virtio",
QEMU_CAPS_DEVICE_VIRTIO_MMIO);
DO_TEST("balloon-device-auto", NONE);
DO_TEST("balloon-device-period", NONE);