From 4150f944f9f3f68077aa91e91af259755d4dc568 Mon Sep 17 00:00:00 2001 From: Bjoern Walk Date: Thu, 23 Apr 2020 15:15:06 +0200 Subject: [PATCH] tests: use latest caps for virtio-options test Convert the virtio-options test in qemuxml2argv and qemuxml2xml to use the latest available QEMU capabilities. Reviewed-by: Boris Fiuczynski Signed-off-by: Bjoern Walk Signed-off-by: Michal Privoznik Reviewed-by: Michal Privoznik Reviewed-by: Daniel Henrique Barboza --- ...args => virtio-options.x86_64-latest.args} | 32 ++++++++++++------- tests/qemuxml2argvdata/virtio-options.xml | 5 ++- tests/qemuxml2argvtest.c | 12 +------ .../virtio-options.x86_64-latest.xml | 1 + tests/qemuxml2xmltest.c | 16 +--------- 5 files changed, 27 insertions(+), 39 deletions(-) rename tests/qemuxml2argvdata/{virtio-options.args => virtio-options.x86_64-latest.args} (67%) create mode 120000 tests/qemuxml2xmloutdata/virtio-options.x86_64-latest.xml diff --git a/tests/qemuxml2argvdata/virtio-options.args b/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args similarity index 67% rename from tests/qemuxml2argvdata/virtio-options.args rename to tests/qemuxml2argvdata/virtio-options.x86_64-latest.args index 8253a78830..e523f73fee 100644 --- a/tests/qemuxml2argvdata/virtio-options.args +++ b/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args @@ -8,31 +8,36 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ --name QEMUGuest1 \ +-name guest=QEMUGuest1,debug-threads=on \ -S \ +-object secret,id=masterKey0,format=raw,\ +file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-cpu qemu64 \ -m 214 \ --realtime mlock=off \ +-overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ +-chardev socket,id=charmonitor,fd=1729,server,nowait \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ -no-acpi \ +-boot strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -device virtio-scsi-pci,iommu_platform=on,ats=on,packed=on,id=scsi0,bus=pci.0,\ addr=0x8 \ -device virtio-serial-pci,id=virtio-serial0,iommu_platform=on,ats=on,packed=on,\ bus=pci.0,addr=0x9 \ --usb \ --drive file=/var/lib/libvirt/images/img1,format=raw,if=none,\ -id=drive-virtio-disk0 \ --device virtio-blk-pci,iommu_platform=on,ats=on,packed=on,bus=pci.0,addr=0xa,\ -drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/img1",\ +"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw",\ +"file":"libvirt-1-storage"}' \ +-device virtio-blk-pci,scsi=off,iommu_platform=on,ats=on,packed=on,bus=pci.0,\ +addr=0xa,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \ -fsdev local,security_model=passthrough,id=fsdev-fs0,path=/export/fs1 \ -device virtio-9p-pci,id=fs0,fsdev=fsdev-fs0,mount_tag=fs1,iommu_platform=on,\ ats=on,packed=on,bus=pci.0,addr=0x3 \ @@ -52,10 +57,13 @@ ats=on,packed=on \ -device virtio-input-host-pci,id=input3,evdev=/dev/input/event1234,bus=pci.0,\ addr=0x12,iommu_platform=on,ats=on,packed=on \ -chardev socket,id=chr-vu-video0,fd=1729 \ --device vhost-user-gpu-pci,id=video0,max_outputs=1,chardev=chr-vu-video0,\ -bus=pci.0,addr=0x2,iommu_platform=on,ats=on,packed=on \ +-device vhost-user-vga,id=video0,max_outputs=1,chardev=chr-vu-video0,bus=pci.0,\ +addr=0x2,iommu_platform=on,ats=on,packed=on \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0xc,iommu_platform=on,\ ats=on,packed=on \ -object rng-random,id=objrng0,filename=/dev/random \ -device virtio-rng-pci,rng=objrng0,id=rng0,iommu_platform=on,ats=on,packed=on,\ -bus=pci.0,addr=0xd +bus=pci.0,addr=0xd \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ +resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/virtio-options.xml b/tests/qemuxml2argvdata/virtio-options.xml index 3ca2784057..ba1bf7c036 100644 --- a/tests/qemuxml2argvdata/virtio-options.xml +++ b/tests/qemuxml2argvdata/virtio-options.xml @@ -8,6 +8,9 @@ hvm + + qemu64 + destroy restart @@ -20,7 +23,7 @@
- +
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index d3c8b048cb..d09558977f 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -3033,17 +3033,7 @@ mymain(void) DO_TEST_PARSE_ERROR("cpu-hotplug-granularity", QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS); - DO_TEST("virtio-options", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_VIRTIO_KEYBOARD, - QEMU_CAPS_VIRTIO_MOUSE, QEMU_CAPS_VIRTIO_TABLET, - QEMU_CAPS_VIRTIO_INPUT_HOST, - QEMU_CAPS_DEVICE_VIRTIO_GPU, - QEMU_CAPS_DEVICE_VHOST_USER_GPU, - QEMU_CAPS_DEVICE_VIRTIO_RNG, - QEMU_CAPS_OBJECT_RNG_RANDOM, - QEMU_CAPS_DEVICE_VIDEO_PRIMARY, - QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM, - QEMU_CAPS_VIRTIO_PCI_ATS, - QEMU_CAPS_VIRTIO_PACKED_QUEUES); + DO_TEST_CAPS_LATEST("virtio-options"); DO_TEST("fd-memory-numa-topology", QEMU_CAPS_OBJECT_MEMORY_FILE, QEMU_CAPS_KVM); diff --git a/tests/qemuxml2xmloutdata/virtio-options.x86_64-latest.xml b/tests/qemuxml2xmloutdata/virtio-options.x86_64-latest.xml new file mode 120000 index 0000000000..26d8a2520a --- /dev/null +++ b/tests/qemuxml2xmloutdata/virtio-options.x86_64-latest.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/virtio-options.xml \ No newline at end of file diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 06145e767a..86f3d2c1f3 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1282,21 +1282,7 @@ mymain(void) DO_TEST("memorybacking-set", NONE); DO_TEST("memorybacking-unset", NONE); - DO_TEST("virtio-options", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_VIRTIO_KEYBOARD, - QEMU_CAPS_VIRTIO_MOUSE, - QEMU_CAPS_VIRTIO_TABLET, - QEMU_CAPS_VIRTIO_INPUT_HOST, - QEMU_CAPS_DEVICE_VIRTIO_GPU, - QEMU_CAPS_VIRTIO_GPU_VIRGL, - QEMU_CAPS_DEVICE_VIRTIO_RNG, - QEMU_CAPS_OBJECT_RNG_RANDOM, - QEMU_CAPS_DEVICE_VIDEO_PRIMARY, - QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM, - QEMU_CAPS_VIRTIO_PCI_ATS, - QEMU_CAPS_DEVICE_VHOST_USER_GPU, - QEMU_CAPS_VIRTIO_PACKED_QUEUES); + DO_TEST_CAPS_LATEST("virtio-options"); DO_TEST("fd-memory-numa-topology", QEMU_CAPS_OBJECT_MEMORY_FILE, QEMU_CAPS_KVM);