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

[QingFeng Hao]

在 2017/9/6 15:32, Cornelia Huck 写道:
> On Wed, 6 Sep 2017 15:19:01 +0800
> QingFeng Hao <address@hidden> wrote:
>
> > 在 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 <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
> > >
> > > 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
Got it. It makes sense.
> The right output reference should be picked as of
>
> commit e166b4148208656635ea2fe39df8b1e875a34fb8
> Author: Bo Tu <address@hidden>
> Date:   Fri Jul 3 15:28:46 2015 +0800
>
>      qemu-iotests: qemu machine type support
>      
>      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 as 
> the output
>      file name otherwise use the default machine name as the output file name.
>      
>      Reviewed-by: Max Reitz <address@hidden>
>      Reviewed-by: Michael Mueller <address@hidden>
>      Reviewed-by: Sascha Silbe <address@hidden>
>      Signed-off-by: Xiao Guang Chen <address@hidden>
>      Signed-off-by: Kevin Wolf <address@hidden>

--
Regards
QingFeng Hao