Commit 3bb8ef4b authored by Max Reitz's avatar Max Reitz
Browse files

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: default avatarMax Reitz <mreitz@redhat.com>
Message-id: 20161017183917.8837-1-mreitz@redhat.com
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent eaed0907

tests/qemu-iotests/common

+1 −1
Original line number Diff line number Diff line
@@ -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

tests/qemu-iotests/common.qemu

+5 −7
Original line number Diff line number Diff line
@@ -155,14 +155,12 @@ function _launch_qemu() 


    if [ -z "$keep_stderr" ]; then

        QEMU_NEED_PID='y'\

        ${QEMU} -nographic -serial none ${comm} -machine accel=qtest "${@}" \

                                                                >"${fifo_out}" \

        ${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}" \

        ${QEMU} -nographic -serial none ${comm} "${@}" >"${fifo_out}" \

                                                       <"${fifo_in}" &

    else

        exit 1