From 32967b891ec3af70dff4f908295d63fda0fb9876 Mon Sep 17 00:00:00 2001 From: Hiroki Narukawa Date: Thu, 9 Sep 2021 12:34:44 +0900 Subject: [PATCH] qemuxml2*test: Make disk-virtio-queues tests use DO_TEST_CAPS_LATEST Currently disk-virtio-queues test is now using specifying a fake capability. By this commit this test will make use of DO_TEST_CAPS_LATEST. Signed-off-by: Hiroki Narukawa Reviewed-by: Peter Krempa --- .../qemuxml2argvdata/disk-virtio-queues.args | 29 --------------- .../disk-virtio-queues.x86_64-latest.args | 35 +++++++++++++++++++ tests/qemuxml2argvdata/disk-virtio-queues.xml | 5 ++- tests/qemuxml2argvtest.c | 3 +- .../disk-virtio-queues.x86_64-latest.xml | 1 + tests/qemuxml2xmltest.c | 2 +- 6 files changed, 42 insertions(+), 33 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-virtio-queues.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-queues.x86_64-latest.args create mode 120000 tests/qemuxml2xmloutdata/disk-virtio-queues.x86_64-latest.xml diff --git a/tests/qemuxml2argvdata/disk-virtio-queues.args b/tests/qemuxml2argvdata/disk-virtio-queues.args deleted file mode 100644 index c0166357e7..0000000000 --- a/tests/qemuxml2argvdata/disk-virtio-queues.args +++ /dev/null @@ -1,29 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/tmp/lib/domain--1-QEMUGuest1 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ -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-i386 \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --realtime mlock=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=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --usb \ --drive file=/tmp/data.img,format=raw,if=none,id=drive-virtio-disk0 \ --device virtio-blk-pci,num-queues=4,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/disk-virtio-queues.x86_64-latest.args b/tests/qemuxml2argvdata/disk-virtio-queues.x86_64-latest.args new file mode 100644 index 0000000000..6637088a35 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-virtio-queues.x86_64-latest.args @@ -0,0 +1,35 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/tmp/lib/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-i386 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-cpu qemu64 \ +-m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ +-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,fd=1729,server=on,wait=off \ +-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 \ +-blockdev '{"driver":"file","filename":"/tmp/data.img","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,num-queues=4,bus=pci.0,addr=0x3,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \ +-audiodev id=audio1,driver=none \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/disk-virtio-queues.xml b/tests/qemuxml2argvdata/disk-virtio-queues.xml index c758d21894..ea1001bdd4 100644 --- a/tests/qemuxml2argvdata/disk-virtio-queues.xml +++ b/tests/qemuxml2argvdata/disk-virtio-queues.xml @@ -8,6 +8,9 @@ hvm + + qemu64 + destroy restart @@ -20,7 +23,7 @@
- +
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 74af93b08f..d3d16ca026 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1326,8 +1326,7 @@ mymain(void) DO_TEST("disk-virtio-s390-zpci", QEMU_CAPS_DEVICE_ZPCI, QEMU_CAPS_CCW); DO_TEST_PARSE_ERROR("non-x86_64-timer-error", QEMU_CAPS_CCW); DO_TEST("disk-order", QEMU_CAPS_VIRTIO_BLK_SCSI); - DO_TEST("disk-virtio-queues", - QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES); + DO_TEST_CAPS_LATEST("disk-virtio-queues"); DO_TEST_NOCAPS("disk-boot-disk"); DO_TEST_NOCAPS("disk-boot-cdrom"); DO_TEST_NOCAPS("floppy-drive-fat"); diff --git a/tests/qemuxml2xmloutdata/disk-virtio-queues.x86_64-latest.xml b/tests/qemuxml2xmloutdata/disk-virtio-queues.x86_64-latest.xml new file mode 120000 index 0000000000..d6773202b7 --- /dev/null +++ b/tests/qemuxml2xmloutdata/disk-virtio-queues.x86_64-latest.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/disk-virtio-queues.xml \ No newline at end of file diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 6d3526f91f..b88f7c404d 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -301,7 +301,7 @@ mymain(void) DO_TEST("disk-usb-device", QEMU_CAPS_DEVICE_USB_STORAGE); DO_TEST_NOCAPS("disk-virtio"); DO_TEST_NOCAPS("floppy-drive-fat"); - DO_TEST("disk-virtio-queues", QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES); + DO_TEST_CAPS_LATEST("disk-virtio-queues"); DO_TEST_NOCAPS("disk-boot-disk"); DO_TEST_NOCAPS("disk-boot-cdrom"); DO_TEST_NOCAPS("disk-error-policy");