Re: [qemu-s390x] [RFC 05/15] s390-bios: Factor finding boot device out of virtio code path

[Christian Borntraeger]

On 07/10/2018 07:02 PM, Jason J. Herne wrote:
> On 07/10/2018 02:53 AM, Christian Borntraeger wrote:
>>
>> On 07/05/2018 07:25 PM, Jason J. Herne wrote:
>> [...]
>>> -    IPL_assert(found, "No virtio device found");
>> Can you also change the boot-serial testcase:
>>
>> this seems to work:
>>
>>
>> diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c
>> index 952a2e7ead..b03b55d182 100644
>> --- a/tests/boot-serial-test.c
>> +++ b/tests/boot-serial-test.c
>> @@ -96,7 +96,7 @@ static testdef_t tests[] = {
>>       { "sparc", "SS-4", "", "MB86904" },
>>       { "sparc", "SS-600MP", "", "TMS390Z55" },
>>       { "sparc64", "sun4u", "", "UltraSPARC" },
>> -    { "s390x", "s390-ccw-virtio", "", "virtio device" },
>> +    { "s390x", "s390-ccw-virtio", "", "device" },
>>       { "m68k", "mcf5208evb", "", "TT", sizeof(kernel_mcf5208), 
>> kernel_mcf5208 },
>>       { "microblaze", "petalogix-s3adsp1800", "", "TT",
>>         sizeof(kernel_pls3adsp1800), kernel_pls3adsp1800 },
>>
> 
> I'm confused. Does this patch mess up this test?

Yes your patch makes this test fail.

> I cannot seem to get it to run. make check reports that it is compiling it 
> but I never see it run.

It is run as part of the make check-qtest-s390x
The boot-serial test checks for "virtio device" as console output, which now 
fails as you have changed
the message.