From 079305296204384775d3f138061c5b458ee67859 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Wed, 17 Jun 2020 15:42:54 +0200 Subject: [PATCH] qemuxml2argvtest: hostdev-scsi-virtio-scsi: Modernize to qemu-4.1 Modernize the current state to the pre-blockdev version of qemu to minimize changes. Later patch will add a 'latest' case too. Additionally this removes duplicated call of the same test. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- ...ostdev-scsi-virtio-scsi.x86_64-4.1.0.args} | 21 ++++++++++++------- tests/qemuxml2argvtest.c | 7 +------ 2 files changed, 14 insertions(+), 14 deletions(-) rename tests/qemuxml2argvdata/{hostdev-scsi-virtio-scsi.args => hostdev-scsi-virtio-scsi.x86_64-4.1.0.args} (59%) diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args similarity index 59% rename from tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.args rename to tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args index 364c4a10a5..e74fd1118c 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args @@ -8,27 +8,32 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ --name QEMUGuest2 \ +-name guest=QEMUGuest2,debug-threads=on \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-object secret,id=masterKey0,format=raw,\ +file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ +-machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \ -m 214 \ --realtime mlock=off \ +-overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest2/monitor.sock,\ -server,nowait \ +-chardev socket,id=charmonitor,fd=1729,server,nowait \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ -no-shutdown \ -no-acpi \ --device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ --usb \ +-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/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \ -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -drive file=/dev/sg0,if=none,format=raw,id=drive-hostdev0 \ -device scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=8,\ drive=drive-hostdev0,id=hostdev0 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ +resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 3cef0616a5..9d877d7d2b 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2659,16 +2659,11 @@ mymain(void) DO_TEST_CAPS_VER("hostdev-scsi-lsi", "2.8.0"); DO_TEST_CAPS_VER("hostdev-scsi-lsi", "4.1.0"); DO_TEST_CAPS_LATEST("hostdev-scsi-lsi"); + DO_TEST_CAPS_VER("hostdev-scsi-virtio-scsi", "4.1.0"); - DO_TEST("hostdev-scsi-virtio-scsi", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_SCSI_LSI); DO_TEST("hostdev-scsi-readonly", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI); - DO_TEST("hostdev-scsi-virtio-scsi", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_SCSI_LSI); DO_TEST("hostdev-scsi-virtio-iscsi", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI);