diff options
author | Kevin Wolf <kwolf@redhat.com> | 2017-09-07 10:50:00 +0200 |
---|---|---|
committer | Kevin Wolf <kwolf@redhat.com> | 2017-09-26 14:46:23 +0200 |
commit | 05b4cd5d3c20c9d7a75f0533b57b9c1c3d06e6e7 (patch) | |
tree | a32f988a8c5c6ca57b1ddcaea879e7bb8be65ca7 | |
parent | 1e3ee834083227f552179f6e43902cba5a866e6b (diff) | |
download | qemu-05b4cd5d3c20c9d7a75f0533b57b9c1c3d06e6e7.zip qemu-05b4cd5d3c20c9d7a75f0533b57b9c1c3d06e6e7.tar.gz qemu-05b4cd5d3c20c9d7a75f0533b57b9c1c3d06e6e7.tar.bz2 |
qemu-iotests: Add missing -machine accel=qtest
A basic set of qemu options is initialised in ./common:
export QEMU_OPTIONS="-nodefaults -machine accel=qtest"
However, two test cases (172 and 186) overwrite QEMU_OPTIONS and neglect
to manually set '-machine accel=qtest'. Add the missing option for 172.
186 probably only copied the code from 172, it doesn't actually need to
overwrite QEMU_OPTIONS, so remove that in 186.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Tested-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
-rwxr-xr-x | tests/qemu-iotests/172 | 2 | ||||
-rwxr-xr-x | tests/qemu-iotests/186 | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/qemu-iotests/172 b/tests/qemu-iotests/172 index 826d6fe..02c5f79 100755 --- a/tests/qemu-iotests/172 +++ b/tests/qemu-iotests/172 @@ -56,7 +56,7 @@ function do_run_qemu() done fi echo quit - ) | $QEMU -nographic -monitor stdio -serial none "$@" + ) | $QEMU -machine accel=qtest -nographic -monitor stdio -serial none "$@" echo } diff --git a/tests/qemu-iotests/186 b/tests/qemu-iotests/186 index 2b9f618..44cc01e 100755 --- a/tests/qemu-iotests/186 +++ b/tests/qemu-iotests/186 @@ -56,15 +56,15 @@ function do_run_qemu() done fi echo quit - ) | $QEMU -S -nodefaults -display none -device virtio-scsi-pci -monitor stdio "$@" 2>&1 + ) | $QEMU -S -display none -device virtio-scsi-pci -monitor stdio "$@" 2>&1 echo } function check_info_block() { echo "info block" | - QEMU_OPTIONS="" do_run_qemu "$@" | _filter_win32 | _filter_hmp | - _filter_qemu | _filter_generated_node_ids + do_run_qemu "$@" | _filter_win32 | _filter_hmp | _filter_qemu | + _filter_generated_node_ids } |