From patchwork Tue Feb 9 13:15:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Silbe X-Patchwork-Id: 8261921 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9E4D79F4DD for ; Tue, 9 Feb 2016 13:28:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 10B7620268 for ; Tue, 9 Feb 2016 13:28:23 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5D16C20263 for ; Tue, 9 Feb 2016 13:28:22 +0000 (UTC) Received: from localhost ([::1]:56014 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aT8L7-0005vm-OR for patchwork-qemu-devel@patchwork.kernel.org; Tue, 09 Feb 2016 08:28:21 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40031) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aT8J6-0002Ns-6l for qemu-devel@nongnu.org; Tue, 09 Feb 2016 08:26:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aT8J1-0005nt-Ke for qemu-devel@nongnu.org; Tue, 09 Feb 2016 08:26:16 -0500 Received: from e06smtp15.uk.ibm.com ([195.75.94.111]:59823) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aT8J1-0005na-9z for qemu-devel@nongnu.org; Tue, 09 Feb 2016 08:26:11 -0500 Received: from localhost by e06smtp15.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 9 Feb 2016 13:26:09 -0000 Received: from d06dlp03.portsmouth.uk.ibm.com (9.149.20.15) by e06smtp15.uk.ibm.com (192.168.101.145) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 9 Feb 2016 13:26:05 -0000 X-IBM-Helo: d06dlp03.portsmouth.uk.ibm.com X-IBM-MailFrom: silbe@linux.vnet.ibm.com X-IBM-RcptTo: qemu-block@nongnu.org;qemu-devel@nongnu.org Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by d06dlp03.portsmouth.uk.ibm.com (Postfix) with ESMTP id 9A4621B0805F; Tue, 9 Feb 2016 13:26:18 +0000 (GMT) Received: from d06av04.portsmouth.uk.ibm.com (d06av04.portsmouth.uk.ibm.com [9.149.37.216]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u19DQ5mn66322606; Tue, 9 Feb 2016 13:26:05 GMT Received: from d06av04.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av04.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u19DOOE0003036; Tue, 9 Feb 2016 06:26:04 -0700 Received: from s38lp35.boeblingen.de.ibm.com (dyn-9-152-222-58.boeblingen.de.ibm.com [9.152.222.58]) by d06av04.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id u19DG1Wb010128; Tue, 9 Feb 2016 06:16:03 -0700 From: Sascha Silbe To: qemu-devel@nongnu.org, Alexander Graf , Kevin Wolf , qemu-block@nongnu.org Date: Tue, 9 Feb 2016 14:15:13 +0100 Message-Id: <1455023713-104799-4-git-send-email-silbe@linux.vnet.ibm.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1455023713-104799-1-git-send-email-silbe@linux.vnet.ibm.com> References: <1455023713-104799-1-git-send-email-silbe@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16020913-0021-0000-0000-000020186CB9 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 195.75.94.111 Cc: Tu Bo Subject: [Qemu-devel] [PATCH 3/3] qemu-iotests: 140: use virtio-scsi instead of IDE 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP IDE is only implemented by very few architectures (mostly PC). Use virtio-scsi instead so the test works on all architectures that support virtio. In particular, this fixes qemu-iotests on s390x. Fixes: 16dee418 ("iotests: Add test for eject under NBD server") Signed-off-by: Sascha Silbe --- tests/qemu-iotests/140 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/140 b/tests/qemu-iotests/140 index f78c317..0c448e6 100755 --- a/tests/qemu-iotests/140 +++ b/tests/qemu-iotests/140 @@ -49,8 +49,8 @@ _make_test_img 64k $QEMU_IO -c 'write -P 42 0 64k' "$TEST_IMG" | _filter_qemu_io keep_stderr=y \ -_launch_qemu -drive if=ide,media=cdrom,id=drv,file="$TEST_IMG",format=$IMGFMT \ - 2> >(_filter_nbd) +_launch_qemu -drive if=none,media=cdrom,id=drv,file="$TEST_IMG",format=$IMGFMT \ + -device virtio-scsi -device scsi-cd,drive=drv 2> >(_filter_nbd) _send_qemu_cmd $QEMU_HANDLE \ "{ 'execute': 'qmp_capabilities' }" \