From: Jared Rossi <jrossi@linux.ibm.com>
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>
---
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 9d72b24e4b..123c067589 100644
--- a/tests/qtest/cdrom-test.c
+++ b/tests/qtest/cdrom-test.c
@@ -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 virtio-blk,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.45.1On 08/10/2024 03.15, jrossi@linux.ibm.com wrote:
> From: Jared Rossi <jrossi@linux.ibm.com>
>
> 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>
> ---
> 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 9d72b24e4b..123c067589 100644
> --- a/tests/qtest/cdrom-test.c
> +++ b/tests/qtest/cdrom-test.c
> @@ -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 virtio-blk,drive=d8,bootindex=8 "
> + "-drive if=none,id=d8,media=cdrom,file=", test_cdboot);
Could you please use a scsi-hd for the good device here in the second test,
too? ... so we make sure that the good drive detection also works with
virtio-scsi devices and not only with virtio-blk devices.
Thanks,
Thomas
On 10/9/24 8:48 AM, Thomas Huth wrote:
> On 08/10/2024 03.15, jrossi@linux.ibm.com wrote:
>> From: Jared Rossi <jrossi@linux.ibm.com>
>>
>> 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>
>> ---
>> 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 9d72b24e4b..123c067589 100644
>> --- a/tests/qtest/cdrom-test.c
>> +++ b/tests/qtest/cdrom-test.c
>> @@ -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 virtio-blk,drive=d8,bootindex=8 "
>> + "-drive if=none,id=d8,media=cdrom,file=",
>> test_cdboot);
>
> Could you please use a scsi-hd for the good device here in the second
> test, too? ... so we make sure that the good drive detection also
> works with virtio-scsi devices and not only with virtio-blk devices.
>
> Thanks,
> Thomas
>
Do you mean use "scsi-cd" instead?
Jared
On 10/10/2024 03.37, Jared Rossi wrote:
>
>
> On 10/9/24 8:48 AM, Thomas Huth wrote:
>> On 08/10/2024 03.15, jrossi@linux.ibm.com wrote:
>>> From: Jared Rossi <jrossi@linux.ibm.com>
>>>
>>> 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>
>>> ---
>>> 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 9d72b24e4b..123c067589 100644
>>> --- a/tests/qtest/cdrom-test.c
>>> +++ b/tests/qtest/cdrom-test.c
>>> @@ -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 virtio-blk,drive=d8,bootindex=8 "
>>> + "-drive if=none,id=d8,media=cdrom,file=",
>>> test_cdboot);
>>
>> Could you please use a scsi-hd for the good device here in the second
>> test, too? ... so we make sure that the good drive detection also works
>> with virtio-scsi devices and not only with virtio-blk devices.
>>
>> Thanks,
>> Thomas
>>
>
> Do you mean use "scsi-cd" instead?
Oh, right, sorry for the confusion!
Thomas
© 2016 - 2024 Red Hat, Inc.