From patchwork Thu Apr 23 02:42:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Guang Chen X-Patchwork-Id: 463854 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id A283314007D for ; Thu, 23 Apr 2015 12:44:55 +1000 (AEST) Received: from localhost ([::1]:37813 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yl78H-0004Eb-Rq for incoming@patchwork.ozlabs.org; Wed, 22 Apr 2015 22:44:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41308) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yl763-0008JN-W1 for qemu-devel@nongnu.org; Wed, 22 Apr 2015 22:42:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yl75z-0001RB-Ps for qemu-devel@nongnu.org; Wed, 22 Apr 2015 22:42:35 -0400 Received: from e28smtp08.in.ibm.com ([122.248.162.8]:37361) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yl75y-0001Qk-U8 for qemu-devel@nongnu.org; Wed, 22 Apr 2015 22:42:31 -0400 Received: from /spool/local by e28smtp08.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 23 Apr 2015 08:12:29 +0530 Received: from d28dlp01.in.ibm.com (9.184.220.126) by e28smtp08.in.ibm.com (192.168.1.138) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 23 Apr 2015 08:12:26 +0530 Received: from d28relay01.in.ibm.com (d28relay01.in.ibm.com [9.184.220.58]) by d28dlp01.in.ibm.com (Postfix) with ESMTP id 4486DE004C for ; Thu, 23 Apr 2015 08:15:06 +0530 (IST) Received: from d28av05.in.ibm.com (d28av05.in.ibm.com [9.184.220.67]) by d28relay01.in.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t3N2gQLC2294134 for ; Thu, 23 Apr 2015 08:12:26 +0530 Received: from d28av05.in.ibm.com (localhost [127.0.0.1]) by d28av05.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t3N2gQfI024629 for ; Thu, 23 Apr 2015 08:12:26 +0530 Received: from chenxg-ThinkPad-T440p.cn.ibm.com (chenxg-thinkpad-t440p.cn.ibm.com [9.115.114.86]) by d28av05.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id t3N2gLov024436; Thu, 23 Apr 2015 08:12:25 +0530 From: Xiao Guang Chen To: qemu-devel@nongnu.org Date: Thu, 23 Apr 2015 10:42:13 +0800 Message-Id: <1429756938-17186-3-git-send-email-chenxg@linux.vnet.ibm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1429756938-17186-1-git-send-email-chenxg@linux.vnet.ibm.com> References: <1429756938-17186-1-git-send-email-chenxg@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15042302-0029-0000-0000-0000057D2850 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 122.248.162.8 Cc: kwolf@redhat.com, mreitz@redhat.com, armbru@redhat.com, mimu@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH RFC v7 2/7] qemu-iotests: run qemu with -nodefaults and fix 067, 071, 081 and 087 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 such as the floopy and cdrom. Output files for test case 067, 071, 081 and 087 need to be updated to accommodate this change. Use virtio-blk instead of virtio-blk-pci as the device driver for test case 067. For virtio-blk-pci is the same with virtio-blk as device driver but other platform such as s390 may not recognize the virtio-blk-pci. Reviewed-by: Max Reitz Reviewed-by: Michael Mueller Signed-off-by: Xiao Guang Chen --- tests/qemu-iotests/067 | 8 +- tests/qemu-iotests/067.out | 266 +-------------------------------------- tests/qemu-iotests/071.out | 4 - tests/qemu-iotests/081.out | 2 - tests/qemu-iotests/087.out | 12 -- tests/qemu-iotests/common | 1 + tests/qemu-iotests/common.config | 2 +- tests/qemu-iotests/common.qemu | 2 +- 8 files changed, 8 insertions(+), 289 deletions(-) diff --git a/tests/qemu-iotests/067 b/tests/qemu-iotests/067 index 83eefa3..3e9a053 100755 --- a/tests/qemu-iotests/067 +++ b/tests/qemu-iotests/067 @@ -59,7 +59,7 @@ echo echo === -drive/-device and device_del === echo -run_qemu -drive file=$TEST_IMG,format=$IMGFMT,if=none,id=disk -device virtio-blk-pci,drive=disk,id=virtio0 <"${fifo_out}" \ 2>&1 \ <"${fifo_in}" &