diff options
| author | Cornelia Huck <cohuck@redhat.com> | 2017-09-13 11:10:37 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2017-09-26 14:46:23 +0200 |
| commit | 75f02ed53a0dd7fff641de5c73566ee9abe4cf94 (patch) | |
| tree | 07e4bd8f9f7e8009382c51e54258077de55b0f3d | |
| parent | f1d5516ab583130157852fe475f96fd7cce227c3 (diff) | |
| download | qemu-75f02ed53a0dd7fff641de5c73566ee9abe4cf94.zip qemu-75f02ed53a0dd7fff641de5c73566ee9abe4cf94.tar.gz qemu-75f02ed53a0dd7fff641de5c73566ee9abe4cf94.tar.bz2 | |
iotests: use -ccw on s390x for 051
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 <cohuck@redhat.com>
Reviewed-by: QingFeng Hao <haoqf@linux.vnet.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rwxr-xr-x | tests/qemu-iotests/051 | 12 | ||||
| -rw-r--r-- | tests/qemu-iotests/051.out | 2 | ||||
| -rw-r--r-- | 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 c8cfc76..dba8816 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 4d3b1ff..e3c6eab 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 762fb9f..f2c5622 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 |