Re: [Qemu-block] [PATCH 3/3] iotests: use -ccw on s390x for 067

[Kevin Wolf]

Am 05.09.2017 um 17:16 hat Cornelia Huck geschrieben:
> 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 

The same argument as for patch 2 applies here, except that 067 has a
single output file so far, so keeping it this way is even more
important. You can again just filter the output.

Kevin

[Qemu-block] [PATCH 3/3] iotests: use -ccw on s390x for 067

[Cornelia Huck]

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 
---
 tests/qemu-iotests/067 |  11 +-
 tests/qemu-iotests/067.s390-ccw-virtio.out | 458 +
 2 files changed, 468 insertions(+), 1 deletion(-)
 create mode 100644 tests/qemu-iotests/067.s390-ccw-virtio.out

diff --git a/tests/qemu-iotests/067 b/tests/qemu-iotests/067
index 5d4ca4bc61..c5db04fb50 100755
--- a/tests/qemu-iotests/067
+++ b/tests/qemu-iotests/067
@@ -37,6 +37,15 @@ _supported_os Linux
 # Because anything other than 16 would change the output of query-block
 _unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
 
+case "$QEMU_DEFAULT_MACHINE" in
+  s390-ccw-virtio)
+  hba=virtio-scsi-ccw
+  ;;
+  *)
+  hba=virtio-scsi-pci
+  ;;
+esac
+
 function do_run_qemu()
 {
 echo Testing: "$@"
@@ -141,7 +150,7 @@ echo
 echo === Empty drive with -device and device_del ===
 echo
 
-run_qemu -device virtio-scsi-pci -device scsi-cd,id=cd0 <