Re: [PATCH for-5.2 v2 9/9] tests/qtest/cdrom: Add more s390x-related boot tests

[Cornelia Huck]

On Thu, 6 Aug 2020 13:58:47 +0200
Thomas Huth <thuth@redhat.com> wrote:

> On 06/08/2020 13.23, Cornelia Huck wrote:
> > On Thu,  6 Aug 2020 12:53:49 +0200
> > Thomas Huth <thuth@redhat.com> wrote:
> >   
> >> Let's add two new tests:
> >>
> >> 1) Booting with "bootindex" is the architected default behavior on the
> >> s390x target, so we should have at least one test that is using the
> >> "bootindex" property.
> >>
> >> 2) The s390-ccw bios used to fail when other unbootable devices have
> >> been specified before the bootable device (without "bootindex"). Now
> >> that the s390-ccw bios is a little bit smarter here, we should test
> >> this scenario, too, to avoid regressions.
> >>
> >> Signed-off-by: Thomas Huth <thuth@redhat.com>
> >> ---
> >>  tests/qtest/cdrom-test.c | 12 ++++++++++++
> >>  1 file changed, 12 insertions(+)
> >>
> >> diff --git a/tests/qtest/cdrom-test.c b/tests/qtest/cdrom-test.c
> >> index 833a0508a1..13e22f57c1 100644
> >> --- a/tests/qtest/cdrom-test.c
> >> +++ b/tests/qtest/cdrom-test.c
> >> @@ -163,6 +163,18 @@ static void add_s390x_tests(void)
> >>      qtest_add_data_func("cdrom/boot/virtio-scsi",
> >>                          "-device virtio-scsi -device scsi-cd,drive=cdr "
> >>                          "-blockdev file,node-name=cdr,filename=", 
> >> test_cdboot);
> >> +    qtest_add_data_func("cdrom/boot/with-bootindex",
> >> +                        "-device virtio-serial -device virtio-scsi "
> >> +                        "-device virtio-blk,drive=d1 "
> >> +                        "-drive 
> >> driver=null-co,read-zeroes=on,if=none,id=d1 "
> >> +                        "-device virtio-blk,drive=d2,bootindex=1 "
> >> +                        "-drive if=none,id=d2,media=cdrom,file=", 
> >> test_cdboot);
> >> +    qtest_add_data_func("cdrom/boot/without-bootindex",
> >> +                        "-device virtio-scsi -device virtio-serial "
> >> +                        "-device x-terminal3270 -device 
> >> virtio-blk,drive=d1 "  
> > 
> > Any special reason for that 3270 device here? Or just to add more
> > variety? :)  
> 
> Yes, there is a reason:
> 
>  https://lists.gnu.org/archive/html/qemu-devel/2019-03/msg07231.html
> 
> ... so this is a check that this does not happen again.

Ah, thanks for reminding me. Adding 3270 is a good idea.

Reviewed-by: Cornelia Huck <cohuck@redhat.com>