Commit e0a59749 authored by Thomas Huth's avatar Thomas Huth Committed by Kevin Wolf
Browse files

iotests: Fix test 200 on s390x without virtio-pci 



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: default avatarThomas Huth <thuth@redhat.com>
Reviewed-by: default avatarJohn Snow <jsnow@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent d61d1a1f

tests/qemu-iotests/200

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