tests/qtest: Add s390x boot order tests to cdrom-test.c

Add two new qtests to verify that a valid IPL device can successfully boot after
failed IPL attempts from one or more invalid devices.

cdrom-test/as-fallback-device: Defines the primary boot target as a device that
is invalid for IPL and a second boot target that is valid for IPL. Ensures that
the valid device will be selected after the initial failed IPL.

cdrom-test/as-last-option: Defines the maximum number of boot devices (8)
where only the final entry in the boot order is valid. Ensures that a valid
device will be selected even after multiple failed IPL attempts from both
virtio-blk and virtio-scsi device types.

Signed-off-by: Jared Rossi <jrossi@linux.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20241020012953.1380075-20-jrossi@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Jared Rossi 2024-10-19 21:29:53 -04:00 committed by Thomas Huth
parent 0bd107138f
commit f5aa2d9d4c

View File

@ -213,6 +213,30 @@ static void add_s390x_tests(void)
"-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/as-fallback-device",
"-device virtio-serial -device virtio-scsi "
"-device virtio-blk,drive=d1,bootindex=1 "
"-drive driver=null-co,read-zeroes=on,if=none,id=d1 "
"-device virtio-blk,drive=d2,bootindex=2 "
"-drive if=none,id=d2,media=cdrom,file=", test_cdboot);
qtest_add_data_func("cdrom/boot/as-last-option",
"-device virtio-serial -device virtio-scsi "
"-device virtio-blk,drive=d1,bootindex=1 "
"-drive driver=null-co,read-zeroes=on,if=none,id=d1 "
"-device virtio-blk,drive=d2,bootindex=2 "
"-drive driver=null-co,read-zeroes=on,if=none,id=d2 "
"-device virtio-blk,drive=d3,bootindex=3 "
"-drive driver=null-co,read-zeroes=on,if=none,id=d3 "
"-device scsi-hd,drive=d4,bootindex=4 "
"-drive driver=null-co,read-zeroes=on,if=none,id=d4 "
"-device scsi-hd,drive=d5,bootindex=5 "
"-drive driver=null-co,read-zeroes=on,if=none,id=d5 "
"-device virtio-blk,drive=d6,bootindex=6 "
"-drive driver=null-co,read-zeroes=on,if=none,id=d6 "
"-device scsi-hd,drive=d7,bootindex=7 "
"-drive driver=null-co,read-zeroes=on,if=none,id=d7 "
"-device scsi-cd,drive=d8,bootindex=8 "
"-drive if=none,id=d8,media=cdrom,file=", test_cdboot);
if (qtest_has_device("x-terminal3270")) {
qtest_add_data_func("cdrom/boot/without-bootindex",
"-device virtio-scsi -device virtio-serial "