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

[QingFeng Hao <haoqf@linux.vnet.ibm.com>]

在 2017/9/5 23:16, 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 <cohuck@redhat.com>
> ---
>   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 ===
Regarding the new output file, I have a doubt that why there is no 
change on "check"
script where the result check is located:
if diff -w "$reference" $tmp.out >/dev/null 2>&1
Thanks!
> diff --git a/tests/qemu-iotests/051.s390-ccw-virtio.out b/tests/qemu-iotests/051.s390-ccw-virtio.out
> new file mode 100644
> index 0000000000..7555f0b73e
> --- /dev/null
> +++ b/tests/qemu-iotests/051.s390-ccw-virtio.out
[...]

-- 
Regards
QingFeng Hao