[PATCH 0/5] qemu: Test case modernization
This is split out and updated based on comments on my RFC series bumping minimum supported qemu version to 3.1. - commit 1 is new - commit 2 is a separated update to 'disk-error-policy' case as pure update to 4.1 (as with others) would camouflage changes in placing of rerror/werror properties - commit 3 is a separated update to test cases having 'device_id' of SCSI disk due to same reason as above - commit 4 is now an update of disk test cases using qemu-2.12 caps to qemu 4.1 caps. Now only test cases which which are not related to disks are contained in this commit - commit 5 is a similar update to a sev test case that was missing Peter Krempa (5): qemu: command: Inline qemuBuildDiskFrontendAttributeErrorPolicy qemuxml2argvtest: Add pre-blockdev post-werror-move version of 'disk-error-policy' qemuxml2argvtest: Update disk test cases having 'device_id' argument of SCSI disk qemuxml2argvtest: Bump versioned test variants for pre-blockdev disk tests to 4.1.0 qemuxml2argvtest: Add newer variant of 'launch-security-sev-missing-platform-info' src/qemu/qemu_command.c | 29 ++++------ ...2.12.0.args => disk-aio.x86_64-4.1.0.args} | 4 +- ...sk-backing-chains-index.x86_64-2.12.0.args | 1 - ...sk-backing-chains-index.x86_64-4.1.0.args} | 4 +- ...k-backing-chains-noindex.x86_64-4.1.0.args | 1 + ...12.0.args => disk-cache.x86_64-3.1.0.args} | 4 +- .../disk-cache.x86_64-4.1.0.args | 42 +++++++++++++++ ...s => disk-cdrom-network.x86_64-4.1.0.args} | 4 +- ...args => disk-cdrom-tray.x86_64-4.1.0.args} | 4 +- ...12.0.args => disk-cdrom.x86_64-4.1.0.args} | 4 +- ...gs => disk-copy_on_read.x86_64-4.1.0.args} | 4 +- ...s => disk-detect-zeroes.x86_64-4.1.0.args} | 4 +- .../disk-error-policy-s390x.s390x-4.0.0.args | 35 ++++++++++++ .../disk-error-policy.x86_64-4.1.0.args | 37 +++++++++++++ ...args => disk-floppy-q35.x86_64-4.1.0.args} | 4 +- ...2.0.args => disk-floppy.x86_64-4.1.0.args} | 4 +- ...=> disk-network-gluster.x86_64-4.1.0.args} | 4 +- ...s => disk-network-iscsi.x86_64-4.1.0.args} | 4 +- ...rgs => disk-network-nbd.x86_64-4.1.0.args} | 4 +- ...rgs => disk-network-rbd.x86_64-4.1.0.args} | 4 +- ...> disk-network-sheepdog.x86_64-4.1.0.args} | 4 +- ...isk-network-source-auth.x86_64-4.1.0.args} | 4 +- ...isk-network-tlsx509-nbd.x86_64-4.1.0.args} | 4 +- ...sk-network-tlsx509-vxhs.x86_64-4.1.0.args} | 4 +- ...s => disk-readonly-disk.x86_64-4.1.0.args} | 4 +- ...2.0.args => disk-shared.x86_64-3.1.0.args} | 4 +- .../disk-shared.x86_64-4.1.0.args | 41 ++++++++++++++ ...irtio-scsi-reservations.x86_64-4.1.0.args} | 4 +- ...rgs => floppy-drive-fat.x86_64-4.1.0.args} | 4 +- ...ev-missing-platform-info.x86_64-6.0.0.args | 37 +++++++++++++ tests/qemuxml2argvtest.c | 53 +++++++++++-------- 31 files changed, 278 insertions(+), 86 deletions(-) rename tests/qemuxml2argvdata/{disk-aio.x86_64-2.12.0.args => disk-aio.x86_64-4.1.0.args} (94%) delete mode 120000 tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args rename tests/qemuxml2argvdata/{disk-backing-chains-noindex.x86_64-2.12.0.args => disk-backing-chains-index.x86_64-4.1.0.args} (96%) create mode 120000 tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-4.1.0.args rename tests/qemuxml2argvdata/{disk-cache.x86_64-2.12.0.args => disk-cache.x86_64-3.1.0.args} (96%) create mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-4.1.0.args rename tests/qemuxml2argvdata/{disk-cdrom-network.x86_64-2.12.0.args => disk-cdrom-network.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-cdrom-tray.x86_64-2.12.0.args => disk-cdrom-tray.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-cdrom.x86_64-2.12.0.args => disk-cdrom.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-copy_on_read.x86_64-2.12.0.args => disk-copy_on_read.x86_64-4.1.0.args} (95%) rename tests/qemuxml2argvdata/{disk-detect-zeroes.x86_64-2.12.0.args => disk-detect-zeroes.x86_64-4.1.0.args} (94%) create mode 100644 tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-4.0.0.args create mode 100644 tests/qemuxml2argvdata/disk-error-policy.x86_64-4.1.0.args rename tests/qemuxml2argvdata/{disk-floppy-q35.x86_64-2.12.0.args => disk-floppy-q35.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-floppy.x86_64-2.12.0.args => disk-floppy.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-network-gluster.x86_64-2.12.0.args => disk-network-gluster.x86_64-4.1.0.args} (95%) rename tests/qemuxml2argvdata/{disk-network-iscsi.x86_64-2.12.0.args => disk-network-iscsi.x86_64-4.1.0.args} (97%) rename tests/qemuxml2argvdata/{disk-network-nbd.x86_64-2.12.0.args => disk-network-nbd.x86_64-4.1.0.args} (95%) rename tests/qemuxml2argvdata/{disk-network-rbd.x86_64-2.12.0.args => disk-network-rbd.x86_64-4.1.0.args} (97%) rename tests/qemuxml2argvdata/{disk-network-sheepdog.x86_64-2.12.0.args => disk-network-sheepdog.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-network-source-auth.x86_64-2.12.0.args => disk-network-source-auth.x86_64-4.1.0.args} (96%) rename tests/qemuxml2argvdata/{disk-network-tlsx509-nbd.x86_64-2.12.0.args => disk-network-tlsx509-nbd.x86_64-4.1.0.args} (95%) rename tests/qemuxml2argvdata/{disk-network-tlsx509-vxhs.x86_64-2.12.0.args => disk-network-tlsx509-vxhs.x86_64-4.1.0.args} (97%) rename tests/qemuxml2argvdata/{disk-readonly-disk.x86_64-2.12.0.args => disk-readonly-disk.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-shared.x86_64-2.12.0.args => disk-shared.x86_64-3.1.0.args} (95%) create mode 100644 tests/qemuxml2argvdata/disk-shared.x86_64-4.1.0.args rename tests/qemuxml2argvdata/{disk-virtio-scsi-reservations.x86_64-2.12.0.args => disk-virtio-scsi-reservations.x86_64-4.1.0.args} (95%) rename tests/qemuxml2argvdata/{floppy-drive-fat.x86_64-2.12.0.args => floppy-drive-fat.x86_64-4.1.0.args} (93%) create mode 100644 tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-6.0.0.args -- 2.34.1
Commit dc481f11a61 which converted the function generating properties for disk '-device' argument to JSON removed the only other use of qemuBuildDiskFrontendAttributeErrorPolicy, so we can now inline it into qemuBuildDriveStr. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_command.c | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1abff4fcaa..2c963a7297 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2002,22 +2002,6 @@ qemuBuildDiskGetErrorPolicy(virDomainDiskDef *disk, } -static void -qemuBuildDiskFrontendAttributeErrorPolicy(virDomainDiskDef *disk, - virBuffer *buf) -{ - const char *wpolicy = NULL; - const char *rpolicy = NULL; - - qemuBuildDiskGetErrorPolicy(disk, &wpolicy, &rpolicy); - - if (wpolicy) - virBufferAsprintf(buf, ",werror=%s", wpolicy); - if (rpolicy) - virBufferAsprintf(buf, ",rerror=%s", rpolicy); -} - - static char * qemuBuildDriveStr(virDomainDiskDef *disk, virQEMUCaps *qemuCaps) @@ -2043,8 +2027,17 @@ qemuBuildDriveStr(virDomainDiskDef *disk, /* werror/rerror are really frontend attributes, but older * qemu requires them on -drive instead of -device */ - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_STORAGE_WERROR)) - qemuBuildDiskFrontendAttributeErrorPolicy(disk, &opt); + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_STORAGE_WERROR)) { + const char *wpolicy = NULL; + const char *rpolicy = NULL; + + qemuBuildDiskGetErrorPolicy(disk, &wpolicy, &rpolicy); + + if (wpolicy) + virBufferAsprintf(&opt, ",werror=%s", wpolicy); + if (rpolicy) + virBufferAsprintf(&opt, ",rerror=%s", rpolicy); + } if (disk->src->readonly) virBufferAddLit(&opt, ",readonly=on"); -- 2.34.1
Starting with qemu-3.0 release we use the 'werror' and 'rerror' properties with the frontend (device) rather than the storage backend (with a minor caveat of s390, where we use it earlier as it doesn't support USB disks, and other disk types supported it earlier). Add specific test cases after the change, but before '-blockdev' was enabled. This is done separately from the changes in the next commit which simply moves all other disk tests to the last pre-blockdev qemu as we have a semantic change happening after 2.12. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../disk-error-policy-s390x.s390x-4.0.0.args | 35 ++++++++++++++++++ .../disk-error-policy.x86_64-4.1.0.args | 37 +++++++++++++++++++ tests/qemuxml2argvtest.c | 2 + 3 files changed, 74 insertions(+) create mode 100644 tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-4.0.0.args create mode 100644 tests/qemuxml2argvdata/disk-error-policy.x86_64-4.1.0.args diff --git a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-4.0.0.args b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-4.0.0.args new file mode 100644 index 0000000000..2cda1351c4 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-4.0.0.args @@ -0,0 +1,35 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/tmp/lib/domain--1-guest \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \ +XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \ +XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-s390x \ +-name guest=guest,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \ +-machine s390-ccw-virtio-4.0,usb=off,dump-guest-core=off \ +-accel tcg \ +-m 214 \ +-overcommit mem-lock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ +-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 \ +-boot strict=on \ +-drive file=/var/images/image1,format=qcow2,if=none,id=drive-virtio-disk0,cache=none \ +-device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1,write-cache=on,werror=stop,rerror=stop \ +-drive file=/var/images/image2,format=qcow2,if=none,id=drive-virtio-disk1,cache=none \ +-device virtio-blk-ccw,scsi=off,devno=fe.0.0001,drive=drive-virtio-disk1,id=virtio-disk1,write-cache=on,werror=enospc \ +-drive file=/var/images/image3,format=qcow2,if=none,id=drive-virtio-disk2,cache=none \ +-device virtio-blk-ccw,scsi=off,devno=fe.0.0002,drive=drive-virtio-disk2,id=virtio-disk2,write-cache=on,werror=report,rerror=ignore \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/disk-error-policy.x86_64-4.1.0.args b/tests/qemuxml2argvdata/disk-error-policy.x86_64-4.1.0.args new file mode 100644 index 0000000000..f08ce16a4e --- /dev/null +++ b/tests/qemuxml2argvdata/disk-error-policy.x86_64-4.1.0.args @@ -0,0 +1,37 @@ +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-i440fx-4.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 piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1,write-cache=on,werror=stop,rerror=stop \ +-drive file=/dev/HostVG/QEMUGuest2,format=qcow2,if=none,id=drive-ide0-0-1,cache=none \ +-device ide-hd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1,write-cache=on,werror=enospc \ +-drive file=/dev/HostVG/QEMUGuest3,format=qcow2,if=none,id=drive-ide0-1-0,cache=none \ +-device ide-hd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,write-cache=on,werror=report,rerror=ignore \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 1e1d9ee9a1..ee74eda7a8 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1347,8 +1347,10 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-shared"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-shared-qcow"); DO_TEST_CAPS_VER("disk-error-policy", "2.12.0"); + DO_TEST_CAPS_VER("disk-error-policy", "4.1.0"); DO_TEST_CAPS_LATEST("disk-error-policy"); DO_TEST_CAPS_ARCH_VER("disk-error-policy-s390x", "s390x", "2.12.0"); + DO_TEST_CAPS_ARCH_VER("disk-error-policy-s390x", "s390x", "4.0.0"); DO_TEST_CAPS_ARCH_LATEST("disk-error-policy-s390x", "s390x"); DO_TEST_CAPS_VER("disk-cache", "2.12.0"); DO_TEST_CAPS_LATEST("disk-cache"); -- 2.34.1
The 'device_add' property was added in qemu-4.0. Since upcoming patch will be modernizing all disk test cases we specifically want to preserve the instance of 'device_add' not being used with qemu-3.1 and earlier. Change the 'disk-cache' and 'disk-shared' cases to have a qemu-3.1 and a qemu-4.1 version for testing pre-'device_id' and pre-blockdev scenarios. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- ...12.0.args => disk-cache.x86_64-3.1.0.args} | 4 +- .../disk-cache.x86_64-4.1.0.args | 42 +++++++++++++++++++ ...2.0.args => disk-shared.x86_64-3.1.0.args} | 4 +- .../disk-shared.x86_64-4.1.0.args | 41 ++++++++++++++++++ tests/qemuxml2argvtest.c | 6 ++- 5 files changed, 91 insertions(+), 6 deletions(-) rename tests/qemuxml2argvdata/{disk-cache.x86_64-2.12.0.args => disk-cache.x86_64-3.1.0.args} (96%) create mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-4.1.0.args rename tests/qemuxml2argvdata/{disk-shared.x86_64-2.12.0.args => disk-shared.x86_64-3.1.0.args} (95%) create mode 100644 tests/qemuxml2argvdata/disk-shared.x86_64-4.1.0.args diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-cache.x86_64-3.1.0.args similarity index 96% rename from tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-cache.x86_64-3.1.0.args index 2fa865ae3a..9240080adb 100644 --- a/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-cache.x86_64-3.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=none \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-machine pc-i440fx-3.1,usb=off,dump-guest-core=off \ -accel tcg \ -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 \ diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-4.1.0.args b/tests/qemuxml2argvdata/disk-cache.x86_64-4.1.0.args new file mode 100644 index 0000000000..f1b2d6989d --- /dev/null +++ b/tests/qemuxml2argvdata/disk-cache.x86_64-4.1.0.args @@ -0,0 +1,42 @@ +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-i440fx-4.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 piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-device lsi,id=scsi0,bus=pci.0,addr=0x2 \ +-drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=writeback \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1,write-cache=on \ +-drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-1,cache=unsafe \ +-device ide-hd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1,write-cache=on \ +-drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-scsi0-0-0,cache=none \ +-device scsi-hd,bus=scsi0.0,scsi-id=0,device_id=drive-scsi0-0-0,drive=drive-scsi0-0-0,id=scsi0-0-0,write-cache=on \ +-drive file=/dev/disk/by-path/ip-192.168.44.1:3260-iscsi-iqn.2011-02.lan.hdserver:hydrar-desktop.win7vm-lun-0,format=qcow2,if=none,id=drive-virtio-disk0,cache=writethrough \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0,write-cache=off \ +-drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-usb-disk1,cache=directsync \ +-device usb-storage,bus=usb.0,port=1,drive=drive-usb-disk1,id=usb-disk1,removable=off,write-cache=off \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-shared.x86_64-3.1.0.args similarity index 95% rename from tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-shared.x86_64-3.1.0.args index 7989db52c0..1d5fda0215 100644 --- a/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-shared.x86_64-3.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=none \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-machine pc-i440fx-3.1,usb=off,dump-guest-core=off \ -accel tcg \ -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 \ diff --git a/tests/qemuxml2argvdata/disk-shared.x86_64-4.1.0.args b/tests/qemuxml2argvdata/disk-shared.x86_64-4.1.0.args new file mode 100644 index 0000000000..2c2a52e6d6 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-shared.x86_64-4.1.0.args @@ -0,0 +1,41 @@ +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-i440fx-4.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 piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x2 \ +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0,cache=none \ +-device ide-hd,bus=ide.0,unit=0,share-rw=on,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1,write-cache=on,serial=XYZXYZXYZYXXYZYZYXYZY \ +-drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-1-0,readonly=on \ +-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ +-drive file=/dev/scsi,format=raw,if=none,id=drive-scsi0-0-0-0,cache=none \ +-device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,device_id=drive-scsi0-0-0-0,share-rw=on,drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,write-cache=on \ +-drive file=/dev/virtio,format=raw,if=none,id=drive-virtio-disk0,cache=none \ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,share-rw=on,drive=drive-virtio-disk0,id=virtio-disk0,write-cache=on \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index ee74eda7a8..eee540f24f 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1343,7 +1343,8 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-fmt-cow"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-fmt-dir"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-fmt-iso"); - DO_TEST_CAPS_VER("disk-shared", "2.12.0"); + DO_TEST_CAPS_VER("disk-shared", "3.1.0"); + DO_TEST_CAPS_VER("disk-shared", "4.1.0"); DO_TEST_CAPS_LATEST("disk-shared"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-shared-qcow"); DO_TEST_CAPS_VER("disk-error-policy", "2.12.0"); @@ -1352,7 +1353,8 @@ mymain(void) DO_TEST_CAPS_ARCH_VER("disk-error-policy-s390x", "s390x", "2.12.0"); DO_TEST_CAPS_ARCH_VER("disk-error-policy-s390x", "s390x", "4.0.0"); DO_TEST_CAPS_ARCH_LATEST("disk-error-policy-s390x", "s390x"); - DO_TEST_CAPS_VER("disk-cache", "2.12.0"); + DO_TEST_CAPS_VER("disk-cache", "3.1.0"); + DO_TEST_CAPS_VER("disk-cache", "4.1.0"); DO_TEST_CAPS_LATEST("disk-cache"); DO_TEST_CAPS_LATEST("disk-metadata-cache"); DO_TEST_CAPS_ARCH_VER_PARSE_ERROR("disk-transient", "x86_64", "4.1.0"); -- 2.34.1
On a Monday in 2022, Peter Krempa wrote:
The 'device_add' property was added in qemu-4.0. Since upcoming patch
*device_id
will be modernizing all disk test cases we specifically want to preserve the instance of 'device_add' not being used with qemu-3.1 and earlier.
*device_id Jano
Change the 'disk-cache' and 'disk-shared' cases to have a qemu-3.1 and a qemu-4.1 version for testing pre-'device_id' and pre-blockdev scenarios.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- ...12.0.args => disk-cache.x86_64-3.1.0.args} | 4 +- .../disk-cache.x86_64-4.1.0.args | 42 +++++++++++++++++++ ...2.0.args => disk-shared.x86_64-3.1.0.args} | 4 +- .../disk-shared.x86_64-4.1.0.args | 41 ++++++++++++++++++ tests/qemuxml2argvtest.c | 6 ++- 5 files changed, 91 insertions(+), 6 deletions(-) rename tests/qemuxml2argvdata/{disk-cache.x86_64-2.12.0.args => disk-cache.x86_64-3.1.0.args} (96%) create mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-4.1.0.args rename tests/qemuxml2argvdata/{disk-shared.x86_64-2.12.0.args => disk-shared.x86_64-3.1.0.args} (95%) create mode 100644 tests/qemuxml2argvdata/disk-shared.x86_64-4.1.0.args
Originally when I started working on '-blockdev' support I added version locked variants of all the relevant disk tests locked to qemu-2.12, but blockdev was finally enabled with qemu-4.2. This patch bumps all of the test cases Upcoming patches will be removing support for qemu-2.12, but '-blockdev' is used only with qemu-4.2 and later. This patch adds variants locked to qemu-4.1 for all the disk tests that have a variant for 2.11 (with a slight exception of the 'disk-error-policy-s390x' case locked to qemu-4.0 as we don't have qemu-4.1 caps for s390x). Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- ...2.12.0.args => disk-aio.x86_64-4.1.0.args} | 4 +- ...sk-backing-chains-index.x86_64-2.12.0.args | 1 - ...sk-backing-chains-index.x86_64-4.1.0.args} | 4 +- ...k-backing-chains-noindex.x86_64-4.1.0.args | 1 + ...s => disk-cdrom-network.x86_64-4.1.0.args} | 4 +- ...args => disk-cdrom-tray.x86_64-4.1.0.args} | 4 +- ...12.0.args => disk-cdrom.x86_64-4.1.0.args} | 4 +- ...gs => disk-copy_on_read.x86_64-4.1.0.args} | 4 +- ...s => disk-detect-zeroes.x86_64-4.1.0.args} | 4 +- ...args => disk-floppy-q35.x86_64-4.1.0.args} | 4 +- ...2.0.args => disk-floppy.x86_64-4.1.0.args} | 4 +- ...=> disk-network-gluster.x86_64-4.1.0.args} | 4 +- ...s => disk-network-iscsi.x86_64-4.1.0.args} | 4 +- ...rgs => disk-network-nbd.x86_64-4.1.0.args} | 4 +- ...rgs => disk-network-rbd.x86_64-4.1.0.args} | 4 +- ...> disk-network-sheepdog.x86_64-4.1.0.args} | 4 +- ...isk-network-source-auth.x86_64-4.1.0.args} | 4 +- ...isk-network-tlsx509-nbd.x86_64-4.1.0.args} | 4 +- ...sk-network-tlsx509-vxhs.x86_64-4.1.0.args} | 4 +- ...s => disk-readonly-disk.x86_64-4.1.0.args} | 4 +- ...irtio-scsi-reservations.x86_64-4.1.0.args} | 4 +- ...rgs => floppy-drive-fat.x86_64-4.1.0.args} | 4 +- tests/qemuxml2argvtest.c | 44 ++++++++++--------- 23 files changed, 64 insertions(+), 62 deletions(-) rename tests/qemuxml2argvdata/{disk-aio.x86_64-2.12.0.args => disk-aio.x86_64-4.1.0.args} (94%) delete mode 120000 tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args rename tests/qemuxml2argvdata/{disk-backing-chains-noindex.x86_64-2.12.0.args => disk-backing-chains-index.x86_64-4.1.0.args} (96%) create mode 120000 tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-4.1.0.args rename tests/qemuxml2argvdata/{disk-cdrom-network.x86_64-2.12.0.args => disk-cdrom-network.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-cdrom-tray.x86_64-2.12.0.args => disk-cdrom-tray.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-cdrom.x86_64-2.12.0.args => disk-cdrom.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-copy_on_read.x86_64-2.12.0.args => disk-copy_on_read.x86_64-4.1.0.args} (95%) rename tests/qemuxml2argvdata/{disk-detect-zeroes.x86_64-2.12.0.args => disk-detect-zeroes.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-floppy-q35.x86_64-2.12.0.args => disk-floppy-q35.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-floppy.x86_64-2.12.0.args => disk-floppy.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-network-gluster.x86_64-2.12.0.args => disk-network-gluster.x86_64-4.1.0.args} (95%) rename tests/qemuxml2argvdata/{disk-network-iscsi.x86_64-2.12.0.args => disk-network-iscsi.x86_64-4.1.0.args} (97%) rename tests/qemuxml2argvdata/{disk-network-nbd.x86_64-2.12.0.args => disk-network-nbd.x86_64-4.1.0.args} (95%) rename tests/qemuxml2argvdata/{disk-network-rbd.x86_64-2.12.0.args => disk-network-rbd.x86_64-4.1.0.args} (97%) rename tests/qemuxml2argvdata/{disk-network-sheepdog.x86_64-2.12.0.args => disk-network-sheepdog.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-network-source-auth.x86_64-2.12.0.args => disk-network-source-auth.x86_64-4.1.0.args} (96%) rename tests/qemuxml2argvdata/{disk-network-tlsx509-nbd.x86_64-2.12.0.args => disk-network-tlsx509-nbd.x86_64-4.1.0.args} (95%) rename tests/qemuxml2argvdata/{disk-network-tlsx509-vxhs.x86_64-2.12.0.args => disk-network-tlsx509-vxhs.x86_64-4.1.0.args} (97%) rename tests/qemuxml2argvdata/{disk-readonly-disk.x86_64-2.12.0.args => disk-readonly-disk.x86_64-4.1.0.args} (94%) rename tests/qemuxml2argvdata/{disk-virtio-scsi-reservations.x86_64-2.12.0.args => disk-virtio-scsi-reservations.x86_64-4.1.0.args} (95%) rename tests/qemuxml2argvdata/{floppy-drive-fat.x86_64-2.12.0.args => floppy-drive-fat.x86_64-4.1.0.args} (93%) diff --git a/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-aio.x86_64-4.1.0.args similarity index 94% rename from tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-aio.x86_64-4.1.0.args index ff2b924345..c3b1b199c9 100644 --- a/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-aio.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=none \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,usb=off,dump-guest-core=off \ -accel tcg \ -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 \ diff --git a/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args deleted file mode 120000 index 3f4cd9040d..0000000000 --- a/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args +++ /dev/null @@ -1 +0,0 @@ -disk-backing-chains-noindex.x86_64-2.12.0.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-4.1.0.args similarity index 96% rename from tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-4.1.0.args index 5147cf93e6..77ffc8edb2 100644 --- a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=none \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,usb=off,dump-guest-core=off \ -accel tcg \ -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 \ diff --git a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-4.1.0.args b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-4.1.0.args new file mode 120000 index 0000000000..855fb35edd --- /dev/null +++ b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-4.1.0.args @@ -0,0 +1 @@ +disk-backing-chains-index.x86_64-4.1.0.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-4.1.0.args similarity index 94% rename from tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-cdrom-network.x86_64-4.1.0.args index aca93dd5ea..00030f208d 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=none \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,usb=off,dump-guest-core=off \ -accel kvm \ -m 1024 \ --realtime mlock=off \ +-overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-4.1.0.args similarity index 94% rename from tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-4.1.0.args index 8cfd70ac6b..bbece87022 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=none \ -name guest=test,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-test/master-key.aes \ --machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,usb=off,dump-guest-core=off \ -accel tcg \ -m 1024 \ --realtime mlock=off \ +-overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid 3fa02811-7832-34bd-004d-1ff56a9286ff \ -display none \ diff --git a/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-cdrom.x86_64-4.1.0.args similarity index 94% rename from tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-cdrom.x86_64-4.1.0.args index d8dc6e81cd..443bbb67ae 100644 --- a/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-cdrom.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=none \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,usb=off,dump-guest-core=off \ -accel tcg \ -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 \ diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-4.1.0.args similarity index 95% rename from tests/qemuxml2argvdata/disk-copy_on_read.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-copy_on_read.x86_64-4.1.0.args index 0c96bf9718..db7b09ff4c 100644 --- a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=none \ -name guest=test,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-test/master-key.aes \ --machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,usb=off,dump-guest-core=off \ -accel tcg \ -m 1024 \ --realtime mlock=off \ +-overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid 468404ad-d49c-40f2-9e14-02294f9c1be3 \ -display none \ diff --git a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-4.1.0.args similarity index 94% rename from tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-4.1.0.args index 910168b9fc..d7d78786a9 100644 --- a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-4.1.0.args @@ -11,11 +11,11 @@ QEMU_AUDIO_DRV=none \ -name guest=test,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-test/master-key.aes \ --machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,usb=off,dump-guest-core=off \ -accel tcg \ -cpu qemu64 \ -m 1024 \ --realtime mlock=off \ +-overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid 92d7a226-cfae-425b-a6d3-00bbf9ec5c9e \ -display none \ diff --git a/tests/qemuxml2argvdata/disk-floppy-q35.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-floppy-q35.x86_64-4.1.0.args similarity index 94% rename from tests/qemuxml2argvdata/disk-floppy-q35.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-floppy-q35.x86_64-4.1.0.args index efd76d6436..42b95c3102 100644 --- a/tests/qemuxml2argvdata/disk-floppy-q35.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-floppy-q35.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=none \ -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-2.12,usb=off,dump-guest-core=off \ +-machine pc-q35-4.1,usb=off,dump-guest-core=off \ -accel tcg \ -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 \ diff --git a/tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-floppy.x86_64-4.1.0.args similarity index 94% rename from tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-floppy.x86_64-4.1.0.args index 86ebe72c05..1069bfa964 100644 --- a/tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-floppy.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=none \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,usb=off,dump-guest-core=off \ -accel tcg \ -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 \ diff --git a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-4.1.0.args similarity index 95% rename from tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-network-gluster.x86_64-4.1.0.args index 9a4adc8145..7611d4cfa7 100644 --- a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=none \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,usb=off,dump-guest-core=off \ -accel tcg \ -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 \ diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-4.1.0.args similarity index 97% rename from tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-network-iscsi.x86_64-4.1.0.args index a6bb026050..409ba8ab31 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=none \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,usb=off,dump-guest-core=off \ -accel tcg \ -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 \ diff --git a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-4.1.0.args similarity index 95% rename from tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-network-nbd.x86_64-4.1.0.args index 65d3d566a9..5792e906c2 100644 --- a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=none \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,usb=off,dump-guest-core=off \ -accel tcg \ -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 \ diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-4.1.0.args similarity index 97% rename from tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-network-rbd.x86_64-4.1.0.args index fd2c4a35d3..3483853e39 100644 --- a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=none \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,usb=off,dump-guest-core=off \ -accel tcg \ -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 \ diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-4.1.0.args similarity index 94% rename from tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-4.1.0.args index a2afcc6140..c054ba308f 100644 --- a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=none \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,usb=off,dump-guest-core=off \ -accel tcg \ -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 \ diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-4.1.0.args similarity index 96% rename from tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-network-source-auth.x86_64-4.1.0.args index ace4510c21..35d009bec6 100644 --- a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=none \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,usb=off,dump-guest-core=off \ -accel tcg \ -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 \ diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-4.1.0.args similarity index 95% rename from tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-4.1.0.args index 6f3b686822..ff8427b546 100644 --- a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=none \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,usb=off,dump-guest-core=off \ -accel tcg \ -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 \ diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-4.1.0.args similarity index 97% rename from tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-4.1.0.args index 4821140b93..b92beed6b5 100644 --- a/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=none \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,usb=off,dump-guest-core=off \ -accel tcg \ -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 \ diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-4.1.0.args similarity index 94% rename from tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-readonly-disk.x86_64-4.1.0.args index 0cef0675be..5fb40209d1 100644 --- a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=none \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,usb=off,dump-guest-core=off \ -accel tcg \ -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 \ diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-4.1.0.args similarity index 95% rename from tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-4.1.0.args index d3d0197e65..b063f81e55 100644 --- a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-4.1.0.args @@ -12,10 +12,10 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -object pr-manager-helper,id=pr-helper0,path=/tmp/lib/domain--1-QEMUGuest1/pr-helper0.sock \ --machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,usb=off,dump-guest-core=off \ -accel tcg \ -m 214 \ --realtime mlock=off \ +-overcommit mem-lock=off \ -smp 8,sockets=8,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-4.1.0.args similarity index 93% rename from tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/floppy-drive-fat.x86_64-4.1.0.args index 2f096d7d39..aa0795010d 100644 --- a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-4.1.0.args @@ -11,10 +11,10 @@ QEMU_AUDIO_DRV=none \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,usb=off,dump-guest-core=off \ -accel tcg \ -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 \ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index eee540f24f..04f0eb2f3f 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1312,17 +1312,18 @@ mymain(void) DO_TEST_PARSE_ERROR("non-x86_64-timer-error", QEMU_CAPS_CCW); - DO_TEST_CAPS_VER("disk-cdrom", "2.12.0"); + /* qemu-4.1 was the last qemu version which we didn't use -blockdev with */ + DO_TEST_CAPS_VER("disk-cdrom", "4.1.0"); DO_TEST_CAPS_LATEST("disk-cdrom"); DO_TEST_CAPS_LATEST("disk-cdrom-empty-network-invalid"); DO_TEST_CAPS_LATEST("disk-cdrom-bus-other"); - DO_TEST_CAPS_VER("disk-cdrom-network", "2.12.0"); + DO_TEST_CAPS_VER("disk-cdrom-network", "4.1.0"); DO_TEST_CAPS_LATEST("disk-cdrom-network"); - DO_TEST_CAPS_VER("disk-cdrom-tray", "2.12.0"); + DO_TEST_CAPS_VER("disk-cdrom-tray", "4.1.0"); DO_TEST_CAPS_LATEST("disk-cdrom-tray"); - DO_TEST_CAPS_VER("disk-floppy", "2.12.0"); + DO_TEST_CAPS_VER("disk-floppy", "4.1.0"); DO_TEST_CAPS_LATEST("disk-floppy"); - DO_TEST_CAPS_VER("disk-floppy-q35", "2.12.0"); + DO_TEST_CAPS_VER("disk-floppy-q35", "4.1.0"); DO_TEST_CAPS_LATEST("disk-floppy-q35"); DO_TEST_CAPS_ARCH_LATEST_FAILURE("disk-floppy-pseries", "ppc64"); DO_TEST_CAPS_LATEST("disk-floppy-tray"); @@ -1334,9 +1335,9 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-virtio-queues"); DO_TEST_CAPS_LATEST("disk-boot-disk"); DO_TEST_CAPS_LATEST("disk-boot-cdrom"); - DO_TEST_CAPS_VER("floppy-drive-fat", "2.12.0"); + DO_TEST_CAPS_VER("floppy-drive-fat", "4.1.0"); DO_TEST_CAPS_LATEST("floppy-drive-fat"); - DO_TEST_CAPS_VER("disk-readonly-disk", "2.12.0"); + DO_TEST_CAPS_VER("disk-readonly-disk", "4.1.0"); DO_TEST_CAPS_LATEST("disk-readonly-disk"); DO_TEST_CAPS_VER("disk-fmt-qcow", "4.1.0"); DO_TEST_CAPS_LATEST("disk-fmt-qcow"); @@ -1359,32 +1360,33 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-metadata-cache"); DO_TEST_CAPS_ARCH_VER_PARSE_ERROR("disk-transient", "x86_64", "4.1.0"); DO_TEST_CAPS_LATEST("disk-transient"); - DO_TEST_CAPS_VER("disk-network-nbd", "2.12.0"); + DO_TEST_CAPS_VER("disk-network-nbd", "4.1.0"); DO_TEST_CAPS_LATEST("disk-network-nbd"); - DO_TEST_CAPS_VER("disk-network-iscsi", "2.12.0"); + DO_TEST_CAPS_VER("disk-network-iscsi", "4.1.0"); DO_TEST_CAPS_LATEST("disk-network-iscsi"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-network-iscsi-auth-secrettype-invalid"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-network-iscsi-auth-wrong-secrettype"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-network-source-auth-both"); - DO_TEST_CAPS_VER("disk-network-gluster", "2.12.0"); + DO_TEST_CAPS_VER("disk-network-gluster", "4.1.0"); DO_TEST_CAPS_LATEST("disk-network-gluster"); - DO_TEST_CAPS_VER("disk-network-rbd", "2.12.0"); + DO_TEST_CAPS_VER("disk-network-rbd", "4.1.0"); DO_TEST_CAPS_LATEST("disk-network-rbd"); DO_TEST_CAPS_VER_PARSE_ERROR("disk-network-rbd-encryption", "6.0.0"); DO_TEST_CAPS_LATEST("disk-network-rbd-encryption"); DO_TEST_CAPS_VER_FAILURE("disk-network-rbd-no-colon", "4.1.0"); DO_TEST_CAPS_LATEST("disk-network-rbd-no-colon"); - DO_TEST_CAPS_VER("disk-network-sheepdog", "2.12.0"); + DO_TEST_CAPS_VER("disk-network-sheepdog", "4.1.0"); + /* qemu-6.0 is the last qemu version supporting sheepdog */ DO_TEST_CAPS_VER("disk-network-sheepdog", "6.0.0"); - DO_TEST_CAPS_VER("disk-network-source-auth", "2.12.0"); + DO_TEST_CAPS_VER("disk-network-source-auth", "4.1.0"); DO_TEST_CAPS_LATEST("disk-network-source-auth"); DO_TEST_CAPS_LATEST("disk-network-nfs"); driver.config->vxhsTLS = 1; driver.config->nbdTLSx509secretUUID = g_strdup("6fd3f62d-9fe7-4a4e-a869-7acd6376d8ea"); driver.config->vxhsTLSx509secretUUID = g_strdup("6fd3f62d-9fe7-4a4e-a869-7acd6376d8ea"); - DO_TEST_CAPS_VER("disk-network-tlsx509-nbd", "2.12.0"); + DO_TEST_CAPS_VER("disk-network-tlsx509-nbd", "4.1.0"); DO_TEST_CAPS_VER("disk-network-tlsx509-nbd", "5.2.0"); - DO_TEST_CAPS_VER("disk-network-tlsx509-vxhs", "2.12.0"); + DO_TEST_CAPS_VER("disk-network-tlsx509-vxhs", "4.1.0"); DO_TEST_CAPS_LATEST("disk-network-tlsx509-nbd"); DO_TEST_CAPS_VER("disk-network-tlsx509-vxhs", "5.0.0"); DO_TEST_CAPS_LATEST("disk-network-http"); @@ -1408,7 +1410,7 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-scsi-disk-vpd-build-error"); DO_TEST_CAPS_LATEST("controller-virtio-scsi"); DO_TEST_CAPS_LATEST("disk-sata-device"); - DO_TEST_CAPS_VER("disk-aio", "2.12.0"); + DO_TEST_CAPS_VER("disk-aio", "4.1.0"); DO_TEST_CAPS_LATEST("disk-aio"); DO_TEST_CAPS_LATEST("disk-aio-io_uring"); DO_TEST_CAPS_VER("disk-source-pool", "4.1.0"); @@ -1416,11 +1418,11 @@ mymain(void) DO_TEST_CAPS_VER("disk-source-pool-mode", "4.1.0"); DO_TEST_CAPS_LATEST("disk-source-pool-mode"); DO_TEST_CAPS_LATEST("disk-ioeventfd"); - DO_TEST_CAPS_VER("disk-copy_on_read", "2.12.0"); + DO_TEST_CAPS_VER("disk-copy_on_read", "4.1.0"); DO_TEST_CAPS_LATEST("disk-copy_on_read"); DO_TEST_CAPS_VER("disk-discard", "4.1.0"); DO_TEST_CAPS_LATEST("disk-discard"); - DO_TEST_CAPS_VER("disk-detect-zeroes", "2.12.0"); + DO_TEST_CAPS_VER("disk-detect-zeroes", "4.1.0"); DO_TEST_CAPS_LATEST("disk-detect-zeroes"); DO_TEST_CAPS_LATEST("disk-snapshot"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-same-targets"); @@ -1436,9 +1438,9 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-ide-incompatible-address"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-sata-incompatible-address"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-scsi-incompatible-address"); - DO_TEST_CAPS_VER("disk-backing-chains-index", "2.12.0"); + DO_TEST_CAPS_VER("disk-backing-chains-index", "4.1.0"); DO_TEST_CAPS_LATEST("disk-backing-chains-index"); - DO_TEST_CAPS_VER("disk-backing-chains-noindex", "2.12.0"); + DO_TEST_CAPS_VER("disk-backing-chains-noindex", "4.1.0"); DO_TEST_CAPS_LATEST("disk-backing-chains-noindex"); DO_TEST_CAPS_LATEST("disk-slices"); @@ -1465,7 +1467,7 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-geometry"); DO_TEST_CAPS_LATEST("disk-blockio"); - DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "2.12.0"); + DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "4.1.0"); DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "5.2.0"); DO_TEST_CAPS_LATEST("disk-virtio-scsi-reservations"); -- 2.34.1
On a Monday in 2022, Peter Krempa wrote:
Originally when I started working on '-blockdev' support I added version locked variants of all the relevant disk tests locked to qemu-2.12, but blockdev was finally enabled with qemu-4.2.
This patch bumps all of the test cases
Upcoming patches will be removing support for qemu-2.12, but '-blockdev' is used only with qemu-4.2 and later.
You can drop this.
This patch adds variants locked to qemu-4.1 for all the disk tests that have a variant for 2.11 (with a slight exception of the 'disk-error-policy-s390x' case locked to qemu-4.0 as we don't have qemu-4.1 caps for s390x).
Signed-off-by: Peter Krempa <pkrempa@redhat.com> ---
Jano
Upcoming patches will remove support for qemu-2.12. Since tests of 'sev' use hacked data we need to use our capability dump of qemu-6.0 as it has the required fields. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- ...ev-missing-platform-info.x86_64-6.0.0.args | 37 +++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + 2 files changed, 38 insertions(+) create mode 100644 tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-6.0.0.args diff --git a/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-6.0.0.args b/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-6.0.0.args new file mode 100644 index 0000000000..5dfaf69063 --- /dev/null +++ b/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-6.0.0.args @@ -0,0 +1,37 @@ +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-x86_64 \ +-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-i440fx-6.0,usb=off,dump-guest-core=off,confidential-guest-support=lsec0,memory-backend=pc.ram \ +-accel kvm \ +-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":"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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-object '{"qom-type":"sev-guest","id":"lsec0","cbitpos":47,"reduced-phys-bits":1,"policy":1,"dh-cert-file":"/tmp/lib/domain--1-QEMUGuest1/dh_cert.base64","session-file":"/tmp/lib/domain--1-QEMUGuest1/session.base64"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 04f0eb2f3f..9c5c394e03 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -3358,6 +3358,7 @@ mymain(void) DO_TEST_CAPS_VER("launch-security-sev", "2.12.0"); DO_TEST_CAPS_VER("launch-security-sev", "6.0.0"); DO_TEST_CAPS_VER("launch-security-sev-missing-platform-info", "2.12.0"); + DO_TEST_CAPS_VER("launch-security-sev-missing-platform-info", "6.0.0"); DO_TEST_CAPS_ARCH_LATEST_FULL("launch-security-sev-direct", "x86_64", ARG_QEMU_CAPS, -- 2.34.1
On a Monday in 2022, Peter Krempa wrote:
Peter Krempa (5): qemu: command: Inline qemuBuildDiskFrontendAttributeErrorPolicy qemuxml2argvtest: Add pre-blockdev post-werror-move version of 'disk-error-policy' qemuxml2argvtest: Update disk test cases having 'device_id' argument of SCSI disk qemuxml2argvtest: Bump versioned test variants for pre-blockdev disk tests to 4.1.0 qemuxml2argvtest: Add newer variant of 'launch-security-sev-missing-platform-info'
src/qemu/qemu_command.c | 29 ++++------ ...2.12.0.args => disk-aio.x86_64-4.1.0.args} | 4 +-
[...]
...rgs => floppy-drive-fat.x86_64-4.1.0.args} | 4 +- ...ev-missing-platform-info.x86_64-6.0.0.args | 37 +++++++++++++ tests/qemuxml2argvtest.c | 53 +++++++++++-------- 31 files changed, 278 insertions(+), 86 deletions(-) rename tests/qemuxml2argvdata/{disk-aio.x86_64-2.12.0.args => disk-aio.x86_64-4.1.0.args} (94%) delete mode 120000 tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args
[...] Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
participants (2)
-
Ján Tomko -
Peter Krempa