[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/12] iotests: Always use -machine accel=qtest
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 11/12] iotests: Always use -machine accel=qtest |
Date: |
Fri, 11 Nov 2016 17:55:10 +0100 |
From: Max Reitz <address@hidden>
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 <address@hidden>
Message-id: address@hidden
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Max Reitz <address@hidden>
---
tests/qemu-iotests/common | 2 +-
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
"address@hidden" \
- >"${fifo_out}"
\
- 2>&1 \
- <"${fifo_in}" &
+ ${QEMU} -nographic -serial none ${comm} "address@hidden"
>"${fifo_out}" \
+ 2>&1 \
+ <"${fifo_in}" &
elif [ "$keep_stderr" = "y" ]; then
QEMU_NEED_PID='y'\
- ${QEMU} -nographic -serial none ${comm} -machine accel=qtest
"address@hidden" \
- >"${fifo_out}"
\
- <"${fifo_in}" &
+ ${QEMU} -nographic -serial none ${comm} "address@hidden"
>"${fifo_out}" \
+ <"${fifo_in}" &
else
exit 1
fi
--
1.8.3.1
- [Qemu-devel] [PULL 00/12] Block layer patches for 2.8.0-rc0, Kevin Wolf, 2016/11/11
- [Qemu-devel] [PULL 01/12] block/nbd: Fix the leaked visitor, Kevin Wolf, 2016/11/11
- [Qemu-devel] [PULL 02/12] block/ssh: Code cleanup for unused parameter, Kevin Wolf, 2016/11/11
- [Qemu-devel] [PULL 03/12] hmp: Make block_stream set an explicit job ID, Kevin Wolf, 2016/11/11
- [Qemu-devel] [PULL 04/12] raw_bsd: move check to prevent overflow, Kevin Wolf, 2016/11/11
- [Qemu-devel] [PULL 05/12] raw_bsd: don't check size alignment when only offset is set, Kevin Wolf, 2016/11/11
- [Qemu-devel] [PULL 06/12] qcow2: Remove stale FIXME comment, Kevin Wolf, 2016/11/11
- [Qemu-devel] [PULL 07/12] nfs: Fix memory leak in nfs_file_create(), Kevin Wolf, 2016/11/11
- [Qemu-devel] [PULL 08/12] block: Fix bdrv_iterate_format() sorting, Kevin Wolf, 2016/11/11
- [Qemu-devel] [PULL 09/12] block: Emit modules in bdrv_iterate_format(), Kevin Wolf, 2016/11/11
- [Qemu-devel] [PULL 11/12] iotests: Always use -machine accel=qtest,
Kevin Wolf <=
- [Qemu-devel] [PULL 10/12] iotests: Skip test 162 if there is no SSH support, Kevin Wolf, 2016/11/11
- [Qemu-devel] [PULL 12/12] raw-posix: Rename 'raw_s' to 'rs', Kevin Wolf, 2016/11/11