From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59067) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGi85-0003VS-I7 for qemu-devel@nongnu.org; Thu, 29 Jan 2015 00:59:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YGi7x-00086w-Ux for qemu-devel@nongnu.org; Thu, 29 Jan 2015 00:59:01 -0500 Received: from e28smtp09.in.ibm.com ([122.248.162.9]:53233) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGi7w-00086C-I9 for qemu-devel@nongnu.org; Thu, 29 Jan 2015 00:58:53 -0500 Received: from /spool/local by e28smtp09.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 29 Jan 2015 11:28:48 +0530 Received: from d28relay02.in.ibm.com (d28relay02.in.ibm.com [9.184.220.59]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id F28B03940061 for ; Thu, 29 Jan 2015 11:28:44 +0530 (IST) Received: from d28av04.in.ibm.com (d28av04.in.ibm.com [9.184.220.66]) by d28relay02.in.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t0T5wg0a61145306 for ; Thu, 29 Jan 2015 11:28:42 +0530 Received: from d28av04.in.ibm.com (localhost [127.0.0.1]) by d28av04.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t0T5wgPT026334 for ; Thu, 29 Jan 2015 11:28:42 +0530 Received: from chenxg-ThinkPad-T440p.cn.ibm.com (chenxg-thinkpad-t440p.cn.ibm.com [9.115.114.109] (may be forged)) by d28av04.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id t0T5wd6c025879 for ; Thu, 29 Jan 2015 11:28:41 +0530 From: Xiao Guang Chen Date: Thu, 29 Jan 2015 13:58:35 +0800 Message-Id: <1422511118-13049-4-git-send-email-chenxg@linux.vnet.ibm.com> In-Reply-To: <1422511118-13049-1-git-send-email-chenxg@linux.vnet.ibm.com> References: <1422511118-13049-1-git-send-email-chenxg@linux.vnet.ibm.com> Subject: [Qemu-devel] [-prfix=PATCH v2 RFC 3/6] qemu-iotests: run qemu with -nodefaults List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org From: Mao Chuan Li 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 Signed-off-by: Mao Chuan Li --- 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 9e12bec..f3fa6dd 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 73e25da..3025921 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 ee7ebb4..ea27536 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 "${@}" 2>&1 \ + ${QEMU} -nographic -serial none ${comm} -machine accel=qtest "${@}" 2>&1 \ >"${fifo_out}" \ <"${fifo_in}" & QEMU_PID[${_QEMU_HANDLE}]=$! -- 1.9.1