Turn them into DO_TEST_CAPS_VER bound to qemu-4.2 to show the minimum
amount of change. We already have DO_TEST_CAPS_LATEST versions.
Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
...h64-virtio-pci-default.aarch64-4.2.0.args} | 17 ++-
...ev-scsi-vhost-scsi-pcie.x86_64-4.2.0.args} | 4 +-
...35-default-devices-only.x86_64-4.2.0.args} | 12 +-
tests/qemuxml2argvdata/q35-multifunction.args | 49 ------
.../q35-multifunction.x86_64-4.2.0.args | 51 +++++++
...rgs => q35-pcie-autoadd.x86_64-4.2.0.args} | 36 ++---
...5-pcie.args => q35-pcie.x86_64-4.2.0.args} | 34 +++--
... q35-virt-manager-basic.x86_64-4.2.0.args} | 21 +--
tests/qemuxml2argvdata/q35-virtio-pci.args | 64 --------
.../q35-virtio-pci.x86_64-4.2.0.args | 66 ++++++++
tests/qemuxml2argvtest.c | 142 ++----------------
11 files changed, 196 insertions(+), 300 deletions(-)
rename tests/qemuxml2argvdata/{aarch64-virtio-pci-default.args => aarch64-virtio-pci-default.aarch64-4.2.0.args} (71%)
rename tests/qemuxml2argvdata/{hostdev-scsi-vhost-scsi-pcie.args => hostdev-scsi-vhost-scsi-pcie.x86_64-4.2.0.args} (88%)
rename tests/qemuxml2argvdata/{q35-default-devices-only.args => q35-default-devices-only.x86_64-4.2.0.args} (67%)
delete mode 100644 tests/qemuxml2argvdata/q35-multifunction.args
create mode 100644 tests/qemuxml2argvdata/q35-multifunction.x86_64-4.2.0.args
rename tests/qemuxml2argvdata/{q35-pcie-autoadd.args => q35-pcie-autoadd.x86_64-4.2.0.args} (59%)
rename tests/qemuxml2argvdata/{q35-pcie.args => q35-pcie.x86_64-4.2.0.args} (62%)
rename tests/qemuxml2argvdata/{q35-virt-manager-basic.args => q35-virt-manager-basic.x86_64-4.2.0.args} (75%)
delete mode 100644 tests/qemuxml2argvdata/q35-virtio-pci.args
create mode 100644 tests/qemuxml2argvdata/q35-virtio-pci.x86_64-4.2.0.args
diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args b/tests/qemuxml2argvdata/aarch64-virtio-pci-default.aarch64-4.2.0.args
similarity index 71%
rename from tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
rename to tests/qemuxml2argvdata/aarch64-virtio-pci-default.aarch64-4.2.0.args
index 90c6fdead4..9491d65c61 100644
--- a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
+++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-default.aarch64-4.2.0.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
-name guest=aarch64test,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-aarch64test/master-key.aes \
--machine virt,usb=off,gic-version=2,dump-guest-core=off \
+-machine virt-4.2,usb=off,gic-version=2,dump-guest-core=off \
-accel tcg \
-cpu cortex-a53 \
-m 1024 \
@@ -30,16 +30,16 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
-initrd /aarch64.initrd \
-append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \
-dtb /aarch64.dtb \
--device ioh3420,port=8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1 \
--device ioh3420,port=9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \
--device ioh3420,port=10,chassis=3,id=pci.3,bus=pcie.0,addr=0x1.0x2 \
--device ioh3420,port=11,chassis=4,id=pci.4,bus=pcie.0,addr=0x1.0x3 \
--device ioh3420,port=12,chassis=5,id=pci.5,bus=pcie.0,addr=0x1.0x4 \
--device ioh3420,port=13,chassis=6,id=pci.6,bus=pcie.0,addr=0x1.0x5 \
+-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 virtio-serial-pci,id=virtio-serial0,bus=pci.2,addr=0x0 \
-blockdev '{"driver":"file","filename":"/aarch64.raw","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,bus=pci.3,addr=0x0,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
+-device virtio-blk-pci,scsi=off,bus=pci.3,addr=0x0,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
-netdev user,id=hostnet0 \
-device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37,bus=pci.1,addr=0x0 \
-chardev pty,id=charserial0 \
@@ -50,4 +50,5 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
-device virtio-balloon-pci,id=balloon0,bus=pci.4,addr=0x0 \
-object rng-random,id=objrng0,filename=/dev/random \
-device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.5,addr=0x0 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.x86_64-4.2.0.args
similarity index 88%
rename from tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
rename to tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.x86_64-4.2.0.args
index 098404ec3a..992d8ec905 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.x86_64-4.2.0.args
@@ -10,8 +10,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
-name guest=QEMUGuest2,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \
--machine q35,usb=off,dump-guest-core=off \
+-machine pc-q35-4.2,usb=off,dump-guest-core=off \
-accel kvm \
+-cpu qemu64 \
-m 214 \
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
@@ -29,4 +30,5 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
-device pcie-root-port,port=9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \
-audiodev '{"id":"audio1","driver":"none"}' \
-device vhost-scsi-pci,wwpn=naa.5123456789abcde0,vhostfd=3,id=hostdev0,bus=pci.1,addr=0x0 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/q35-default-devices-only.args b/tests/qemuxml2argvdata/q35-default-devices-only.x86_64-4.2.0.args
similarity index 67%
rename from tests/qemuxml2argvdata/q35-default-devices-only.args
rename to tests/qemuxml2argvdata/q35-default-devices-only.x86_64-4.2.0.args
index bc178aab47..a4de318a05 100644
--- a/tests/qemuxml2argvdata/q35-default-devices-only.args
+++ b/tests/qemuxml2argvdata/q35-default-devices-only.x86_64-4.2.0.args
@@ -10,8 +10,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-name guest=q35-test,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-q35-test/master-key.aes \
--machine q35,usb=off,dump-guest-core=off \
+-machine pc-q35-4.2,usb=off,dump-guest-core=off \
-accel tcg \
+-cpu qemu64 \
-m 2048 \
-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
@@ -25,10 +26,11 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-no-shutdown \
-no-acpi \
-boot strict=on \
--device ioh3420,port=8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1 \
--device ioh3420,port=9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \
--device ioh3420,port=10,chassis=3,id=pci.3,bus=pcie.0,addr=0x1.0x2 \
--device nec-usb-xhci,id=usb,bus=pci.1,addr=0x0 \
+-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 qemu-xhci,id=usb,bus=pci.1,addr=0x0 \
-audiodev '{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x0 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/q35-multifunction.args b/tests/qemuxml2argvdata/q35-multifunction.args
deleted file mode 100644
index f21bb11671..0000000000
--- a/tests/qemuxml2argvdata/q35-multifunction.args
+++ /dev/null
@@ -1,49 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-q35-test \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=q35-test,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-q35-test/master-key.aes \
--machine q35,usb=off,dump-guest-core=off \
--accel tcg \
--m 2048 \
--overcommit mem-lock=off \
--smp 2,sockets=2,cores=1,threads=1 \
--uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
--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 ioh3420,port=16,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x2 \
--device ioh3420,port=17,chassis=2,id=pci.2,bus=pcie.0,addr=0x2.0x1 \
--device ioh3420,port=18,chassis=3,id=pci.3,bus=pcie.0,addr=0x2.0x2 \
--device ioh3420,port=24,chassis=4,id=pci.4,bus=pcie.0,multifunction=on,addr=0x3 \
--device ioh3420,port=25,chassis=5,id=pci.5,bus=pcie.0,multifunction=on,addr=0x3.0x1 \
--device ioh3420,port=32,chassis=6,id=pci.6,bus=pcie.0,multifunction=off,addr=0x4 \
--device ioh3420,port=33,chassis=7,id=pci.7,bus=pcie.0,addr=0x4.0x1 \
--device ioh3420,port=8,chassis=8,id=pci.8,bus=pcie.0,multifunction=on,addr=0x1 \
--device ioh3420,port=9,chassis=9,id=pci.9,bus=pcie.0,addr=0x1.0x1 \
--device ioh3420,port=10,chassis=10,id=pci.10,bus=pcie.0,addr=0x1.0x2 \
--device ioh3420,port=11,chassis=11,id=pci.11,bus=pcie.0,addr=0x1.0x3 \
--device ioh3420,port=12,chassis=12,id=pci.12,bus=pcie.0,addr=0x1.0x4 \
--device ioh3420,port=13,chassis=13,id=pci.13,bus=pcie.0,addr=0x1.0x5 \
--device ioh3420,port=14,chassis=14,id=pci.14,bus=pcie.0,addr=0x1.0x6 \
--device ioh3420,port=15,chassis=15,id=pci.15,bus=pcie.0,addr=0x1.0x7 \
--device ioh3420,port=19,chassis=16,id=pci.16,bus=pcie.0,addr=0x2.0x3 \
--device ioh3420,port=20,chassis=17,id=pci.17,bus=pcie.0,addr=0x2.0x4 \
--device ioh3420,port=21,chassis=18,id=pci.18,bus=pcie.0,addr=0x2.0x5 \
--device nec-usb-xhci,id=usb,bus=pci.1,addr=0x0 \
--audiodev '{"id":"audio1","driver":"none"}' \
--device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x0 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/q35-multifunction.x86_64-4.2.0.args b/tests/qemuxml2argvdata/q35-multifunction.x86_64-4.2.0.args
new file mode 100644
index 0000000000..287268d1c8
--- /dev/null
+++ b/tests/qemuxml2argvdata/q35-multifunction.x86_64-4.2.0.args
@@ -0,0 +1,51 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-q35-test \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=q35-test,debug-threads=on \
+-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-q35-test/master-key.aes \
+-machine pc-q35-4.2,usb=off,dump-guest-core=off \
+-accel tcg \
+-cpu qemu64 \
+-m 2048 \
+-overcommit mem-lock=off \
+-smp 2,sockets=2,cores=1,threads=1 \
+-uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
+-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=16,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x2 \
+-device pcie-root-port,port=17,chassis=2,id=pci.2,bus=pcie.0,addr=0x2.0x1 \
+-device pcie-root-port,port=18,chassis=3,id=pci.3,bus=pcie.0,addr=0x2.0x2 \
+-device pcie-root-port,port=24,chassis=4,id=pci.4,bus=pcie.0,multifunction=on,addr=0x3 \
+-device pcie-root-port,port=25,chassis=5,id=pci.5,bus=pcie.0,multifunction=on,addr=0x3.0x1 \
+-device pcie-root-port,port=32,chassis=6,id=pci.6,bus=pcie.0,multifunction=off,addr=0x4 \
+-device pcie-root-port,port=33,chassis=7,id=pci.7,bus=pcie.0,addr=0x4.0x1 \
+-device pcie-root-port,port=8,chassis=8,id=pci.8,bus=pcie.0,multifunction=on,addr=0x1 \
+-device pcie-root-port,port=9,chassis=9,id=pci.9,bus=pcie.0,addr=0x1.0x1 \
+-device pcie-root-port,port=10,chassis=10,id=pci.10,bus=pcie.0,addr=0x1.0x2 \
+-device pcie-root-port,port=11,chassis=11,id=pci.11,bus=pcie.0,addr=0x1.0x3 \
+-device pcie-root-port,port=12,chassis=12,id=pci.12,bus=pcie.0,addr=0x1.0x4 \
+-device pcie-root-port,port=13,chassis=13,id=pci.13,bus=pcie.0,addr=0x1.0x5 \
+-device pcie-root-port,port=14,chassis=14,id=pci.14,bus=pcie.0,addr=0x1.0x6 \
+-device pcie-root-port,port=15,chassis=15,id=pci.15,bus=pcie.0,addr=0x1.0x7 \
+-device pcie-root-port,port=19,chassis=16,id=pci.16,bus=pcie.0,addr=0x2.0x3 \
+-device pcie-root-port,port=20,chassis=17,id=pci.17,bus=pcie.0,addr=0x2.0x4 \
+-device pcie-root-port,port=21,chassis=18,id=pci.18,bus=pcie.0,addr=0x2.0x5 \
+-device qemu-xhci,id=usb,bus=pci.1,addr=0x0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x0 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/q35-pcie-autoadd.args b/tests/qemuxml2argvdata/q35-pcie-autoadd.x86_64-4.2.0.args
similarity index 59%
rename from tests/qemuxml2argvdata/q35-pcie-autoadd.args
rename to tests/qemuxml2argvdata/q35-pcie-autoadd.x86_64-4.2.0.args
index 3db83f2a10..787cbfa511 100644
--- a/tests/qemuxml2argvdata/q35-pcie-autoadd.args
+++ b/tests/qemuxml2argvdata/q35-pcie-autoadd.x86_64-4.2.0.args
@@ -10,8 +10,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-name guest=q35-test,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-q35-test/master-key.aes \
--machine q35,usb=off,dump-guest-core=off \
+-machine pc-q35-4.2,usb=off,dump-guest-core=off \
-accel tcg \
+-cpu qemu64 \
-m 2048 \
-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
@@ -25,26 +26,26 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-no-shutdown \
-no-acpi \
-boot strict=on \
--device ioh3420,port=16,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x2 \
--device ioh3420,port=17,chassis=2,id=pci.2,bus=pcie.0,addr=0x2.0x1 \
--device ioh3420,port=18,chassis=3,id=pci.3,bus=pcie.0,addr=0x2.0x2 \
--device ioh3420,port=19,chassis=4,id=pci.4,bus=pcie.0,addr=0x2.0x3 \
--device ioh3420,port=20,chassis=5,id=pci.5,bus=pcie.0,addr=0x2.0x4 \
--device ioh3420,port=21,chassis=6,id=pci.6,bus=pcie.0,addr=0x2.0x5 \
--device ioh3420,port=22,chassis=7,id=pci.7,bus=pcie.0,addr=0x2.0x6 \
--device ioh3420,port=23,chassis=8,id=pci.8,bus=pcie.0,addr=0x2.0x7 \
--device ioh3420,port=24,chassis=9,id=pci.9,bus=pcie.0,multifunction=on,addr=0x3 \
--device ioh3420,port=25,chassis=10,id=pci.10,bus=pcie.0,addr=0x3.0x1 \
--device ioh3420,port=26,chassis=11,id=pci.11,bus=pcie.0,addr=0x3.0x2 \
--device ioh3420,port=27,chassis=12,id=pci.12,bus=pcie.0,addr=0x3.0x3 \
--device ioh3420,port=28,chassis=13,id=pci.13,bus=pcie.0,addr=0x3.0x4 \
--device ioh3420,port=29,chassis=14,id=pci.14,bus=pcie.0,addr=0x3.0x5 \
+-device pcie-root-port,port=16,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x2 \
+-device pcie-root-port,port=17,chassis=2,id=pci.2,bus=pcie.0,addr=0x2.0x1 \
+-device pcie-root-port,port=18,chassis=3,id=pci.3,bus=pcie.0,addr=0x2.0x2 \
+-device pcie-root-port,port=19,chassis=4,id=pci.4,bus=pcie.0,addr=0x2.0x3 \
+-device pcie-root-port,port=20,chassis=5,id=pci.5,bus=pcie.0,addr=0x2.0x4 \
+-device pcie-root-port,port=21,chassis=6,id=pci.6,bus=pcie.0,addr=0x2.0x5 \
+-device pcie-root-port,port=22,chassis=7,id=pci.7,bus=pcie.0,addr=0x2.0x6 \
+-device pcie-root-port,port=23,chassis=8,id=pci.8,bus=pcie.0,addr=0x2.0x7 \
+-device pcie-root-port,port=24,chassis=9,id=pci.9,bus=pcie.0,multifunction=on,addr=0x3 \
+-device pcie-root-port,port=25,chassis=10,id=pci.10,bus=pcie.0,addr=0x3.0x1 \
+-device pcie-root-port,port=26,chassis=11,id=pci.11,bus=pcie.0,addr=0x3.0x2 \
+-device pcie-root-port,port=27,chassis=12,id=pci.12,bus=pcie.0,addr=0x3.0x3 \
+-device pcie-root-port,port=28,chassis=13,id=pci.13,bus=pcie.0,addr=0x3.0x4 \
+-device pcie-root-port,port=29,chassis=14,id=pci.14,bus=pcie.0,addr=0x3.0x5 \
-device nec-usb-xhci,id=usb,bus=pci.6,addr=0x0 \
-device virtio-scsi-pci,id=scsi0,bus=pci.5,addr=0x0 \
-device virtio-serial-pci,id=virtio-serial0,bus=pci.4,addr=0x0 \
-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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,bus=pci.7,addr=0x0,drive=libvirt-1-format,id=virtio-disk1,bootindex=1 \
+-device virtio-blk-pci,scsi=off,bus=pci.7,addr=0x0,drive=libvirt-1-format,id=virtio-disk1,bootindex=1 \
-fsdev local,security_model=passthrough,id=fsdev-fs0,path=/export/to/guest \
-device virtio-9p-pci,id=fs0,fsdev=fsdev-fs0,mount_tag=/import/from/host,bus=pci.1,addr=0x0 \
-netdev user,id=hostnet0 \
@@ -56,8 +57,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-device virtio-keyboard-pci,id=input2,bus=pci.12,addr=0x0 \
-device virtio-tablet-pci,id=input3,bus=pci.13,addr=0x0 \
-audiodev '{"id":"audio1","driver":"none"}' \
--device virtio-gpu-pci,id=video0,max_outputs=1,bus=pcie.0,addr=0x1 \
+-device virtio-vga,id=video0,max_outputs=1,bus=pcie.0,addr=0x1 \
-device virtio-balloon-pci,id=balloon0,bus=pci.8,addr=0x0 \
-object rng-random,id=objrng0,filename=/dev/urandom \
-device virtio-rng-pci,rng=objrng0,id=rng0,max-bytes=123,period=1234,bus=pci.9,addr=0x0 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/q35-pcie.args b/tests/qemuxml2argvdata/q35-pcie.x86_64-4.2.0.args
similarity index 62%
rename from tests/qemuxml2argvdata/q35-pcie.args
rename to tests/qemuxml2argvdata/q35-pcie.x86_64-4.2.0.args
index 48e6ae0557..15daab14b7 100644
--- a/tests/qemuxml2argvdata/q35-pcie.args
+++ b/tests/qemuxml2argvdata/q35-pcie.x86_64-4.2.0.args
@@ -10,8 +10,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-name guest=q35-test,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-q35-test/master-key.aes \
--machine q35,usb=off,dump-guest-core=off \
+-machine pc-q35-4.2,usb=off,dump-guest-core=off \
-accel tcg \
+-cpu qemu64 \
-m 2048 \
-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
@@ -27,25 +28,25 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-boot strict=on \
-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
--device ioh3420,port=16,chassis=3,id=pci.3,bus=pcie.0,multifunction=on,addr=0x2 \
--device ioh3420,port=17,chassis=4,id=pci.4,bus=pcie.0,addr=0x2.0x1 \
--device ioh3420,port=18,chassis=5,id=pci.5,bus=pcie.0,addr=0x2.0x2 \
--device ioh3420,port=19,chassis=6,id=pci.6,bus=pcie.0,addr=0x2.0x3 \
--device ioh3420,port=20,chassis=7,id=pci.7,bus=pcie.0,addr=0x2.0x4 \
--device ioh3420,port=21,chassis=8,id=pci.8,bus=pcie.0,addr=0x2.0x5 \
--device ioh3420,port=22,chassis=9,id=pci.9,bus=pcie.0,addr=0x2.0x6 \
--device ioh3420,port=23,chassis=10,id=pci.10,bus=pcie.0,addr=0x2.0x7 \
--device ioh3420,port=24,chassis=11,id=pci.11,bus=pcie.0,multifunction=on,addr=0x3 \
--device ioh3420,port=25,chassis=12,id=pci.12,bus=pcie.0,addr=0x3.0x1 \
--device ioh3420,port=26,chassis=13,id=pci.13,bus=pcie.0,addr=0x3.0x2 \
--device ioh3420,port=27,chassis=14,id=pci.14,bus=pcie.0,addr=0x3.0x3 \
--device ioh3420,port=28,chassis=15,id=pci.15,bus=pcie.0,addr=0x3.0x4 \
+-device pcie-root-port,port=16,chassis=3,id=pci.3,bus=pcie.0,multifunction=on,addr=0x2 \
+-device pcie-root-port,port=17,chassis=4,id=pci.4,bus=pcie.0,addr=0x2.0x1 \
+-device pcie-root-port,port=18,chassis=5,id=pci.5,bus=pcie.0,addr=0x2.0x2 \
+-device pcie-root-port,port=19,chassis=6,id=pci.6,bus=pcie.0,addr=0x2.0x3 \
+-device pcie-root-port,port=20,chassis=7,id=pci.7,bus=pcie.0,addr=0x2.0x4 \
+-device pcie-root-port,port=21,chassis=8,id=pci.8,bus=pcie.0,addr=0x2.0x5 \
+-device pcie-root-port,port=22,chassis=9,id=pci.9,bus=pcie.0,addr=0x2.0x6 \
+-device pcie-root-port,port=23,chassis=10,id=pci.10,bus=pcie.0,addr=0x2.0x7 \
+-device pcie-root-port,port=24,chassis=11,id=pci.11,bus=pcie.0,multifunction=on,addr=0x3 \
+-device pcie-root-port,port=25,chassis=12,id=pci.12,bus=pcie.0,addr=0x3.0x1 \
+-device pcie-root-port,port=26,chassis=13,id=pci.13,bus=pcie.0,addr=0x3.0x2 \
+-device pcie-root-port,port=27,chassis=14,id=pci.14,bus=pcie.0,addr=0x3.0x3 \
+-device pcie-root-port,port=28,chassis=15,id=pci.15,bus=pcie.0,addr=0x3.0x4 \
-device nec-usb-xhci,id=usb,bus=pci.8,addr=0x0 \
-device virtio-scsi-pci,id=scsi0,bus=pci.7,addr=0x0 \
-device virtio-serial-pci,id=virtio-serial0,bus=pci.6,addr=0x0 \
-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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,bus=pci.9,addr=0x0,drive=libvirt-1-format,id=virtio-disk1,bootindex=1 \
+-device virtio-blk-pci,scsi=off,bus=pci.9,addr=0x0,drive=libvirt-1-format,id=virtio-disk1,bootindex=1 \
-fsdev local,security_model=passthrough,id=fsdev-fs0,path=/export/to/guest \
-device virtio-9p-pci,id=fs0,fsdev=fsdev-fs0,mount_tag=/import/from/host,bus=pci.3,addr=0x0 \
-netdev user,id=hostnet0 \
@@ -57,8 +58,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-device virtio-keyboard-pci,id=input2,bus=pci.14,addr=0x0 \
-device virtio-tablet-pci,id=input3,bus=pci.15,addr=0x0 \
-audiodev '{"id":"audio1","driver":"none"}' \
--device virtio-gpu-pci,id=video0,max_outputs=1,bus=pcie.0,addr=0x1 \
+-device virtio-vga,id=video0,max_outputs=1,bus=pcie.0,addr=0x1 \
-device virtio-balloon-pci,id=balloon0,bus=pci.10,addr=0x0 \
-object rng-random,id=objrng0,filename=/dev/urandom \
-device virtio-rng-pci,rng=objrng0,id=rng0,max-bytes=123,period=1234,bus=pci.11,addr=0x0 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/q35-virt-manager-basic.args b/tests/qemuxml2argvdata/q35-virt-manager-basic.x86_64-4.2.0.args
similarity index 75%
rename from tests/qemuxml2argvdata/q35-virt-manager-basic.args
rename to tests/qemuxml2argvdata/q35-virt-manager-basic.x86_64-4.2.0.args
index fe00c9e0eb..14093a3f80 100644
--- a/tests/qemuxml2argvdata/q35-virt-manager-basic.args
+++ b/tests/qemuxml2argvdata/q35-virt-manager-basic.x86_64-4.2.0.args
@@ -10,8 +10,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-virt-manager-basic/.config \
-name guest=virt-manager-basic,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-virt-manager-basic/master-key.aes \
--machine q35,usb=off,vmport=off,dump-guest-core=off \
+-machine pc-q35-4.2,usb=off,vmport=off,dump-guest-core=off \
-accel kvm \
+-cpu qemu64 \
-m 4096 \
-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
@@ -21,22 +22,23 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-virt-manager-basic/.config \
-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc,driftfix=slew \
+-global kvm-pit.lost_tick_policy=delay \
-no-hpet \
-no-shutdown \
-global ICH9-LPC.disable_s3=1 \
-global ICH9-LPC.disable_s4=1 \
-boot strict=on \
--device ioh3420,port=16,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x2 \
--device ioh3420,port=17,chassis=2,id=pci.2,bus=pcie.0,addr=0x2.0x1 \
--device ioh3420,port=18,chassis=3,id=pci.3,bus=pcie.0,addr=0x2.0x2 \
--device ioh3420,port=19,chassis=4,id=pci.4,bus=pcie.0,addr=0x2.0x3 \
--device ioh3420,port=20,chassis=5,id=pci.5,bus=pcie.0,addr=0x2.0x4 \
--device ioh3420,port=21,chassis=6,id=pci.6,bus=pcie.0,addr=0x2.0x5 \
+-device pcie-root-port,port=16,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x2 \
+-device pcie-root-port,port=17,chassis=2,id=pci.2,bus=pcie.0,addr=0x2.0x1 \
+-device pcie-root-port,port=18,chassis=3,id=pci.3,bus=pcie.0,addr=0x2.0x2 \
+-device pcie-root-port,port=19,chassis=4,id=pci.4,bus=pcie.0,addr=0x2.0x3 \
+-device pcie-root-port,port=20,chassis=5,id=pci.5,bus=pcie.0,addr=0x2.0x4 \
+-device pcie-root-port,port=21,chassis=6,id=pci.6,bus=pcie.0,addr=0x2.0x5 \
-device nec-usb-xhci,id=usb,bus=pci.2,addr=0x0 \
-device virtio-serial-pci,id=virtio-serial0,bus=pci.3,addr=0x0 \
-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/basic.qcow2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2","file":"libvirt-1-storage"}' \
--device virtio-blk-pci,bus=pci.4,addr=0x0,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
+-device virtio-blk-pci,scsi=off,bus=pci.4,addr=0x0,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
-netdev user,id=hostnet0 \
-device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:9a:e6:c6,bus=pci.1,addr=0x0 \
-chardev pty,id=charserial0 \
@@ -48,7 +50,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-virt-manager-basic/.config \
-device usb-tablet,id=input0,bus=usb.0,port=1 \
-audiodev '{"id":"audio1","driver":"spice"}' \
-spice port=5901,tls-port=5902,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,image-compression=off,seamless-migration=on \
--device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pcie.0,addr=0x1 \
+-device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,vram64_size_mb=0,vgamem_mb=16,bus=pcie.0,addr=0x1 \
-device ich9-intel-hda,id=sound0,bus=pcie.0,addr=0x1b \
-device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0,audiodev=audio1 \
-chardev spicevmc,id=charredir0,name=usbredir \
@@ -56,4 +58,5 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-virt-manager-basic/.config \
-chardev spicevmc,id=charredir1,name=usbredir \
-device usb-redir,chardev=charredir1,id=redir1,bus=usb.0,port=3 \
-device virtio-balloon-pci,id=balloon0,bus=pci.5,addr=0x0 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/q35-virtio-pci.args b/tests/qemuxml2argvdata/q35-virtio-pci.args
deleted file mode 100644
index fe42f07e82..0000000000
--- a/tests/qemuxml2argvdata/q35-virtio-pci.args
+++ /dev/null
@@ -1,64 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-q35-test \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=q35-test,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-q35-test/master-key.aes \
--machine q35,usb=off,dump-guest-core=off \
--accel tcg \
--m 2048 \
--overcommit mem-lock=off \
--smp 2,sockets=2,cores=1,threads=1 \
--uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
--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 i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
--device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
--device ioh3420,port=16,chassis=3,id=pci.3,bus=pcie.0,multifunction=on,addr=0x2 \
--device ioh3420,port=17,chassis=4,id=pci.4,bus=pcie.0,addr=0x2.0x1 \
--device ioh3420,port=18,chassis=5,id=pci.5,bus=pcie.0,addr=0x2.0x2 \
--device ioh3420,port=19,chassis=6,id=pci.6,bus=pcie.0,addr=0x2.0x3 \
--device ioh3420,port=20,chassis=7,id=pci.7,bus=pcie.0,addr=0x2.0x4 \
--device ioh3420,port=21,chassis=8,id=pci.8,bus=pcie.0,addr=0x2.0x5 \
--device ioh3420,port=22,chassis=9,id=pci.9,bus=pcie.0,addr=0x2.0x6 \
--device ioh3420,port=23,chassis=10,id=pci.10,bus=pcie.0,addr=0x2.0x7 \
--device ioh3420,port=24,chassis=11,id=pci.11,bus=pcie.0,multifunction=on,addr=0x3 \
--device ioh3420,port=25,chassis=12,id=pci.12,bus=pcie.0,addr=0x3.0x1 \
--device ioh3420,port=26,chassis=13,id=pci.13,bus=pcie.0,addr=0x3.0x2 \
--device ioh3420,port=27,chassis=14,id=pci.14,bus=pcie.0,addr=0x3.0x3 \
--device ioh3420,port=28,chassis=15,id=pci.15,bus=pcie.0,addr=0x3.0x4 \
--device nec-usb-xhci,id=usb,bus=pci.4,addr=0x0 \
--device virtio-scsi-pci,id=scsi0,bus=pci.2,addr=0x4 \
--device virtio-serial-pci,id=virtio-serial0,bus=pci.2,addr=0x3 \
--blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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,bus=pci.2,addr=0x5,drive=libvirt-1-format,id=virtio-disk1,bootindex=1 \
--fsdev local,security_model=passthrough,id=fsdev-fs0,path=/export/to/guest \
--device virtio-9p-pci,id=fs0,fsdev=fsdev-fs0,mount_tag=/import/from/host,bus=pci.2,addr=0x1 \
--netdev user,id=hostnet0 \
--device virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.2,addr=0x2 \
--netdev user,id=hostnet1 \
--device e1000e,netdev=hostnet1,id=net1,mac=00:11:22:33:44:66,bus=pci.3,addr=0x0 \
--device virtio-input-host-pci,id=input0,evdev=/dev/input/event1234,bus=pci.2,addr=0x8 \
--device virtio-mouse-pci,id=input1,bus=pci.2,addr=0x9 \
--device virtio-keyboard-pci,id=input2,bus=pci.2,addr=0xa \
--device virtio-tablet-pci,id=input3,bus=pci.2,addr=0xb \
--audiodev '{"id":"audio1","driver":"none"}' \
--device virtio-gpu-pci,id=video0,max_outputs=1,bus=pcie.0,addr=0x1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x6 \
--object rng-random,id=objrng0,filename=/dev/urandom \
--device virtio-rng-pci,rng=objrng0,id=rng0,max-bytes=123,period=1234,bus=pci.2,addr=0x7 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/q35-virtio-pci.x86_64-4.2.0.args b/tests/qemuxml2argvdata/q35-virtio-pci.x86_64-4.2.0.args
new file mode 100644
index 0000000000..15daab14b7
--- /dev/null
+++ b/tests/qemuxml2argvdata/q35-virtio-pci.x86_64-4.2.0.args
@@ -0,0 +1,66 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-q35-test \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=q35-test,debug-threads=on \
+-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-q35-test/master-key.aes \
+-machine pc-q35-4.2,usb=off,dump-guest-core=off \
+-accel tcg \
+-cpu qemu64 \
+-m 2048 \
+-overcommit mem-lock=off \
+-smp 2,sockets=2,cores=1,threads=1 \
+-uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
+-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 i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
+-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
+-device pcie-root-port,port=16,chassis=3,id=pci.3,bus=pcie.0,multifunction=on,addr=0x2 \
+-device pcie-root-port,port=17,chassis=4,id=pci.4,bus=pcie.0,addr=0x2.0x1 \
+-device pcie-root-port,port=18,chassis=5,id=pci.5,bus=pcie.0,addr=0x2.0x2 \
+-device pcie-root-port,port=19,chassis=6,id=pci.6,bus=pcie.0,addr=0x2.0x3 \
+-device pcie-root-port,port=20,chassis=7,id=pci.7,bus=pcie.0,addr=0x2.0x4 \
+-device pcie-root-port,port=21,chassis=8,id=pci.8,bus=pcie.0,addr=0x2.0x5 \
+-device pcie-root-port,port=22,chassis=9,id=pci.9,bus=pcie.0,addr=0x2.0x6 \
+-device pcie-root-port,port=23,chassis=10,id=pci.10,bus=pcie.0,addr=0x2.0x7 \
+-device pcie-root-port,port=24,chassis=11,id=pci.11,bus=pcie.0,multifunction=on,addr=0x3 \
+-device pcie-root-port,port=25,chassis=12,id=pci.12,bus=pcie.0,addr=0x3.0x1 \
+-device pcie-root-port,port=26,chassis=13,id=pci.13,bus=pcie.0,addr=0x3.0x2 \
+-device pcie-root-port,port=27,chassis=14,id=pci.14,bus=pcie.0,addr=0x3.0x3 \
+-device pcie-root-port,port=28,chassis=15,id=pci.15,bus=pcie.0,addr=0x3.0x4 \
+-device nec-usb-xhci,id=usb,bus=pci.8,addr=0x0 \
+-device virtio-scsi-pci,id=scsi0,bus=pci.7,addr=0x0 \
+-device virtio-serial-pci,id=virtio-serial0,bus=pci.6,addr=0x0 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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,bus=pci.9,addr=0x0,drive=libvirt-1-format,id=virtio-disk1,bootindex=1 \
+-fsdev local,security_model=passthrough,id=fsdev-fs0,path=/export/to/guest \
+-device virtio-9p-pci,id=fs0,fsdev=fsdev-fs0,mount_tag=/import/from/host,bus=pci.3,addr=0x0 \
+-netdev user,id=hostnet0 \
+-device virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.4,addr=0x0 \
+-netdev user,id=hostnet1 \
+-device e1000e,netdev=hostnet1,id=net1,mac=00:11:22:33:44:66,bus=pci.5,addr=0x0 \
+-device virtio-input-host-pci,id=input0,evdev=/dev/input/event1234,bus=pci.12,addr=0x0 \
+-device virtio-mouse-pci,id=input1,bus=pci.13,addr=0x0 \
+-device virtio-keyboard-pci,id=input2,bus=pci.14,addr=0x0 \
+-device virtio-tablet-pci,id=input3,bus=pci.15,addr=0x0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device virtio-vga,id=video0,max_outputs=1,bus=pcie.0,addr=0x1 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.10,addr=0x0 \
+-object rng-random,id=objrng0,filename=/dev/urandom \
+-device virtio-rng-pci,rng=objrng0,id=rng0,max-bytes=123,period=1234,bus=pci.11,addr=0x0 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 2f31cc8e15..56a3b3a78f 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2563,135 +2563,27 @@ mymain(void)
QEMU_CAPS_ICH9_USB_EHCI1,
QEMU_CAPS_DEVICE_QXL);
+ /* Note: The real caps versions of the following tests based on qemu-4.2.0
+ * were added as a comparison point between fake caps testing and real caps
+ * testing and don't have any other specific purpose */
/* verify that devices with pcie capability are assigned to a pcie slot */
- DO_TEST("q35-pcie",
- QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY,
- QEMU_CAPS_DEVICE_VIRTIO_RNG,
- QEMU_CAPS_OBJECT_RNG_RANDOM,
- QEMU_CAPS_DEVICE_VIRTIO_NET,
- QEMU_CAPS_DEVICE_VIRTIO_GPU,
- QEMU_CAPS_VIRTIO_GPU_VIRGL,
- QEMU_CAPS_VIRTIO_KEYBOARD,
- QEMU_CAPS_VIRTIO_MOUSE,
- QEMU_CAPS_VIRTIO_TABLET,
- QEMU_CAPS_VIRTIO_INPUT_HOST,
- QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_DEVICE_PCI_BRIDGE,
- QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
- QEMU_CAPS_DEVICE_IOH3420,
- QEMU_CAPS_ICH9_AHCI,
- QEMU_CAPS_ICH9_USB_EHCI1,
- QEMU_CAPS_NEC_USB_XHCI);
+ DO_TEST_CAPS_VER("q35-pcie", "4.2.0");
DO_TEST_CAPS_LATEST("q35-pcie");
/* same XML as q35-pcie, but don't set
* QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, so virtio devices should
* be assigned to legacy pci slots. This doesn't apply to the 'real' caps
* tests as such configuration is not present in real life.
*/
- DO_TEST("q35-virtio-pci",
- QEMU_CAPS_DEVICE_VIRTIO_RNG,
- QEMU_CAPS_OBJECT_RNG_RANDOM,
- QEMU_CAPS_DEVICE_VIRTIO_NET,
- QEMU_CAPS_DEVICE_VIRTIO_GPU,
- QEMU_CAPS_VIRTIO_GPU_VIRGL,
- QEMU_CAPS_VIRTIO_KEYBOARD,
- QEMU_CAPS_VIRTIO_MOUSE,
- QEMU_CAPS_VIRTIO_TABLET,
- QEMU_CAPS_VIRTIO_INPUT_HOST,
- QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_DEVICE_PCI_BRIDGE,
- QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
- QEMU_CAPS_DEVICE_IOH3420,
- QEMU_CAPS_ICH9_AHCI,
- QEMU_CAPS_ICH9_USB_EHCI1,
- QEMU_CAPS_NEC_USB_XHCI);
+ DO_TEST_CAPS_VER("q35-virtio-pci", "4.2.0");
DO_TEST_CAPS_LATEST("q35-virtio-pci");
/* same as q35-pcie, but all PCI controllers are added automatically */
- DO_TEST("q35-pcie-autoadd",
- QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY,
- QEMU_CAPS_DEVICE_VIRTIO_RNG,
- QEMU_CAPS_OBJECT_RNG_RANDOM,
- QEMU_CAPS_DEVICE_VIRTIO_NET,
- QEMU_CAPS_DEVICE_VIRTIO_GPU,
- QEMU_CAPS_VIRTIO_GPU_VIRGL,
- QEMU_CAPS_VIRTIO_KEYBOARD,
- QEMU_CAPS_VIRTIO_MOUSE,
- QEMU_CAPS_VIRTIO_TABLET,
- QEMU_CAPS_VIRTIO_INPUT_HOST,
- QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_DEVICE_PCI_BRIDGE,
- QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
- QEMU_CAPS_DEVICE_IOH3420,
- QEMU_CAPS_ICH9_AHCI,
- QEMU_CAPS_ICH9_USB_EHCI1,
- QEMU_CAPS_NEC_USB_XHCI);
+ DO_TEST_CAPS_VER("q35-pcie-autoadd", "4.2.0");
DO_TEST_CAPS_LATEST("q35-pcie-autoadd");
- DO_TEST("q35-default-devices-only",
- QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY,
- QEMU_CAPS_DEVICE_VIRTIO_RNG,
- QEMU_CAPS_OBJECT_RNG_RANDOM,
- QEMU_CAPS_DEVICE_VIRTIO_NET,
- QEMU_CAPS_DEVICE_VIRTIO_GPU,
- QEMU_CAPS_VIRTIO_GPU_VIRGL,
- QEMU_CAPS_VIRTIO_KEYBOARD,
- QEMU_CAPS_VIRTIO_MOUSE,
- QEMU_CAPS_VIRTIO_TABLET,
- QEMU_CAPS_VIRTIO_INPUT_HOST,
- QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_DEVICE_PCI_BRIDGE,
- QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
- QEMU_CAPS_DEVICE_IOH3420,
- QEMU_CAPS_ICH9_AHCI,
- QEMU_CAPS_ICH9_USB_EHCI1,
- QEMU_CAPS_NEC_USB_XHCI);
+ DO_TEST_CAPS_VER("q35-default-devices-only", "4.2.0");
DO_TEST_CAPS_LATEST("q35-default-devices-only");
- DO_TEST("q35-multifunction",
- QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY,
- QEMU_CAPS_DEVICE_VIRTIO_RNG,
- QEMU_CAPS_OBJECT_RNG_RANDOM,
- QEMU_CAPS_DEVICE_VIRTIO_NET,
- QEMU_CAPS_DEVICE_VIRTIO_GPU,
- QEMU_CAPS_VIRTIO_GPU_VIRGL,
- QEMU_CAPS_VIRTIO_KEYBOARD,
- QEMU_CAPS_VIRTIO_MOUSE,
- QEMU_CAPS_VIRTIO_TABLET,
- QEMU_CAPS_VIRTIO_INPUT_HOST,
- QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_DEVICE_PCI_BRIDGE,
- QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
- QEMU_CAPS_DEVICE_IOH3420,
- QEMU_CAPS_ICH9_AHCI,
- QEMU_CAPS_ICH9_USB_EHCI1,
- QEMU_CAPS_NEC_USB_XHCI);
+ DO_TEST_CAPS_VER("q35-multifunction", "4.2.0");
DO_TEST_CAPS_LATEST("q35-multifunction");
- DO_TEST("q35-virt-manager-basic",
- QEMU_CAPS_KVM,
- QEMU_CAPS_MACHINE_VMPORT_OPT,
- QEMU_CAPS_ICH9_DISABLE_S3,
- QEMU_CAPS_ICH9_DISABLE_S4,
- QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY,
- QEMU_CAPS_DEVICE_VIRTIO_RNG,
- QEMU_CAPS_OBJECT_RNG_RANDOM,
- QEMU_CAPS_DEVICE_VIRTIO_NET,
- QEMU_CAPS_DEVICE_VIRTIO_GPU,
- QEMU_CAPS_VIRTIO_GPU_VIRGL,
- QEMU_CAPS_VIRTIO_KEYBOARD,
- QEMU_CAPS_VIRTIO_MOUSE,
- QEMU_CAPS_VIRTIO_TABLET,
- QEMU_CAPS_VIRTIO_INPUT_HOST,
- QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_DEVICE_PCI_BRIDGE,
- QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
- QEMU_CAPS_DEVICE_IOH3420,
- QEMU_CAPS_ICH9_AHCI,
- QEMU_CAPS_ICH9_USB_EHCI1,
- QEMU_CAPS_NEC_USB_XHCI,
- QEMU_CAPS_DEVICE_ICH9_INTEL_HDA,
- QEMU_CAPS_SPICE,
- QEMU_CAPS_DEVICE_QXL,
- QEMU_CAPS_HDA_DUPLEX,
- QEMU_CAPS_DEVICE_ISA_SERIAL,
- QEMU_CAPS_USB_REDIR);
+ DO_TEST_CAPS_VER("q35-virt-manager-basic", "4.2.0");
DO_TEST_CAPS_LATEST("q35-virt-manager-basic");
/* Test automatic and manual setting of pcie-root-port attributes */
@@ -2786,11 +2678,7 @@ mymain(void)
QEMU_CAPS_VIRTIO_SCSI,
QEMU_CAPS_DEVICE_VHOST_SCSI);
DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdev-scsi-vhost-scsi-pci-boot-fail");
- DO_TEST("hostdev-scsi-vhost-scsi-pcie",
- QEMU_CAPS_KVM,
- QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VHOST_SCSI,
- QEMU_CAPS_DEVICE_PCIE_ROOT_PORT,
- QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY);
+ DO_TEST_CAPS_VER("hostdev-scsi-vhost-scsi-pcie", "4.2.0");
DO_TEST_CAPS_LATEST("hostdev-scsi-vhost-scsi-pcie");
DO_TEST_PARSE_ERROR("hostdev-scsi-duplicate",
QEMU_CAPS_VIRTIO_SCSI,
@@ -2832,15 +2720,7 @@ mymain(void)
q35 style PCI controllers will be added if the binary supports it,
but virtio-mmio is always used unless PCI addresses are manually
specified. */
- DO_TEST("aarch64-virtio-pci-default",
- QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY,
- QEMU_CAPS_DEVICE_VIRTIO_MMIO,
- QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM,
- QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE,
- QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
- QEMU_CAPS_DEVICE_IOH3420,
- QEMU_CAPS_DEVICE_PL011,
- QEMU_CAPS_VIRTIO_SCSI);
+ DO_TEST_CAPS_ARCH_VER("aarch64-virtio-pci-default", "aarch64", "4.2.0");
DO_TEST_CAPS_ARCH_LATEST("aarch64-virtio-pci-default", "aarch64");
DO_TEST("aarch64-virt-2.6-virtio-pci-default",
QEMU_CAPS_DEVICE_VIRTIO_MMIO,
--
2.37.1
