From 253ddf5a75a74369c2ba5fd6e5623d5917495a0a Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Mon, 28 Jan 2019 14:11:36 +0100 Subject: [PATCH] tests: qemuxml2argv: Use 1.5.3 version for the oldest case of 'disk-cache' Rather than testing random set of flags add a case also for the oldest supported qemu. Signed-off-by: Peter Krempa --- ...k-cache.args => disk-cache.x86_64-1.5.3.args} | 16 +++++++++------- tests/qemuxml2argvtest.c | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) rename tests/qemuxml2argvdata/{disk-cache.args => disk-cache.x86_64-1.5.3.args} (72%) diff --git a/tests/qemuxml2argvdata/disk-cache.args b/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args similarity index 72% rename from tests/qemuxml2argvdata/disk-cache.args rename to tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args index a136201ffd..288d0aa43c 100644 --- a/tests/qemuxml2argvdata/disk-cache.args +++ b/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args @@ -9,6 +9,7 @@ QEMU_AUDIO_DRV=none \ -S \ -machine pc-i440fx-2.6,accel=tcg,usb=off,dump-guest-core=off \ -m 214 \ +-realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ @@ -20,22 +21,23 @@ server,nowait \ -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=0x3 \ --usb \ -drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,\ cache=writeback \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,\ -bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-1,\ cache=unsafe \ --device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ +-device ide-hd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ -drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-scsi0-0-0,\ cache=none \ --device scsi-disk,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0 \ +-device scsi-hd,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0 \ -drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-virtio-disk0,\ cache=writethrough \ --device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ +-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ id=virtio-disk0 \ -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 +-device usb-storage,bus=usb.0,port=1,drive=drive-usb-disk1,id=usb-disk1,\ +removable=off diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 705327a046..d99b9acdc8 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1063,7 +1063,7 @@ mymain(void) DO_TEST("disk-error-policy", NONE); DO_TEST_CAPS_VER("disk-error-policy", "2.12.0"); DO_TEST_CAPS_LATEST("disk-error-policy"); - DO_TEST("disk-cache", QEMU_CAPS_SCSI_LSI, QEMU_CAPS_DEVICE_USB_STORAGE); + DO_TEST_CAPS_VER("disk-cache", "1.5.3"); DO_TEST_CAPS_VER("disk-cache", "2.6.0"); DO_TEST_CAPS_VER("disk-cache", "2.7.0"); DO_TEST_CAPS_VER("disk-cache", "2.12.0");