| Message ID | 20161017183917.8837-1-mreitz@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 10/17/2016 01:39 PM, Max Reitz wrote: > 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> > --- > tests/qemu-iotests/common | 2 +- > tests/qemu-iotests/common.qemu | 12 +++++------- > 2 files changed, 6 insertions(+), 8 deletions(-) Reviewed-by: Eric Blake <eblake@redhat.com>
On 17.10.2016 20:39, Max Reitz wrote: > 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> > --- > tests/qemu-iotests/common | 2 +- > tests/qemu-iotests/common.qemu | 12 +++++------- > 2 files changed, 6 insertions(+), 8 deletions(-) Applied to my block tree. Max
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
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> --- tests/qemu-iotests/common | 2 +- tests/qemu-iotests/common.qemu | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-)