openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Peter Krempa 2020-06-17 15:42:54 +02:00
parent 4f6f930c76
commit 0793052962
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.args → tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args
View File

@ -8,27 +8,32 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
QEMU_AUDIO_DRV=none \ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \ /usr/bin/qemu-system-i386 \
-name QEMUGuest2 \ -name guest=QEMUGuest2,debug-threads=on \
-S \ -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 \ -m 214 \
-realtime mlock=off \ -overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \ -smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
-display none \ -display none \
-no-user-config \ -no-user-config \
-nodefaults \ -nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest2/monitor.sock,\ -chardev socket,id=charmonitor,fd=1729,server,nowait \
server,nowait \
-mon chardev=charmonitor,id=monitor,mode=control \ -mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \ -rtc base=utc \
-no-shutdown \ -no-shutdown \
-no-acpi \ -no-acpi \
-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ -boot strict=on \
-usb \ -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 \ -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 \ -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 \ -drive file=/dev/sg0,if=none,format=raw,id=drive-hostdev0 \
-device scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=8,\ -device scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=8,\
drive=drive-hostdev0,id=hostdev0 \ 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

7
tests/qemuxml2argvtest.c
View File

@ -2659,16 +2659,11 @@ mymain(void)
DO_TEST_CAPS_VER("hostdev-scsi-lsi", "2.8.0"); DO_TEST_CAPS_VER("hostdev-scsi-lsi", "2.8.0");
DO_TEST_CAPS_VER("hostdev-scsi-lsi", "4.1.0"); DO_TEST_CAPS_VER("hostdev-scsi-lsi", "4.1.0");
DO_TEST_CAPS_LATEST("hostdev-scsi-lsi"); 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", DO_TEST("hostdev-scsi-readonly",
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_VIRTIO_SCSI,
QEMU_CAPS_SCSI_LSI); QEMU_CAPS_SCSI_LSI);
DO_TEST("hostdev-scsi-virtio-scsi",
QEMU_CAPS_VIRTIO_SCSI,
QEMU_CAPS_SCSI_LSI);
DO_TEST("hostdev-scsi-virtio-iscsi", DO_TEST("hostdev-scsi-virtio-iscsi",
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_VIRTIO_SCSI,
QEMU_CAPS_SCSI_LSI); QEMU_CAPS_SCSI_LSI);