6:44 a.m.
Starting from qemu-4.0 a new device model name is used instead of the
'disable_*' props. Since we are going to bump to qemu-4.2 as minimum
this test can be removed.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../virtio-non-transitional.x86_64-3.1.0.args | 53 -------------------
.../virtio-transitional.x86_64-3.1.0.args | 46 ----------------
tests/qemuxml2argvtest.c | 3 --
3 files changed, 102 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args
delete mode 100644 tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args
diff --git a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args
b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args
deleted file mode 100644
index 2d0e568bb0..0000000000
--- a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args
+++ /dev/null
@@ -1,53 +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-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine pc-q35-3.1,usb=off,dump-guest-core=off \
--accel tcg \
--m 214 \
--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 pcie-root-port,port=8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1 \
--device pcie-root-port,port=9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \
--device pcie-root-port,port=10,chassis=3,id=pci.3,bus=pcie.0,addr=0x1.0x2 \
--device pcie-root-port,port=11,chassis=4,id=pci.4,bus=pcie.0,addr=0x1.0x3 \
--device pcie-root-port,port=12,chassis=5,id=pci.5,bus=pcie.0,addr=0x1.0x4 \
--device pcie-root-port,port=13,chassis=6,id=pci.6,bus=pcie.0,addr=0x1.0x5 \
--device pcie-root-port,port=14,chassis=7,id=pci.7,bus=pcie.0,addr=0x1.0x6 \
--device pcie-root-port,port=15,chassis=8,id=pci.8,bus=pcie.0,addr=0x1.0x7 \
--device pcie-root-port,port=16,chassis=9,id=pci.9,bus=pcie.0,multifunction=on,addr=0x2 \
--device pcie-root-port,port=17,chassis=10,id=pci.10,bus=pcie.0,addr=0x2.0x1 \
--device virtio-scsi-pci,disable-legacy=on,disable-modern=off,id=scsi0,bus=pci.4,addr=0x0
\
--device
virtio-serial-pci,disable-legacy=on,disable-modern=off,id=virtio-serial0,bus=pci.3,addr=0x0
\
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
--device
virtio-blk-pci,disable-legacy=on,disable-modern=off,scsi=off,bus=pci.5,addr=0x0,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1
\
--fsdev local,security_model=passthrough,id=fsdev-fs0,path=/export/fs1 \
--device
virtio-9p-pci,disable-legacy=on,disable-modern=off,id=fs0,fsdev=fsdev-fs0,mount_tag=fs1,bus=pci.1,addr=0x0
\
--netdev user,id=hostnet0 \
--device
virtio-net-pci,disable-legacy=on,disable-modern=off,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.2,addr=0x0
\
--device
vhost-scsi-pci,disable-legacy=on,disable-modern=off,wwpn=naa.5123456789abcde0,vhostfd=3,id=hostdev0,bus=pci.6,addr=0x0
\
--device
virtio-balloon-pci,disable-legacy=on,disable-modern=off,id=balloon0,bus=pci.7,addr=0x0 \
--object rng-random,id=objrng0,filename=/dev/urandom \
--device
virtio-rng-pci,disable-legacy=on,disable-modern=off,rng=objrng0,id=rng0,bus=pci.8,addr=0x0
\
--sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
--device
vhost-vsock-pci,disable-legacy=on,disable-modern=off,id=vsock0,guest-cid=4,vhostfd=6789,bus=pci.9,addr=0x0
\
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args
b/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args
deleted file mode 100644
index 83bb5d137d..0000000000
--- a/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args
+++ /dev/null
@@ -1,46 +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-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine pc-q35-3.1,usb=off,dump-guest-core=off \
--accel tcg \
--m 214 \
--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 pcie-root-port,port=8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1 \
--device pcie-pci-bridge,id=pci.2,bus=pci.1,addr=0x0 \
--device pcie-root-port,port=9,chassis=3,id=pci.3,bus=pcie.0,addr=0x1.0x1 \
--device virtio-scsi-pci,disable-legacy=off,disable-modern=off,id=scsi0,bus=pci.2,addr=0x4
\
--device
virtio-serial-pci,disable-legacy=off,disable-modern=off,id=virtio-serial0,bus=pci.2,addr=0x3
\
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
--device
virtio-blk-pci,disable-legacy=off,disable-modern=off,scsi=off,bus=pci.2,addr=0x5,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1
\
--fsdev local,security_model=passthrough,id=fsdev-fs0,path=/export/fs1 \
--device
virtio-9p-pci,disable-legacy=off,disable-modern=off,id=fs0,fsdev=fsdev-fs0,mount_tag=fs1,bus=pci.2,addr=0x1
\
--netdev user,id=hostnet0 \
--device
virtio-net-pci,disable-legacy=off,disable-modern=off,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.2,addr=0x2
\
--device
vhost-scsi-pci,disable-legacy=off,disable-modern=off,wwpn=naa.5123456789abcde0,vhostfd=3,id=hostdev0,bus=pci.2,addr=0x6
\
--device
virtio-balloon-pci,disable-legacy=off,disable-modern=off,id=balloon0,bus=pci.2,addr=0x7 \
--object rng-random,id=objrng0,filename=/dev/urandom \
--device
virtio-rng-pci,disable-legacy=off,disable-modern=off,rng=objrng0,id=rng0,bus=pci.2,addr=0x8
\
--sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
--device
vhost-vsock-pci,disable-legacy=off,disable-modern=off,id=vsock0,guest-cid=4,vhostfd=6789,bus=pci.2,addr=0x9
\
--msg timestamp=on
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 8d76472c0c..d65a18f8d4 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -3310,9 +3310,6 @@ mymain(void)
DO_TEST("riscv64-virt-pci",
QEMU_CAPS_OBJECT_GPEX);
- /* Older version checks disable-legacy usage */
- DO_TEST_CAPS_VER("virtio-transitional", "3.1.0");
- DO_TEST_CAPS_VER("virtio-non-transitional", "3.1.0");
DO_TEST_CAPS_LATEST("virtio-transitional");
DO_TEST_CAPS_LATEST("virtio-non-transitional");
DO_TEST_CAPS_LATEST_PARSE_ERROR("virtio-transitional-not-supported");
--
2.36.1