diff options
| author | Max Reitz <mreitz@redhat.com> | 2016-10-17 20:39:17 +0200 |
|---|---|---|
| committer | Max Reitz <mreitz@redhat.com> | 2016-11-11 15:56:22 +0100 |
| commit | 3bb8ef4b7aafe9de0b93a4d6ba2843b11acbefe4 (patch) | |
| tree | a6527fe15b6f9c8038da50969e0a91330dff12fa /tests | |
| parent | eaed090735ac0dbcaad6d39074da6607f2f81b8a (diff) | |
| download | qemu-3bb8ef4b7aafe9de0b93a4d6ba2843b11acbefe4.zip qemu-3bb8ef4b7aafe9de0b93a4d6ba2843b11acbefe4.tar.gz qemu-3bb8ef4b7aafe9de0b93a4d6ba2843b11acbefe4.tar.bz2 | |
iotests: Always use -machine accel=qtest
Currently, we only use -machine accel=qtest when qemu is invoked through
the common.qemu functions. However, we always want to use it, so move it
from common.qemu directly into QEMU_OPTIONS.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20161017183917.8837-1-mreitz@redhat.com
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/qemu-iotests/common | 2 | ||||
| -rw-r--r-- | tests/qemu-iotests/common.qemu | 12 |
2 files changed, 6 insertions, 8 deletions
diff --git a/tests/qemu-iotests/common b/tests/qemu-iotests/common index d60ea2c..b6274be 100644 --- a/tests/qemu-iotests/common +++ b/tests/qemu-iotests/common @@ -51,7 +51,7 @@ export IMGOPTS="" export CACHEMODE="writeback" export QEMU_IO_OPTIONS="" export CACHEMODE_IS_DEFAULT=true -export QEMU_OPTIONS="-nodefaults" +export QEMU_OPTIONS="-nodefaults -machine accel=qtest" export VALGRIND_QEMU= export IMGKEYSECRET= export IMGOPTSSYNTAX=false diff --git a/tests/qemu-iotests/common.qemu b/tests/qemu-iotests/common.qemu index 2548a87..e657361 100644 --- a/tests/qemu-iotests/common.qemu +++ b/tests/qemu-iotests/common.qemu @@ -155,15 +155,13 @@ function _launch_qemu() if [ -z "$keep_stderr" ]; then QEMU_NEED_PID='y'\ - ${QEMU} -nographic -serial none ${comm} -machine accel=qtest "${@}" \ - >"${fifo_out}" \ - 2>&1 \ - <"${fifo_in}" & + ${QEMU} -nographic -serial none ${comm} "${@}" >"${fifo_out}" \ + 2>&1 \ + <"${fifo_in}" & elif [ "$keep_stderr" = "y" ]; then QEMU_NEED_PID='y'\ - ${QEMU} -nographic -serial none ${comm} -machine accel=qtest "${@}" \ - >"${fifo_out}" \ - <"${fifo_in}" & + ${QEMU} -nographic -serial none ${comm} "${@}" >"${fifo_out}" \ + <"${fifo_in}" & else exit 1 fi |