mbox series

[v3,0/6] iotests: fix failures with non-PCI machines

Message ID 20210319202335.2397060-1-laurent@vivier.eu
Headers show
Series iotests: fix failures with non-PCI machines | expand

Message

Laurent Vivier March 19, 2021, 8:23 p.m. UTC 
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(-)

Comments

Alex Bennée March 22, 2021, 5:50 p.m. UTC | #1 
Laurent Vivier <laurent@vivier.eu> writes:

> 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..

Queued to for-6.0/fixes-for-rc1, thanks.