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

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

It's already a pain to have two separate output files for 051, let's try
to avoid adding a third one. Even more so since I think that the split
between 051.out and 051.pc.out was already made for s390, so I'm not
sure if anyone would actually still make use of the plain 051.out
output if s390 got it's own one.

> 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

The only real difference between 051.out and 051.s390-ccw-virtio.out is
in this one command line. So if we don't want to just skip this part of
the test for non-pc like we already skip ther parts, we generally solve
this kind of thing by just filtering out strings that differ between
setups.

For example:

    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/"

Kevin