From nobody Tue Feb 10 13:33:59 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1616107290; cv=none; d=zohomail.com; s=zohoarc; b=ln9wegvnDPlu31uP5c19gYdorTf2khNWk5MizP9gmWIDFYxjnVBSPihX8ijTPfrADFpTJRDCzBPL9JUYcy3/YCndXGugsIXrm/NF9vhqdIK6S960M4Tyc5JVAbLeinryN9QB0DMT4nKH2hAxBpj5wPW/r+CoFVmQ/bovKetg174= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616107290; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=mjNNMRrk72Sx40BQc6g1k+/vKg3Zuc3NzBkzbscdD28=; b=cmQc7zIh+oQa5kIMjIk2aHY5fEkRVksoXLqX1h7s3IurGy0afsLXWmJKKU8PaBMB8WndKGnq+17XAzMWKgRIt1wHNgkQ4U11/CWxxHXN4gWtmtWGx1CPk5gepvAvgK+ke0HXtpWzH/pWbqJ0X0qnwP8ZjkEqUHJY+vKjfNtVelE= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1616107290990204.27103601816168; Thu, 18 Mar 2021 15:41:30 -0700 (PDT) Received: from localhost ([::1]:42460 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lN1Kb-0005mk-UD for importer@patchew.org; Thu, 18 Mar 2021 18:41:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47558) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lN1Ij-00042U-2n; Thu, 18 Mar 2021 18:39:33 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:45899) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lN1Ic-00040I-OI; Thu, 18 Mar 2021 18:39:32 -0400 Received: from localhost.localdomain ([82.142.20.38]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1M7sUE-1lI3DP14bK-004zRh; Thu, 18 Mar 2021 23:39:21 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PATCH 4/4] iotests: iothreads need ioeventfd Date: Thu, 18 Mar 2021 23:39:07 +0100 Message-Id: <20210318223907.1344870-5-laurent@vivier.eu> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210318223907.1344870-1-laurent@vivier.eu> References: <20210318223907.1344870-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:bbzX22WuGK9O0KmZrBF4uHkALslmTyPsZ0L/3E1OKGJ6KXO+heg n0GBFmKD8ER2YD4392WSZy8mMEFypBlgJoKuL2RpBpXo+GYhP/TINHFeYKBZaAUqe0Hplsy 4vmxsJtL6L7XfJB5dNik1Mdpne3eKv0uLnFmpRJyWfRjITAWs/K4fK3/hudixNdDrelRnck zYOe6FLZFV2OsbVKLqNhQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:ejs4NeCSYM8=:di9A+qBtT9OloN2rr0dS1+ rlLjgeC3taUpSmo6EYO89tH0jbBksvUoY4onB4nIQ3OTqmkCS/o6hzKN4lEswkQ3VMaTW1LEx JwAozKH6ty2L6p+S8LGxfd2W+mYg13aqSz6x8YtT8zWLfiMZApA6y1+YSIRI2Ono1+jgds2Zs 9lzppsrBGb9T2zeZgABo0kTO/wCepogNzygq+ITK0KfAqo+jrG6MPdNrO1eoxzqQOaXItcWN/ iQbzz/QSp5b3/8b1m1MGc21n/DYJ/Ax5F241pvIfxvGk/nBJAgyQmO3lm1F2bRMPLsJBmtY8o zJe/uErRZbObsrhWIrumq/AM4DrUS3AY3Y8xDN61Na+l/wI+GWsYSLFkoIf6Z54ot47ymHUjA bpYXH0Vjg1kcUdoML7vEYc4oF1QmTZbhQbyjKrSm5mBiuFDqWS0q9R8i+sstk4DLJQOqu3vRm 4uB4G7LduA== Received-SPF: pass (zohomail.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; Received-SPF: none client-ip=212.227.126.134; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Peter Maydell , Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , qemu-block@nongnu.org, Cornelia Huck , Markus Armbruster , Max Reitz , qemu-s390x@nongnu.org, Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" And ioeventfd are only available with virtio-scsi-pci, so don't use the ali= as and add a rule to require virtio-scsi-pci for the tests that use iothreads. Signed-off-by: Laurent Vivier --- tests/qemu-iotests/127 | 4 ++-- tests/qemu-iotests/256 | 2 ++ tests/qemu-iotests/iotests.py | 5 +++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/127 b/tests/qemu-iotests/127 index 98e8e82a8210..a3693533685a 100755 --- a/tests/qemu-iotests/127 +++ b/tests/qemu-iotests/127 @@ -44,7 +44,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto file fuse =20 -_require_devices virtio-scsi scsi-hd +_require_devices virtio-scsi-pci scsi-hd =20 IMG_SIZE=3D64K =20 @@ -62,7 +62,7 @@ $QEMU_IO -c 'write 0 42' "$TEST_IMG.overlay0" | _filter_q= emu_io _launch_qemu \ -object iothread,id=3Diothr \ -blockdev node-name=3Dsource,driver=3D$IMGFMT,file.driver=3Dfile,file.= filename=3D"$TEST_IMG.overlay0" \ - -device virtio-scsi,id=3Dscsi-bus,iothread=3Diothr \ + -device virtio-scsi-pci,id=3Dscsi-bus,iothread=3Diothr \ -device scsi-hd,bus=3Dscsi-bus.0,drive=3Dsource =20 _send_qemu_cmd $QEMU_HANDLE \ diff --git a/tests/qemu-iotests/256 b/tests/qemu-iotests/256 index 8d82a1dd865f..eb3af0dea80c 100755 --- a/tests/qemu-iotests/256 +++ b/tests/qemu-iotests/256 @@ -24,6 +24,8 @@ import os import iotests from iotests import log =20 +iotests._verify_virtio_scsi_pci() + iotests.script_initialize(supported_fmts=3D['qcow2']) size =3D 64 * 1024 * 1024 =20 diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 1e9e6a066e90..3404ed534bb5 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -1146,6 +1146,11 @@ def _verify_virtio_blk() -> None: if 'virtio-blk' not in out: notrun('Missing virtio-blk in QEMU binary') =20 +def _verify_virtio_scsi_pci() -> None: + out =3D qemu_pipe('-M', 'none', '-device', 'help') + if 'virtio-scsi-pci' not in out: + notrun('Missing virtio-scsi-pci in QEMU binary') + =20 def supports_quorum(): return 'quorum' in qemu_img_pipe('--help') --=20 2.30.2