From patchwork Thu Mar 18 22:39:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 12149339 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C9941C433E0 for ; Thu, 18 Mar 2021 22:41:27 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5708664EED for ; Thu, 18 Mar 2021 22:41:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5708664EED Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:42460 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lN1KY-0005mk-C1 for qemu-devel@archiver.kernel.org; Thu, 18 Mar 2021 18:41:26 -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 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: 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_P=2E_Berrang=C3=A9?= , Eduardo Habkost , qemu-block@nongnu.org, Cornelia Huck , Markus Armbruster , Max Reitz , qemu-s390x@nongnu.org, Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Laurent Vivier Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" And ioeventfd are only available with virtio-scsi-pci, so don't use the alias 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 -_require_devices virtio-scsi scsi-hd +_require_devices virtio-scsi-pci scsi-hd IMG_SIZE=64K @@ -62,7 +62,7 @@ $QEMU_IO -c 'write 0 42' "$TEST_IMG.overlay0" | _filter_qemu_io _launch_qemu \ -object iothread,id=iothr \ -blockdev node-name=source,driver=$IMGFMT,file.driver=file,file.filename="$TEST_IMG.overlay0" \ - -device virtio-scsi,id=scsi-bus,iothread=iothr \ + -device virtio-scsi-pci,id=scsi-bus,iothread=iothr \ -device scsi-hd,bus=scsi-bus.0,drive=source _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 +iotests._verify_virtio_scsi_pci() + iotests.script_initialize(supported_fmts=['qcow2']) size = 64 * 1024 * 1024 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') +def _verify_virtio_scsi_pci() -> None: + out = qemu_pipe('-M', 'none', '-device', 'help') + if 'virtio-scsi-pci' not in out: + notrun('Missing virtio-scsi-pci in QEMU binary') + def supports_quorum(): return 'quorum' in qemu_img_pipe('--help')