From 94f8c8873f835131f9ada1943642c062f333ce79 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Mon, 14 Feb 2022 15:08:26 +0100 Subject: [PATCH] qemuxml2argvtest: Update disk test cases having 'device_id' argument of SCSI disk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The 'device_id' 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_id' 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 Reviewed-by: Ján Tomko --- ...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");