Commit 75f02ed5 authored by Cornelia Huck's avatar Cornelia Huck Committed by Kevin Wolf
Browse files

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: default avatarCornelia Huck <cohuck@redhat.com>
Reviewed-by: default avatarQingFeng Hao <haoqf@linux.vnet.ibm.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent f1d5516a

tests/qemu-iotests/051

+11 −1
Original line number Diff line number Diff line
@@ -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 ===

tests/qemu-iotests/051.out

+1 −1
Original line number Diff line number Diff line
@@ -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

tests/qemu-iotests/051.pc.out

+1 −1
Original line number Diff line number Diff line
@@ -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