[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 1/9] iotests: Fix test 200 on s390x without virtio-pc
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 1/9] iotests: Fix test 200 on s390x without virtio-pci |
Date: |
Tue, 2 Apr 2019 14:48:59 +0200 |
From: Thomas Huth <address@hidden>
virtio-pci is optional on s390x, e.g. in downstream RHEL builds, it
is disabled. On s390x, virtio-ccw should be used instead. Other tests
like 051 or 240 already use virtio-scsi-ccw instead of virtio-scsi-pci
on s390x, so let's do the same here and always use virtio-scsi-ccw on
s390x.
Signed-off-by: Thomas Huth <address@hidden>
Reviewed-by: John Snow <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
tests/qemu-iotests/200 | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/tests/qemu-iotests/200 b/tests/qemu-iotests/200
index 12d25f4a1c..1c0f8cafc2 100755
--- a/tests/qemu-iotests/200
+++ b/tests/qemu-iotests/200
@@ -52,13 +52,21 @@ ${QEMU_IMG} create -f $IMGFMT -F $IMGFMT "${TEST_IMG}" -b
"${BACKING_IMG}" 512M
${QEMU_IO} -c "write -P 0xa5 512 300M" "${BACKING_IMG}" | _filter_qemu_io
+case "$QEMU_DEFAULT_MACHINE" in
+ s390-ccw-virtio)
+ virtio_scsi="-device virtio-scsi-ccw,id=scsi0,iothread=iothread0"
+ ;;
+ *)
+ virtio_scsi="-device pci-bridge,id=bridge1,chassis_nr=1,bus=pci.0
+ -device
virtio-scsi-pci,bus=bridge1,addr=0x1f,id=scsi0,iothread=iothread0"
+ ;;
+esac
+
echo
echo === Starting QEMU VM ===
echo
qemu_comm_method="qmp"
-_launch_qemu -device pci-bridge,id=bridge1,chassis_nr=1,bus=pci.0 \
- -object iothread,id=iothread0 \
- -device
virtio-scsi-pci,bus=bridge1,addr=0x1f,id=scsi0,iothread=iothread0 \
+_launch_qemu -object iothread,id=iothread0 $virtio_scsi \
-drive
file="${TEST_IMG}",media=disk,if=none,cache=$CACHEMODE,id=drive_sysdisk,format=$IMGFMT
\
-device
scsi-hd,drive=drive_sysdisk,bus=scsi0.0,id=sysdisk,bootindex=0
h1=$QEMU_HANDLE
--
2.20.1
- [Qemu-block] [PULL 0/9] Block layer patches, Kevin Wolf, 2019/04/02
- [Qemu-block] [PULL 1/9] iotests: Fix test 200 on s390x without virtio-pci,
Kevin Wolf <=
- [Qemu-block] [PULL 2/9] qemu-img: Enable BDRV_REQ_MAY_UNMAP in convert, Kevin Wolf, 2019/04/02
- [Qemu-block] [PULL 5/9] block/file-posix: do not fail on unlock bytes, Kevin Wolf, 2019/04/02
- [Qemu-block] [PULL 3/9] block/gluster: limit the transfer size to 512 MiB, Kevin Wolf, 2019/04/02
- [Qemu-block] [PULL 6/9] block: continue until base is found in bdrv_freeze_backing_chain() et al, Kevin Wolf, 2019/04/02
- [Qemu-block] [PULL 8/9] block: test block-stream with a base node that is used by block-commit, Kevin Wolf, 2019/04/02
- [Qemu-block] [PULL 7/9] block: freeze the backing chain earlier in stream_start(), Kevin Wolf, 2019/04/02
- [Qemu-block] [PULL 4/9] tests/qemu-iotests: Remove redundant COPYING file, Kevin Wolf, 2019/04/02
- [Qemu-block] [PULL 9/9] tests/qemu-iotests/235: Allow fallback to tcg, Kevin Wolf, 2019/04/02
- Re: [Qemu-block] [PULL 0/9] Block layer patches, Peter Maydell, 2019/04/02