[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/24] iotests: use -ccw on s390x for 051
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 06/24] iotests: use -ccw on s390x for 051 |
Date: |
Tue, 26 Sep 2017 16:21:15 +0200 |
From: Cornelia Huck <address@hidden>
The default cpu model on s390x does not provide zPCI, which is
not yet wired up on tcg. Moreover, virtio-ccw is the standard
on s390x, so use the -ccw instead of the -pci versions of virtio
devices on s390x.
Signed-off-by: Cornelia Huck <address@hidden>
Reviewed-by: QingFeng Hao <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
tests/qemu-iotests/051 | 12 +++++++++++-
tests/qemu-iotests/051.out | 2 +-
tests/qemu-iotests/051.pc.out | 2 +-
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051
index c8cfc764bc..dba8816c9f 100755
--- a/tests/qemu-iotests/051
+++ b/tests/qemu-iotests/051
@@ -103,7 +103,17 @@ echo
echo === Device without drive ===
echo
-run_qemu -device virtio-scsi-pci -device scsi-hd
+case "$QEMU_DEFAULT_MACHINE" in
+ s390-ccw-virtio)
+ virtio_scsi=virtio-scsi-ccw
+ ;;
+ *)
+ virtio_scsi=virtio-scsi-pci
+ ;;
+esac
+
+run_qemu -device $virtio_scsi -device scsi-hd |
+ sed -e "s/$virtio_scsi/VIRTIO_SCSI/"
echo
echo === Overriding backing file ===
diff --git a/tests/qemu-iotests/051.out b/tests/qemu-iotests/051.out
index 4d3b1ff316..e3c6eaba57 100644
--- a/tests/qemu-iotests/051.out
+++ b/tests/qemu-iotests/051.out
@@ -49,7 +49,7 @@ QEMU_PROG: -drive
file=TEST_DIR/t.qcow2,driver=qcow2,format=qcow2: Cannot specif
=== Device without drive ===
-Testing: -device virtio-scsi-pci -device scsi-hd
+Testing: -device VIRTIO_SCSI -device scsi-hd
QEMU X.Y.Z monitor - type 'help' for more information
(qemu) QEMU_PROG: -device scsi-hd: drive property not set
diff --git a/tests/qemu-iotests/051.pc.out b/tests/qemu-iotests/051.pc.out
index 762fb9f42c..f2c5622cee 100644
--- a/tests/qemu-iotests/051.pc.out
+++ b/tests/qemu-iotests/051.pc.out
@@ -49,7 +49,7 @@ QEMU_PROG: -drive
file=TEST_DIR/t.qcow2,driver=qcow2,format=qcow2: Cannot specif
=== Device without drive ===
-Testing: -device virtio-scsi-pci -device scsi-hd
+Testing: -device VIRTIO_SCSI -device scsi-hd
QEMU X.Y.Z monitor - type 'help' for more information
(qemu) QEMU_PROG: -device scsi-hd: drive property not set
--
2.13.5
- [Qemu-devel] [PULL 00/24] Block layer patches, Kevin Wolf, 2017/09/26
- [Qemu-devel] [PULL 01/24] qemu-iotests: Add missing -machine accel=qtest, Kevin Wolf, 2017/09/26
- [Qemu-devel] [PULL 02/24] qemu-img: Clarify about relative backing file options, Kevin Wolf, 2017/09/26
- [Qemu-devel] [PULL 06/24] iotests: use -ccw on s390x for 051,
Kevin Wolf <=
- [Qemu-devel] [PULL 08/24] iotests: Print full path of bad output if mismatch, Kevin Wolf, 2017/09/26
- [Qemu-devel] [PULL 05/24] iotests: use -ccw on s390x for 040, 139, and 182, Kevin Wolf, 2017/09/26
- [Qemu-devel] [PULL 03/24] file-posix: Clear out first sector in hdev_create, Kevin Wolf, 2017/09/26
- [Qemu-devel] [PULL 10/24] block/throttle-groups.c: allocate RestartData on the heap, Kevin Wolf, 2017/09/26
- [Qemu-devel] [PULL 13/24] block: Add reopen_queue to bdrv_child_perm(), Kevin Wolf, 2017/09/26
- [Qemu-devel] [PULL 12/24] qemu-io: Drop write permissions before read-only reopen, Kevin Wolf, 2017/09/26
- [Qemu-devel] [PULL 09/24] throttle: Assert that bkt->max is valid in throttle_compute_wait(), Kevin Wolf, 2017/09/26
- [Qemu-devel] [PULL 07/24] iotests: use virtio aliases for 067, Kevin Wolf, 2017/09/26