[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-block] [PATCH v2 2/3] iotests: use -ccw on s390x for 051
From: |
David Hildenbrand |
Subject: |
Re: [Qemu-block] [PATCH v2 2/3] iotests: use -ccw on s390x for 051 |
Date: |
Wed, 13 Sep 2017 13:57:48 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 |
On 13.09.2017 11:10, Cornelia Huck wrote:
> 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.
>
> Signed-off-by: Cornelia Huck <address@hidden>
> ---
> tests/qemu-iotests/051 | 12 +++++++++++-
> tests/qemu-iotests/051.out | 2 +-
> tests/qemu-iotests/051.pc.out | 2 +-
> 3 files changed, 13 insertions(+), 3 deletions(-)
>
> diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051
> index c8cfc764bc..dba8816c9f 100755
> --- a/tests/qemu-iotests/051
> +++ b/tests/qemu-iotests/051
> @@ -103,7 +103,17 @@ echo
> echo === Device without drive ===
> echo
>
> -run_qemu -device virtio-scsi-pci -device scsi-hd
> +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/"
>
> echo
> echo === Overriding backing file ===
> diff --git a/tests/qemu-iotests/051.out b/tests/qemu-iotests/051.out
> index 4d3b1ff316..e3c6eaba57 100644
> --- a/tests/qemu-iotests/051.out
> +++ b/tests/qemu-iotests/051.out
> @@ -49,7 +49,7 @@ QEMU_PROG: -drive
> file=TEST_DIR/t.qcow2,driver=qcow2,format=qcow2: Cannot specif
>
> === Device without drive ===
>
> -Testing: -device virtio-scsi-pci -device scsi-hd
> +Testing: -device VIRTIO_SCSI -device scsi-hd
> QEMU X.Y.Z monitor - type 'help' for more information
> (qemu) QEMU_PROG: -device scsi-hd: drive property not set
>
> diff --git a/tests/qemu-iotests/051.pc.out b/tests/qemu-iotests/051.pc.out
> index 76d7205460..ae7801b44b 100644
> --- a/tests/qemu-iotests/051.pc.out
> +++ b/tests/qemu-iotests/051.pc.out
> @@ -49,7 +49,7 @@ QEMU_PROG: -drive
> file=TEST_DIR/t.qcow2,driver=qcow2,format=qcow2: Cannot specif
>
> === Device without drive ===
>
> -Testing: -device virtio-scsi-pci -device scsi-hd
> +Testing: -device VIRTIO_SCSI -device scsi-hd
> QEMU X.Y.Z monitor - type 'help' for more information
> (qemu) QEMU_PROG: -device scsi-hd: drive property not set
>
>
Reviewed-by: David Hildenbrand <address@hidden>
--
Thanks,
David
- [Qemu-block] [PATCH v2 0/3] iotests: cure s390x failures by switching to ccw/aliases, Cornelia Huck, 2017/09/13
- [Qemu-block] [PATCH v2 1/3] iotests: use -ccw on s390x for 040, 139, and 182, Cornelia Huck, 2017/09/13
- [Qemu-block] [PATCH v2 2/3] iotests: use -ccw on s390x for 051, Cornelia Huck, 2017/09/13
- [Qemu-block] [PATCH v2 3/3] iotests: use virtio aliases for 067, Cornelia Huck, 2017/09/13
- Re: [Qemu-block] [PATCH v2 0/3] iotests: cure s390x failures by switching to ccw/aliases, QingFeng Hao, 2017/09/15
- Re: [Qemu-block] [PATCH v2 0/3] iotests: cure s390x failures by switching to ccw/aliases, Kevin Wolf, 2017/09/15