summaryrefslogtreecommitdiffstats
path: root/tests/qemu-iotests/186
diff options
context:
space:
mode:
authorKevin Wolf2017-09-07 10:50:00 +0200
committerKevin Wolf2017-09-26 14:46:23 +0200
commit05b4cd5d3c20c9d7a75f0533b57b9c1c3d06e6e7 (patch)
treea32f988a8c5c6ca57b1ddcaea879e7bb8be65ca7 /tests/qemu-iotests/186
parentMerge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into sta... (diff)
downloadqemu-05b4cd5d3c20c9d7a75f0533b57b9c1c3d06e6e7.tar.gz
qemu-05b4cd5d3c20c9d7a75f0533b57b9c1c3d06e6e7.tar.xz
qemu-05b4cd5d3c20c9d7a75f0533b57b9c1c3d06e6e7.zip
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>
Diffstat (limited to 'tests/qemu-iotests/186')
-rwxr-xr-xtests/qemu-iotests/1866
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/qemu-iotests/186 b/tests/qemu-iotests/186
index 2b9f618f90..44cc01ed87 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
}