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(-) -- 2.30.2