75 lines
3.9 KiB
Diff
75 lines
3.9 KiB
Diff
|
From 8b3125e03d0b20987e1b0a963c24d38cb382f99c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jared Rossi <jrossi@linux.ibm.com>
|
||
|
|
Date: Sat, 19 Oct 2024 21:29:53 -0400
|
||
|
|
Subject: [PATCH 21/38] tests/qtest: Add s390x boot order tests to cdrom-test.c
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
RH-Author: Thomas Huth <thuth@redhat.com>
|
||
|
|
RH-MergeRequest: 278: Full boot order support for s390x [Centos 10]
|
||
|
|
RH-Jira: RHEL-58153
|
||
|
|
RH-Acked-by: Cédric Le Goater <clg@redhat.com>
|
||
|
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||
|
|
RH-Commit: [20/23] 1e79fbbd76e5bbf933fadda82dabf95fb60ead8c (thuth/qemu-kvm-cs9)
|
||
|
|
|
||
|
|
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>
|
||
|
|
(cherry picked from commit f5aa2d9d4c6480fa73b89c935050afe57e5d8bd9)
|
||
|
|
---
|
||
|
|
tests/qtest/cdrom-test.c | 24 ++++++++++++++++++++++++
|
||
|
|
1 file changed, 24 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/tests/qtest/cdrom-test.c b/tests/qtest/cdrom-test.c
|
||
|
|
index 5d89e62515..ecba648144 100644
|
||
|
|
--- a/tests/qtest/cdrom-test.c
|
||
|
|
+++ b/tests/qtest/cdrom-test.c
|
||
|
|
@@ -206,6 +206,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 "
|
||
|
|
--
|
||
|
|
2.39.3
|
||
|
|
|