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>
This commit is contained in:
Stefan Hajnoczi 2017-06-15 17:38:12 +01:00 committed by Kevin Wolf
parent 79645e0569
commit 5aaf590df4
1 changed files with 6 additions and 1 deletions

View File

@ -53,15 +53,20 @@ _make_test_img $IMG_SIZE
case "$QEMU_DEFAULT_MACHINE" in case "$QEMU_DEFAULT_MACHINE" in
s390-ccw-virtio) s390-ccw-virtio)
platform_parm="-no-shutdown" platform_parm="-no-shutdown"
hba=virtio-scsi-ccw
;; ;;
*) *)
platform_parm="" platform_parm=""
hba=virtio-scsi-pci
;; ;;
esac esac
_qemu() _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 _filter_qemu | _filter_hmp
} }