diff options
| author | Laurent Vivier <laurent@vivier.eu> | 2021-03-23 16:53:05 +0000 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2021-03-24 14:25:48 +0000 |
| commit | 22329f0d2963515e031584d21a03d3585b19cbf9 (patch) | |
| tree | 636197636af2350c65198bb50d4476593ac76c49 /tests/qemu-iotests/051 | |
| parent | 9db1d3a2be9bfeb5ef3459a636e7545bf8f9b81b (diff) | |
| download | qemu-22329f0d2963515e031584d21a03d3585b19cbf9.zip qemu-22329f0d2963515e031584d21a03d3585b19cbf9.tar.gz qemu-22329f0d2963515e031584d21a03d3585b19cbf9.tar.bz2 | |
iotests: Revert "iotests: use -ccw on s390x for 040, 139, and 182"
Commit f1d5516ab583 introduces a test in some iotests to check if
the machine is a s390-ccw-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 and remove get_virtio_scsi_device().
This also enables virtio-mmio devices (virtio-*-device)
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Message-Id: <20210319202335.2397060-5-laurent@vivier.eu>
Message-Id: <20210323165308.15244-20-alex.bennee@linaro.org>
Diffstat (limited to 'tests/qemu-iotests/051')
| -rwxr-xr-x | tests/qemu-iotests/051 | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051 index f92161d..333cc81 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 === |