Re: [PULL 0/8] s390x patches (and one gitlab-CI fix)

[Thomas Huth]

On 16/12/2021 17.38, Richard Henderson wrote:
> On 12/16/21 1:44 AM, Thomas Huth wrote:
> >   Hi!
> >
> > The following changes since commit e630bc7ec9dda656a452ed28cac4d1e9ed605d71:
> >
> >    Merge tag 'pull-block-2021-12-15' of git://repo.or.cz/qemu/armbru into 
> > staging (2021-12-15 12:14:44 -0800)
> >
> > are available in the Git repository at:
> >
> >    https://gitlab.com/thuth/qemu.git tags/s390x-2021-12-16
> >
> > for you to fetch changes up to 79e42726050b7be6c2104a9af678ce911897dfaa:
> >
> >    gitlab-ci: Speed up the msys2-64bit job by using 
> > --without-default-devices (2021-12-16 10:22:39 +0100)
> >
> > ----------------------------------------------------------------
> > * Small fixes for the s390x PCI code
> > * Fix reset handling of the diag318 data
> > * Add compat machines for 7.0 (all architectures)
> > * Ease timeout problem of the new msys2-64bit job
> >
> > ----------------------------------------------------------------
> > Christian Borntraeger (1):
> >        MAINTAINERS: update email address of Christian Borntraeger
> >
> > Collin L. Walling (1):
> >        s390: kvm: adjust diag318 resets to retain data
> >
> > Cornelia Huck (1):
> >        hw: Add compat machines for 7.0
> >
> > Matthew Rosato (4):
> >        s390x/pci: use a reserved ID for the default PCI group
> >        s390x/pci: don't use hard-coded dma range in reg_ioat
> >        s390x/pci: use the passthrough measurement update interval
> >        s390x/pci: add supported DT information to clp response
> >
> > Thomas Huth (1):
> >        gitlab-ci: Speed up the msys2-64bit job by using 
> > --without-default-devices
> >
> >   .gitlab-ci.d/windows.yml        |  2 +-
> >   .mailmap                        |  1 +
> >   MAINTAINERS                     |  6 +++---
> >   hw/arm/virt.c                   |  9 ++++++++-
> >   hw/core/machine.c               |  3 +++
> >   hw/i386/pc.c                    |  3 +++
> >   hw/i386/pc_piix.c               | 14 +++++++++++++-
> >   hw/i386/pc_q35.c                | 13 ++++++++++++-
> >   hw/ppc/spapr.c                  | 15 +++++++++++++--
> >   hw/s390x/s390-pci-bus.c         |  1 +
> >   hw/s390x/s390-pci-inst.c        | 15 +++++++++------
> >   hw/s390x/s390-pci-vfio.c        |  1 +
> >   hw/s390x/s390-virtio-ccw.c      | 14 +++++++++++++-
> >   include/hw/boards.h             |  3 +++
> >   include/hw/i386/pc.h            |  3 +++
> >   include/hw/s390x/s390-pci-bus.h |  3 ++-
> >   include/hw/s390x/s390-pci-clp.h |  3 ++-
> >   target/s390x/cpu.h              |  4 ++--
> >   target/s390x/kvm/kvm.c          |  4 ++++
> >   19 files changed, 97 insertions(+), 20 deletions(-)
>
> Fails like so:
>
>   (162/171) 
> tests/avocado/x86_cpu_model_versions.py:X86CPUModelAliases.test_4_1_alias: 
> FAIL: None != 'Cascadelake-Server-v1' : Cascadelake-Server must be an alias 
> of Cascadelake-Server-v1 (0.14 s)
>
> https://gitlab.com/qemu-project/qemu/-/jobs/1893456217
>
> Which is presumably the compat machines in patch 7.

Drat ... that's what you get if some jobs are not run by default on private 
repos :-/

Ok, I'll unqueue that patch for now. Cornelia, could you please have a look?

 Thomas