From patchwork Fri Mar 19 20:23:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1456009 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) 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 ozlabs.org (Postfix) with ESMTPS id 4F2Fk21rtNz9sSC for ; Sat, 20 Mar 2021 07:24:42 +1100 (AEDT) Received: from localhost ([::1]:40766 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lNLfk-0004p4-72 for incoming@patchwork.ozlabs.org; Fri, 19 Mar 2021 16:24:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47656) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lNLew-0004Yr-Sm; Fri, 19 Mar 2021 16:23:50 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:44901) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lNLer-0001Mp-Rk; Fri, 19 Mar 2021 16:23:50 -0400 Received: from localhost.localdomain ([82.142.20.38]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1M9nlN-1lHb273vU5-005oeQ; Fri, 19 Mar 2021 21:23:39 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PATCH v3 0/6] iotests: fix failures with non-PCI machines Date: Fri, 19 Mar 2021 21:23:29 +0100 Message-Id: <20210319202335.2397060-1-laurent@vivier.eu> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Provags-ID: V03:K1:fR8Wp/mSnRKfO8D1Epg7UNIeRvOjEPZboFaU3xXnjKhGL+QRk+p XCbTU4diAx362YPiht8YfwQByU+psxNkGgsPdLJKDLmbDrctI37ho5Bo0P4JsMHVb6+zc2j D2+gB+w/cAHCoTc48YOr2L85Q+IRR8jago1BdNN4kzK47GMFmWHnrUjN71475z5PXkIJO96 BybeJpTGNSSCPctUgoe0A== X-UI-Out-Filterresults: notjunk:1;V03:K0:4wBDq5HqDYY=:FACjS8HJdXpYEG4VZCV+E9 gqoq42cI0jiegqK7Z+mTGZtHIHiO10MKouc2+d/Q3PKhTldVg9Vl5QvUcdcbj6EU7t2TuRTOn fqX/AL4xKgGOK8i/xGr7f3hK6xURv5V4dzfOXbk3gk2kTIglXFCmaCFhDkHjdj8zj2/J5BzAP z6/68UdBIOBKsClEFo2P2cHXVgN2Jm4ctiPRzxFaq8iBdqa5PWRVdrfXhd/in6y3zpe4rF5NO ZUvP2HV++IjzQa7X1HLGWxDqf5y0DJemu6hBuxqxf081gQ6R+vrx2OY8jJmOo/0DIpzkD0AbV CJaL2hqltEbE7TeKPfUHBQzJHJLLPu6hIbCxoPLec4+efDkmWpUTQRzNSi3Mp2+QnHZPzBhSM uncASCdLc5nyahUyIC69NNPDGkGyKq/kl4YuKj1GNMaFolh/eEV7YHj7Os0ny5Zls9OgCXoVt HV+SeVn+PA== Received-SPF: none client-ip=212.227.126.135; 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, 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Tests are executed using virtio-*-pci even on a non PCI machine. The problem can be easily fixed using the virtio aliases (virtio-*), to run virtio-*-ccw on s390x and virtio-*-device on m68k. A first attempt was tried with virtio-*-ccw by detecting the machine type, this series removes it to use the aliases that are a cleaner approach. v3: Fix typos and comments Add _require_one_device_of() v2: Fix typos and comments Don't define QEMU_ARCH_NO_PCI but QEMU_ARCH_VIRTIO_PCI, QEMU_ARCH_VIRTIO_CCW and QEMU_ARCH_VIRTIO_MMIO Update test 127 and 256 to run with ccw Update .out of test 051 Add a patch to update "-drive if=virtio" Laurent Vivier (6): qdev: define list of archs with virtio-pci or virtio-ccw m68k: add the virtio devices aliases blockdev: with -drive if=virtio, use generic virtio-blk iotests: Revert "iotests: use -ccw on s390x for 040, 139, and 182" iotests: test m68k with the virt machine iotests: iothreads need ioeventfd include/sysemu/arch_init.h | 9 +++++ blockdev.c | 6 +--- softmmu/qdev-monitor.c | 65 ++++++++++++++++++++--------------- tests/qemu-iotests/040 | 2 +- tests/qemu-iotests/051 | 12 +------ tests/qemu-iotests/051.out | 2 +- tests/qemu-iotests/051.pc.out | 2 +- tests/qemu-iotests/068 | 4 +-- tests/qemu-iotests/093 | 3 +- tests/qemu-iotests/127 | 3 +- tests/qemu-iotests/139 | 9 ++--- tests/qemu-iotests/182 | 13 ++----- tests/qemu-iotests/238 | 4 +-- tests/qemu-iotests/240 | 10 +++--- tests/qemu-iotests/256 | 6 ++-- tests/qemu-iotests/257 | 4 +-- tests/qemu-iotests/307 | 4 +-- tests/qemu-iotests/common.rc | 13 +++++++ tests/qemu-iotests/iotests.py | 10 +++--- tests/qemu-iotests/testenv.py | 1 + 20 files changed, 91 insertions(+), 91 deletions(-)