tests: Add capabilities for QEMU 4.0.0 on s390x

In addition adjusting iothreads-virtio-scsi-ccw.s390x-latest.args to prevent
accidential drive id exposure by QEMU fixed by commit a1dce96236
(qemu: Use the 'device_id' property of SCSI disks to avoid regressing),
and also adjusting *s390x-latest.args files to qemu deprecation changes made
in commit e8c2c8bd07 (Prefer '-overcommit mem-lock' over -realtime mlock').

Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
This commit is contained in:
Boris Fiuczynski 2019-05-03 10:47:00 +02:00 committed by Andrea Bolognani
parent 9fb14f75b3
commit fb6c1f16c5
7 changed files with 24415 additions and 7 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-machine s390-ccw,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 \
-object iothread,id=iothread1 \
-object iothread,id=iothread2 \
@ -32,8 +32,8 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-device virtio-blk-ccw,iothread=iothread1,scsi=off,devno=fe.0.0000,\
drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
-drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-scsi0-0-2-0 \
-device scsi-hd,bus=scsi0.0,channel=0,scsi-id=2,lun=0,drive=drive-scsi0-0-2-0,\
id=scsi0-0-2-0 \
-device scsi-hd,bus=scsi0.0,channel=0,scsi-id=2,lun=0,\
device_id=drive-scsi0-0-2-0,drive=drive-scsi0-0-2-0,id=scsi0-0-2-0 \
-device virtio-balloon-ccw,id=balloon0,devno=fe.0.000a \
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
resourcecontrol=deny \

View File

@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
file=/tmp/lib/domain--1-guest/master-key.aes \
-machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \
-m 4096 \
-realtime mlock=off \
-overcommit mem-lock=off \
-smp 4,sockets=4,cores=1,threads=1 \
-uuid a7ca230a-fbe0-48b8-8ea6-25836f8cbc32 \
-no-user-config \

View File

@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
file=/tmp/lib/domain--1-guest/master-key.aes \
-machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \
-m 1024 \
-realtime mlock=off \
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
-display none \

View File

@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-machine s390-ccw-virtio,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-9455-926a-d65c16db1809 \
-display none \

View File

@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-machine s390-ccw-virtio,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-9455-926a-d65c16db1809 \
-display none \