From nobody Tue May 7 02:44:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553669103939676.0672080960093; Tue, 26 Mar 2019 23:45:03 -0700 (PDT) Received: from localhost ([127.0.0.1]:42835 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h92J2-0000jd-Tn for importer@patchew.org; Wed, 27 Mar 2019 02:45:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59900) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h92I3-0008EY-ND for qemu-devel@nongnu.org; Wed, 27 Mar 2019 02:44:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h92I2-0006bD-Mw for qemu-devel@nongnu.org; Wed, 27 Mar 2019 02:43:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57884) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h92I0-0006Z3-KT; Wed, 27 Mar 2019 02:43:56 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D58353007C32; Wed, 27 Mar 2019 06:43:55 +0000 (UTC) Received: from thuth.com (ovpn-116-90.ams2.redhat.com [10.36.116.90]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7B94760F89; Wed, 27 Mar 2019 06:43:52 +0000 (UTC) From: Thomas Huth To: Kevin Wolf , Max Reitz , qemu-devel@nongnu.org Date: Wed, 27 Mar 2019 07:43:49 +0100 Message-Id: <1553669029-11429-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Wed, 27 Mar 2019 06:43:55 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] iotests: Fix test 200 on s390x without virtio-pci X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-s390x@nongnu.org, John Snow , qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" virtio-pci is optional on s390x, e.g. in downstream RHEL builds, it is disabled. On s390x, virtio-ccw should be used instead. Other tests like 051 or 240 already use virtio-scsi-ccw instead of virtio-scsi-pci on s390x, so let's do the same here and always use virtio-scsi-ccw on s390x. Signed-off-by: Thomas Huth Reviewed-by: John Snow --- tests/qemu-iotests/200 | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/tests/qemu-iotests/200 b/tests/qemu-iotests/200 index 12d25f4..1c0f8ca 100755 --- a/tests/qemu-iotests/200 +++ b/tests/qemu-iotests/200 @@ -52,13 +52,21 @@ ${QEMU_IMG} create -f $IMGFMT -F $IMGFMT "${TEST_IMG}" = -b "${BACKING_IMG}" 512M =20 ${QEMU_IO} -c "write -P 0xa5 512 300M" "${BACKING_IMG}" | _filter_qemu_io =20 +case "$QEMU_DEFAULT_MACHINE" in + s390-ccw-virtio) + virtio_scsi=3D"-device virtio-scsi-ccw,id=3Dscsi0,iothread=3Diothrea= d0" + ;; + *) + virtio_scsi=3D"-device pci-bridge,id=3Dbridge1,chassis_nr=3D1,bus=3D= pci.0 + -device virtio-scsi-pci,bus=3Dbridge1,addr=3D0x1f,id=3Dscsi0,iot= hread=3Diothread0" + ;; +esac + echo echo =3D=3D=3D Starting QEMU VM =3D=3D=3D echo qemu_comm_method=3D"qmp" -_launch_qemu -device pci-bridge,id=3Dbridge1,chassis_nr=3D1,bus=3Dpci.0 \ - -object iothread,id=3Diothread0 \ - -device virtio-scsi-pci,bus=3Dbridge1,addr=3D0x1f,id=3Dscsi0,= iothread=3Diothread0 \ +_launch_qemu -object iothread,id=3Diothread0 $virtio_scsi \ -drive file=3D"${TEST_IMG}",media=3Ddisk,if=3Dnone,cache=3D$C= ACHEMODE,id=3Ddrive_sysdisk,format=3D$IMGFMT \ -device scsi-hd,drive=3Ddrive_sysdisk,bus=3Dscsi0.0,id=3Dsysd= isk,bootindex=3D0 h1=3D$QEMU_HANDLE --=20 1.8.3.1