From patchwork Fri Mar 19 13:25:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1455861 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 4F24VW2Twyz9sSC for ; Sat, 20 Mar 2021 00:29:07 +1100 (AEDT) Received: from localhost ([::1]:59950 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lNFBZ-0002YK-Bt for incoming@patchwork.ozlabs.org; Fri, 19 Mar 2021 09:29:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60734) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lNF8Q-0000K3-0e; Fri, 19 Mar 2021 09:25:50 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:38965) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lNF8O-0003fZ-71; Fri, 19 Mar 2021 09:25:49 -0400 Received: from localhost.localdomain ([82.142.20.38]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1N4hex-1lnG4o2KAx-011gjB; Fri, 19 Mar 2021 14:25:41 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PATCH v2 0/6] iotests: fix failures with non-PCI machines Date: Fri, 19 Mar 2021 14:25:31 +0100 Message-Id: <20210319132537.2046339-1-laurent@vivier.eu> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Provags-ID: V03:K1:PzW1L1sYVskSkc0isfni0Xv9K6bHteWLS8oGS04pQWU66XAAA/I qoGPJwtI57TSFjjasS9xW5k8gNzwJlWD0vdsx0i1vgj2+1zTW2pQehvYP/y+WhgayvSDZ4m g/RRisCd/Ur+Hlh+VZGJ/7KQg6ptNQuOqNesE/7qQ2ol2aLswp3dQweVALqcU51MZSCdfFn PuwFbgz1A9zAeSgLARwdw== X-UI-Out-Filterresults: notjunk:1;V03:K0:Vw8yU/Lpwc8=:IIauFs4a06FZFesBqk8Y8F Zp451PW4bQwLqNnpgdAI8Wjqqkj8UUVPv6wtVqI2khB04DuKX/OUSSZxm7YIn9dQC01o8ubbt DxQusC23n7dn4GYzsMaNbXxQk2aCFGBMGAaVHDXFrFJbfRZKCUUjOpk0aoH6Uc2dtpOtervzK G/OSZVIwUfADASAV97splVizOIwaoU374j/9tH2lIMDk55HDVXm0EXH7Jb0oQIUr9c7AA8O1j uTje/PEu8nGtzQGpcMTDFmzlGzSKg7Ccmj6Rikp6SGS+V1lBakVjSad7/REe71TyuUyELUZWp MncilQzkFjvcm+fTX3xaf9lN4zZNNpZLrwBnBETT4BRk5R45zFaRh7gGI49UszOQynYok3PH2 muhgWQiJ2NiSSwC/yPNlbWSy/vDC1sPC2WGKVHN5XBqzTuqMW/WDjl9WOapYQAzUAFAqmyOMB rnwi8d9fTg== Received-SPF: none client-ip=212.227.126.130; 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. 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 | 8 +++++ 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/iotests.py | 10 +++--- tests/qemu-iotests/testenv.py | 1 + 19 files changed, 77 insertions(+), 91 deletions(-)