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 <thuth@redhat.com>
---
 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 12d25f4..1c0f8ca 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
-- 
1.8.3.1

On 3/27/19 2:43 AM, Thomas Huth wrote:
> 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 <thuth@redhat.com>
> ---
>  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 12d25f4..1c0f8ca 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
> 

Nice, thank you :)

Reviewed-by: John Snow <jsnow@redhat.com>

Am 27.03.2019 um 07:43 hat Thomas Huth geschrieben:
> 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 <thuth@redhat.com>

Thanks, applied to the block branch.

Kevin