Re: [PULL 00/11] 11.1 compat machines and s390x updates

[Cornelia Huck <cohuck@redhat.com>]

On Thu, Apr 23 2026, Matthew Rosato <mjrosato@linux.ibm.com> wrote:

> On 4/23/26 7:20 PM, Stefan Hajnoczi wrote:
>> On Thu, Apr 23, 2026 at 5:50 AM Cornelia Huck <cohuck@redhat.com> wrote:
>> 
>>> The following changes since commit
>>> 98b060da3a4f92b2a994ead5b16a87e783baf77c:
>>>
>>>   Update version for v11.0.0 release (2026-04-21 16:28:47 +0100)
>>>
>>> are available in the Git repository at:
>>>
>>>   https://gitlab.com/cohuck/qemu tags/s390x-20260423
>>>
>>> for you to fetch changes up to 83f5164d25634f9104b5fb4a6772766ae646ad59:
>>>
>>>   hw/s390x/ccw: Disable legacy virtio-pci by default (v11.1+) (2026-04-22
>>> 11:28:03 +0200)
>>>
>>> ----------------------------------------------------------------
>>> First batch of updates for 11.1:
>>> - compat machines for 11.1
>>> - s390x: simplifications, cleanups, and a new test
>>>
>> 
>> Hi Cornelia,
>> There is an s390x timeout regression in this pull request that reproduces
>> both in the CI and locally:
>> 
>> $ make check-functional-s390x
>> 13/13 qemu:func-thorough+func-s390x-thorough+thorough /
>> func-s390x-ccw_virtio         TIMEOUT        420.07s   killed by signal 15
>> SIGTERM
>
>
> Hi Connie, it looks to me like the failure is due to disabling legacy
> virtio-pci by default for s390x starting with 11.1.

Duh, I thought I did run all tests, but apparently not.

>
> I was able to get the test to pass again with the diff below.  But
> wasn't sure, do we only care about the default/latest machine version
> for functional tests? 
>
> diff --git a/tests/functional/s390x/test_ccw_virtio.py b/tests/functional/s390x/test_ccw_virtio.py
> index 0455337856..1d4958bbe2 100755
> --- a/tests/functional/s390x/test_ccw_virtio.py
> +++ b/tests/functional/s390x/test_ccw_virtio.py
> @@ -136,7 +136,7 @@ def test_s390x_devices(self):
>                      r'0x1af4')
>          exec_command_and_wait_for_pattern(self,
>                      r'cat /sys/bus/pci/devices/0005\:00\:00.0/subsystem_device',
> -                    r'0x0001')
> +                    r'0x1100')
>          # check fid propagation
>          exec_command_and_wait_for_pattern(self,
>                      r'cat /sys/bus/pci/devices/000a\:00\:00.0/function_id',
> @@ -203,7 +203,7 @@ def test_s390x_fedora(self):
>                          'while ! (dmesg | grep enP7p0s0) ; do sleep 1 ; done',
>                          'virtio_net virtio0 enP7p0s0: renamed')
>          exec_command_and_wait_for_pattern(self, 'lspci',
> -                             '0007:00:00.0 Class 0200: Device 1af4:1000')
> +                             '0007:00:00.0 Class 0200: Device 1af4:1041')
>          exec_command_and_wait_for_pattern(self,
>                               'cat /sys/class/net/enP7p0s0/address',
>                               '02:ca:fe:fa:ce:12')

AFAICS we always run with the default (latest) machine, so adapting to
any changed output there is probably the way to go -- unless we want to
test various permutations of older machines, but I think that would get
out of hand pretty quickly.

Can you send this with proper tags, I'll just go ahead and merge it.