Re: [PATCH v2 6/7] tests/qtest: Add s390x virtio net PCI test to pxe-test.c

[Matthew Rosato <mjrosato@linux.ibm.com>]

On 9/3/26 12:24 PM, Zhuoying Cai wrote:
> Add test coverage for virtio-net-pci network booting on s390x by
> including it in the PXE test suite. The test verifies that PXE
> network booting works correctly with virtio-net-pci devices.
> 
> Signed-off-by: Zhuoying Cai <zycai@linux.ibm.com>
> Tested-by: Joshua Daley <jdaley@linux.ibm.com>

Realized I shared some findings off-list, but never included them here.

> ---
>  tests/qtest/meson.build | 1 +
>  tests/qtest/pxe-test.c  | 1 +
>  2 files changed, 2 insertions(+)
> 
> diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
> index 50a1a5272f..654e145fbe 100644
> --- a/tests/qtest/meson.build
> +++ b/tests/qtest/meson.build
> @@ -289,6 +289,7 @@ qtests_aarch64 = \
>     'migration-test']
>  
>  qtests_s390x = \
> +  (slirp.found() ? ['pxe-test'] : []) + \

AFAICT this patch not only adds pci testing, but re-enables pxe-test for
virtio-net-ccw.  Sounds like this got accidentally removed along the way?

If that's the case I think this should be its own fix patch.

Alternatively, at least mention it in the commit subject/message.

>    qtests_filter + \
>    ['boot-serial-test',
>     'drive_del-test',
> diff --git a/tests/qtest/pxe-test.c b/tests/qtest/pxe-test.c
> index e85dec5a4e..bfa3b98cad 100644
> --- a/tests/qtest/pxe-test.c
> +++ b/tests/qtest/pxe-test.c
> @@ -60,6 +60,7 @@ static testdef_t ppc64_tests_slow[] = {
>  
>  static testdef_t s390x_tests[] = {
>      { "s390-ccw-virtio", "virtio-net-ccw" },
> +    { "s390-ccw-virtio", "virtio-net-pci" },

I noticed that if I attempt to run this test using a bios that is not
built with this series included, the virtio-net-pci test does not fail
gracefully.

Joy investigated, turns out instead of detecting the condition (no
suitable device found) the tests simply get killed by timeout; would be
good to detect this condition for s390x if possible.

Thanks,
Matt

>      { NULL },
>  };
>