[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 16/16] tests/qtest/cdrom: Add more s390x-related boot tests
From: |
Thomas Huth |
Subject: |
[PULL 16/16] tests/qtest/cdrom: Add more s390x-related boot tests |
Date: |
Tue, 6 Oct 2020 20:31:22 +0200 |
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.
Message-Id: <20200806105349.632-10-thuth@redhat.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Acked-by: Janosch Frank <frankja@linux.ibm.com>
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 e9afab693c..eef242dc80 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 "
+ "-drive driver=null-co,read-zeroes=on,if=none,id=d1 "
+ "-device virtio-blk,drive=d2 "
+ "-drive if=none,id=d2,media=cdrom,file=", test_cdboot);
}
int main(int argc, char **argv)
--
2.18.2
- [PULL 08/16] pc-bios/s390-ccw/main: Remove superfluous call to enable_subchannel(), (continued)
- [PULL 08/16] pc-bios/s390-ccw/main: Remove superfluous call to enable_subchannel(), Thomas Huth, 2020/10/06
- [PULL 06/16] pc-bios/s390-ccw: Scan through all devices if no boot device specified, Thomas Huth, 2020/10/06
- [PULL 09/16] pc-bios/s390-ccw: fix off-by-one error, Thomas Huth, 2020/10/06
- [PULL 12/16] pc-bios: s390x: Save PSW rework, Thomas Huth, 2020/10/06
- [PULL 07/16] pc-bios/s390-ccw: Allow booting in case the first virtio-blk disk is bad, Thomas Huth, 2020/10/06
- [PULL 05/16] pc-bios/s390-ccw: Do not bail out early if not finding a SCSI disk, Thomas Huth, 2020/10/06
- [PULL 13/16] pc-bios: s390x: Use reset PSW if avaliable, Thomas Huth, 2020/10/06
- [PULL 10/16] pc-bios/s390-ccw: break loop if a null block number is reached, Thomas Huth, 2020/10/06
- [PULL 14/16] pc-bios: s390x: Go into disabled wait when encountering a PGM exception, Thomas Huth, 2020/10/06
- [PULL 11/16] pc-bios: s390x: Fix bootmap.c zipl component entry data handling, Thomas Huth, 2020/10/06
- [PULL 16/16] tests/qtest/cdrom: Add more s390x-related boot tests,
Thomas Huth <=
- [PULL 15/16] pc-bios/s390: Update the s390-ccw bios binaries, Thomas Huth, 2020/10/06
- Re: [PULL 00/16] s390-ccw bios update, Christian Borntraeger, 2020/10/07
- Re: [PULL 00/16] s390-ccw bios update, Peter Maydell, 2020/10/08