From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55323) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpUpm-0001lH-Bt for qemu-devel@nongnu.org; Wed, 06 Sep 2017 03:33:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dpUpl-00077P-EV for qemu-devel@nongnu.org; Wed, 06 Sep 2017 03:33:14 -0400 Date: Wed, 6 Sep 2017 09:32:59 +0200 From: Cornelia Huck Message-ID: <20170906093259.44beab37.cohuck@redhat.com> In-Reply-To: <21f52be4-164c-ea1b-4d6e-802ea423d2a9@linux.vnet.ibm.com> References: <20170905151614.31303-1-cohuck@redhat.com> <20170905151614.31303-3-cohuck@redhat.com> <21f52be4-164c-ea1b-4d6e-802ea423d2a9@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 2/3] iotests: use -ccw on s390x for 051 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QingFeng Hao Cc: kwolf@redhat.com, mreitz@redhat.com, qemu-block@nongnu.org, qemu-devel@nongnu.org, borntraeger@de.ibm.com, agraf@suse.de, thuth@redhat.com, david@redhat.com, Yi Min Zhao , bjsdjshi@linux.vnet.ibm.com On Wed, 6 Sep 2017 15:19:01 +0800 QingFeng Hao wrote: > =E5=9C=A8 2017/9/5 23:16, Cornelia Huck =E5=86=99=E9=81=93: > > 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/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 =3D=3D=3D Device without drive =3D=3D=3D > > 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 =3D=3D=3D Overriding backing file =3D=3D=3D =20 > Regarding the new output file, I have a doubt that why there is no=20 > change on "check" > script where the result check is located: > if diff -w "$reference" $tmp.out >/dev/null 2>&1 The right output reference should be picked as of commit e166b4148208656635ea2fe39df8b1e875a34fb8 Author: Bo Tu Date: Fri Jul 3 15:28:46 2015 +0800 qemu-iotests: qemu machine type support =20 This patch adds qemu machine type support to the io test suite. Based on the qemu default machine type and alias of the default machine type the reference output file can now vary from the default to a machine specific output file if necessary. When using a machine specific reference file if the default machine has an alias then use the alias a= s the output file name otherwise use the default machine name as the output file nam= e. =20 Reviewed-by: Max Reitz Reviewed-by: Michael Mueller Reviewed-by: Sascha Silbe Signed-off-by: Xiao Guang Chen Signed-off-by: Kevin Wolf