On 3/18/21 11:39 PM, Laurent Vivier wrote: > Commit f1d5516ab583 introduces a test in some iotests to check if > the machine is a s390-ssw-virtio and to select virtio-*-ccw rather > than virtio-*-pci. > > We don't need that because QEMU already provides aliases to use the correct > virtio interface according to the machine type. > > This patch removes all virtio-*-pci and virtio-*-ccw to use virtio-* > instead. > > Signed-off-by: Laurent Vivier <laur...@vivier.eu> > cc: Cornelia Huck <coh...@redhat.com> > --- > blockdev.c | 6 +----- > tests/qemu-iotests/040 | 2 +- > tests/qemu-iotests/051 | 12 +----------- > tests/qemu-iotests/068 | 4 +--- > tests/qemu-iotests/093 | 3 +-- > tests/qemu-iotests/139 | 9 ++------- > tests/qemu-iotests/182 | 13 ++----------- > tests/qemu-iotests/238 | 4 +--- > tests/qemu-iotests/240 | 10 +++++----- > tests/qemu-iotests/257 | 4 ++-- > tests/qemu-iotests/307 | 4 +--- > tests/qemu-iotests/iotests.py | 5 ----- > 12 files changed, 18 insertions(+), 58 deletions(-)
> diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051 > index 7cbd1415ce7b..00382cc55e25 100755 > --- a/tests/qemu-iotests/051 > +++ b/tests/qemu-iotests/051 > @@ -119,17 +119,7 @@ echo > echo === Device without drive === > echo > > -case "$QEMU_DEFAULT_MACHINE" in > - s390-ccw-virtio) > - virtio_scsi=virtio-scsi-ccw > - ;; > - *) > - virtio_scsi=virtio-scsi-pci > - ;; > -esac > - > -run_qemu -device $virtio_scsi -device scsi-hd | > - sed -e "s/$virtio_scsi/VIRTIO_SCSI/" > +run_qemu -device virtio-scsi -device scsi-hd > > echo > echo === Overriding backing file === This one failed (but the fix is trivial): 051 fail [05:49:47] [05:50:01] 13.3s output mismatch (see 051.out.bad) --- /builds/philmd/qemu2/tests/qemu-iotests/051.pc.out +++ 051.out.bad @@ -72,7 +72,7 @@ === Device without drive === -Testing: -device VIRTIO_SCSI -device scsi-hd +Testing: -device virtio-scsi -device scsi-hd QEMU X.Y.Z monitor - type 'help' for more information (qemu) QEMU_PROG: -device scsi-hd: drive property not set Failures: 051 Failed 1 of 56 iotests