The default cpu model on s390x does not provide zPCI, which is
not yet wired up on tcg. Moreover, virtio-ccw is the standard
on s390x, so use the -ccw instead of the -pci versions of virtio
devices on s390x.
Provide an output file for s390x.
Signed-off-by: Cornelia Huck <address@hidden>
---
tests/qemu-iotests/051 | 9 +-
tests/qemu-iotests/051.s390-ccw-virtio.out | 434 +++++++++++++++++++++++++++++
2 files changed, 442 insertions(+), 1 deletion(-)
create mode 100644 tests/qemu-iotests/051.s390-ccw-virtio.out
diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051
index c8cfc764bc..f6ad0f4f0b 100755
--- a/tests/qemu-iotests/051
+++ b/tests/qemu-iotests/051
@@ -103,7 +103,14 @@ echo
echo === Device without drive ===
echo
-run_qemu -device virtio-scsi-pci -device scsi-hd
+case "$QEMU_DEFAULT_MACHINE" in
+ s390-ccw-virtio)
+ run_qemu -device virtio-scsi-ccw -device scsi-hd
+ ;;
+ *)
+ run_qemu -device virtio-scsi-pci -device scsi-hd
+ ;;
+esac
echo
echo === Overriding backing file ===