aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorStefan Hajnoczi <stefanha@redhat.com>2017-06-15 17:38:12 +0100
committerKevin Wolf <kwolf@redhat.com>2017-06-26 14:51:13 +0200
commit5aaf590df4b075c18cf6f27a51900a126deb8634 (patch)
treef06cee6d1a0afe566c472d7920f25a1c6b720cfb /tests
parent79645e0569e7a95f5c9bee67eb62b06daaed8099 (diff)
qemu-iotests: 068: use -drive/-device instead of -hda
The legacy -hda option does not support -drive/-device parameters. They will be required by the next patch that extends this test case. Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'tests')
-rwxr-xr-xtests/qemu-iotests/0687
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068
index 61936d5075..7292643fdc 100755
--- a/tests/qemu-iotests/068
+++ b/tests/qemu-iotests/068
@@ -53,15 +53,20 @@ _make_test_img $IMG_SIZE
case "$QEMU_DEFAULT_MACHINE" in
s390-ccw-virtio)
platform_parm="-no-shutdown"
+ hba=virtio-scsi-ccw
;;
*)
platform_parm=""
+ hba=virtio-scsi-pci
;;
esac
_qemu()
{
- $QEMU $platform_parm -nographic -monitor stdio -serial none -hda "$TEST_IMG" \
+ $QEMU $platform_parm -nographic -monitor stdio -serial none \
+ -drive if=none,id=drive0,file="$TEST_IMG",format="$IMGFMT" \
+ -device $hba,id=hba0 \
+ -device scsi-hd,drive=drive0 \
"$@" |\
_filter_qemu | _filter_hmp
}