On Thu, 02/05 11:44, Xiao Guang Chen wrote:
> This patch fixes an io test suite issue that was introduced with the
> commit c88930a6866e74953e931ae749781e98e486e5c8 'qemu-char: Permit only
> a single "stdio" character device'. The option supresses the creation of
> default devices.
>
> Reviewed-by: Michael Mueller <m...@linux.vnet.ibm.com>
> Signed-off-by: Xiao Guang Chen <che...@linux.vnet.ibm.com>
> ---
> tests/qemu-iotests/common | 1 +
> tests/qemu-iotests/common.config | 2 +-
> tests/qemu-iotests/common.qemu | 2 +-
> 3 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/tests/qemu-iotests/common b/tests/qemu-iotests/common
> index 1e556bb..ed26d79 100644
> --- a/tests/qemu-iotests/common
> +++ b/tests/qemu-iotests/common
> @@ -51,6 +51,7 @@ export IMGOPTS=""
> export CACHEMODE="writeback"
> export QEMU_IO_OPTIONS=""
> export CACHEMODE_IS_DEFAULT=true
> +export QEMU_OPTIONS="-nodefaults"
>
> for r
> do
> diff --git a/tests/qemu-iotests/common.config
> b/tests/qemu-iotests/common.config
> index a1973ad..cff91e1 100644
> --- a/tests/qemu-iotests/common.config
> +++ b/tests/qemu-iotests/common.config
> @@ -103,7 +103,7 @@ if [ -z "$QEMU_NBD_PROG" ]; then
> export QEMU_NBD_PROG="`set_prog_path qemu-nbd`"
> fi
>
> -export QEMU=$QEMU_PROG
> +export QEMU="$QEMU_PROG $QEMU_OPTIONS"
> export QEMU_IMG=$QEMU_IMG_PROG
> export QEMU_IO="$QEMU_IO_PROG $QEMU_IO_OPTIONS"
> export QEMU_NBD=$QEMU_NBD_PROG
> diff --git a/tests/qemu-iotests/common.qemu b/tests/qemu-iotests/common.qemu
> index 8e618b5..e35a797 100644
> --- a/tests/qemu-iotests/common.qemu
> +++ b/tests/qemu-iotests/common.qemu
> @@ -153,7 +153,7 @@ function _launch_qemu()
> mkfifo "${fifo_out}"
> mkfifo "${fifo_in}"
>
> - "${QEMU}" -nographic -serial none ${comm} -machine accel=qtest "${@}" \
> + ${QEMU} -nographic -serial none ${comm} -machine accel=qtest "${@}" \
I believe the reason to quote ${QEMU} was allow paths containing whitespaces.
Why not leave the quotes unchanged and add $QEMU_OPTIONS here?
Fam
