diff options
Diffstat (limited to 'tests/qemu-iotests/200')
-rwxr-xr-x | tests/qemu-iotests/200 | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/tests/qemu-iotests/200 b/tests/qemu-iotests/200 index ddbdedc476..f66c571d24 100755 --- a/tests/qemu-iotests/200 +++ b/tests/qemu-iotests/200 @@ -1,4 +1,5 @@ -#!/bin/bash +#!/usr/bin/env bash +# group: rw # # Block job co-routine race condition test. # @@ -21,18 +22,18 @@ # # creator -owner=jcody@redhat.com +owner=codyprime@gmail.com seq=`basename $0` echo "QA output created by $seq" -here=`pwd` status=1 # failure is the default! _cleanup() { _cleanup_qemu - rm -f "${TEST_IMG}" "${BACKING_IMG}" + _rm_test_img "${TEST_IMG}" + _rm_test_img "${BACKING_IMG}" } trap "_cleanup; exit \$status" 0 1 2 3 15 @@ -42,25 +43,31 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common.qemu _supported_fmt qcow2 qed -_supported_proto file -_supported_os Linux +_supported_proto file fuse -BACKING_IMG="${TEST_DIR}/backing.img" -TEST_IMG="${TEST_DIR}/test.img" +BACKING_IMG="$TEST_IMG.base" -${QEMU_IMG} create -f $IMGFMT "${BACKING_IMG}" 512M | _filter_img_create -${QEMU_IMG} create -f $IMGFMT -F $IMGFMT "${TEST_IMG}" -b "${BACKING_IMG}" 512M | _filter_img_create +TEST_IMG="$BACKING_IMG" _make_test_img 512M +_make_test_img -F $IMGFMT -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 \ - -drive file="${TEST_IMG}",media=disk,if=none,cache=$CACHEMODE,id=drive_sysdisk,format=$IMGFMT \ +_launch_qemu -object iothread,id=iothread0 $virtio_scsi \ + -drive file="${TEST_IMG}",media=disk,if=none,cache=$CACHEMODE,aio=$AIOMODE,id=drive_sysdisk,format=$IMGFMT \ -device scsi-hd,drive=drive_sysdisk,bus=scsi0.0,id=sysdisk,bootindex=0 h1=$QEMU_HANDLE |