[PULL 00/25] s390x & functional tests pull request for the softfreeze

Thomas Huth posted 25 patches 1 month ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20260310055530.8893-1-thuth@redhat.com
Maintainers: "Michael S. Tsirkin" <mst@redhat.com>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Christian Borntraeger <borntraeger@linux.ibm.com>, Thomas Huth <thuth@redhat.com>, Jared Rossi <jrossi@linux.ibm.com>, Zhuoying Cai <zycai@linux.ibm.com>, Halil Pasic <pasic@linux.ibm.com>, Eric Farman <farman@linux.ibm.com>, Matthew Rosato <mjrosato@linux.ibm.com>, Richard Henderson <richard.henderson@linaro.org>, Ilya Leoshkevich <iii@linux.ibm.com>, David Hildenbrand <david@kernel.org>, Farhan Ali <alifm@linux.ibm.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, "Daniel P. Berrangé" <berrange@redhat.com>, Peter Xu <peterx@redhat.com>, Fabiano Rosas <farosas@suse.de>, "Hervé Poussineau" <hpoussin@reactos.org>, Nicholas Piggin <npiggin@gmail.com>, Harsh Prateek Bora <harshpb@linux.ibm.com>, Paolo Bonzini <pbonzini@redhat.com>, Zhao Liu <zhao1.liu@intel.com>, Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, John Snow <jsnow@redhat.com>, Laurent Vivier <lvivier@redhat.com>
MAINTAINERS                               |   1 +
hw/s390x/ipl.h                            |   8 +-
include/hw/pci/pci.h                      |   1 +
include/hw/pci/pci_device.h               |   3 +
include/hw/s390x/ipl/qipl.h               |  20 ++
include/hw/s390x/{ => ipl}/s390-pci-clp.h |   0
include/hw/s390x/s390-pci-bus.h           |   4 +-
pc-bios/s390-ccw/clp.h                    |  24 ++
pc-bios/s390-ccw/iplb.h                   |   4 -
pc-bios/s390-ccw/pci.h                    |  39 +++
pc-bios/s390-ccw/s390-ccw.h               |   9 +-
pc-bios/s390-ccw/virtio-ccw.h             |  24 ++
pc-bios/s390-ccw/virtio-pci.h             |  82 ++++++
pc-bios/s390-ccw/virtio-scsi.h            |   2 +-
pc-bios/s390-ccw/virtio.h                 |  19 +-
hw/pci/pci.c                              |  38 +++
hw/s390x/ipl.c                            |  63 ++++-
hw/s390x/s390-pci-bus.c                   |   3 +-
hw/s390x/s390-pci-vfio.c                  |   2 +-
hw/virtio/virtio-blk-pci.c                |   1 +
pc-bios/s390-ccw/bootmap.c                |   2 +-
pc-bios/s390-ccw/clp.c                    |  99 +++++++
pc-bios/s390-ccw/main.c                   |  88 +++++-
pc-bios/s390-ccw/netmain.c                |   2 +-
pc-bios/s390-ccw/pci.c                    | 118 ++++++++
pc-bios/s390-ccw/virtio-blkdev.c          |  76 ++++--
pc-bios/s390-ccw/virtio-ccw.c             | 239 +++++++++++++++++
pc-bios/s390-ccw/virtio-net.c             |   5 +-
pc-bios/s390-ccw/virtio-pci.c             | 433 ++++++++++++++++++++++++++++++
pc-bios/s390-ccw/virtio-scsi.c            |   8 +-
pc-bios/s390-ccw/virtio.c                 | 293 +++++++-------------
tests/qtest/cdrom-test.c                  |   7 +
pc-bios/s390-ccw.img                      | Bin 87824 -> 95992 bytes
pc-bios/s390-ccw/Makefile                 |   3 +-
tests/functional/meson.build              |   5 +-
tests/functional/migration.py             |  46 ++--
tests/functional/ppc/test_40p.py          |   2 +-
tests/functional/ppc64/test_migration.py  |  11 -
tests/functional/ppc64/test_pseries.py    |  10 +-
tests/functional/x86_64/meson.build       |   9 +-
tests/qemu-iotests/182                    |   1 +
41 files changed, 1492 insertions(+), 312 deletions(-)
rename include/hw/s390x/{ => ipl}/s390-pci-clp.h (100%)
create mode 100644 pc-bios/s390-ccw/clp.h
create mode 100644 pc-bios/s390-ccw/pci.h
create mode 100644 pc-bios/s390-ccw/virtio-ccw.h
create mode 100644 pc-bios/s390-ccw/virtio-pci.h
create mode 100644 pc-bios/s390-ccw/clp.c
create mode 100644 pc-bios/s390-ccw/pci.c
create mode 100644 pc-bios/s390-ccw/virtio-ccw.c
create mode 100644 pc-bios/s390-ccw/virtio-pci.c
[PULL 00/25] s390x & functional tests pull request for the softfreeze
Posted by Thomas Huth 1 month ago
The following changes since commit de61484ec39f418e5c0d4603017695f9ffb8fe24:

  Merge tag 'linux-user-for-v11-pull-request' of https://github.com/hdeller/qemu-hppa into staging (2026-03-09 14:53:42 +0000)

are available in the Git repository at:

  https://gitlab.com/thuth/qemu.git tags/pull-request-2026-03-10

for you to fetch changes up to f2bd9693f22b105182b0bacdba390a0e41b2cf82:

  pc-bios/s390-ccw.img: Update the s390 bios blog with the latest changes (2026-03-10 06:46:45 +0100)

----------------------------------------------------------------
- Improve the s390-ccw bios to be able to boot from virtio-blk-pci devices
- Rework migration functional test to avoid a problem in the ppc64 test
- Disable functional memlock test for asan builds
- Some other minor tests improvements

----------------------------------------------------------------
Fabiano Rosas (4):
      tests/functional/migration: Use socket_dir
      tests/functional/migration: Add migrate_vms
      tests/functional/migration: Use the migrate_vms helper
      tests/functional/ppc64/pseries: Remove custom migration routine

Jared Rossi (15):
      pc-bios/s390-ccw: Fix misattributed function prototypes
      pc-bios/s390-ccw: Remove redundant vring schid attribute
      pc-bios/s390-ccw: Always reset virtio device on failed boot attempt
      s390x: Remove duplicate definitions of IPL types
      pc-bios/s390-ccw: Store device type independent of sense data
      pc-bios/s390-ccw: Split virtio-ccw and generic virtio
      include/hw/s390x: Move CLP definitions for easier BIOS access
      pc-bios/s390-ccw: Introduce CLP Architecture
      s390x: Add definitions for PCI IPL type
      pc-bios/s390-ccw: Introduce PCI device
      pc-bios/s390-ccw: Introduce virtio-pci functions
      pc-bios/s390-ccw: Add support for virtio-blk-pci IPL
      s390x: Build IPLB for virtio-pci devices
      hw: Add "loadparm" property to virtio block PCI devices booting on s390x
      tests/qtest: Add s390x PCI boot test to cdrom-test.c

Peter Maydell (1):
      tests/functional/x86_64: Disable memlock test for asan builds

Thomas Huth (5):
      tests/qemu-iotests: Mark 182 as Linux-only
      tests/functional: Don't try to run functional tests on Windows
      tests/functional/ppc/test_40: Fix the URL of the NetBSD-7.1.2-prep.iso asset
      pc-bios/s390-ccw: Fix compiler warning when compiling with DEBUG enabled
      pc-bios/s390-ccw.img: Update the s390 bios blog with the latest changes

 MAINTAINERS                               |   1 +
 hw/s390x/ipl.h                            |   8 +-
 include/hw/pci/pci.h                      |   1 +
 include/hw/pci/pci_device.h               |   3 +
 include/hw/s390x/ipl/qipl.h               |  20 ++
 include/hw/s390x/{ => ipl}/s390-pci-clp.h |   0
 include/hw/s390x/s390-pci-bus.h           |   4 +-
 pc-bios/s390-ccw/clp.h                    |  24 ++
 pc-bios/s390-ccw/iplb.h                   |   4 -
 pc-bios/s390-ccw/pci.h                    |  39 +++
 pc-bios/s390-ccw/s390-ccw.h               |   9 +-
 pc-bios/s390-ccw/virtio-ccw.h             |  24 ++
 pc-bios/s390-ccw/virtio-pci.h             |  82 ++++++
 pc-bios/s390-ccw/virtio-scsi.h            |   2 +-
 pc-bios/s390-ccw/virtio.h                 |  19 +-
 hw/pci/pci.c                              |  38 +++
 hw/s390x/ipl.c                            |  63 ++++-
 hw/s390x/s390-pci-bus.c                   |   3 +-
 hw/s390x/s390-pci-vfio.c                  |   2 +-
 hw/virtio/virtio-blk-pci.c                |   1 +
 pc-bios/s390-ccw/bootmap.c                |   2 +-
 pc-bios/s390-ccw/clp.c                    |  99 +++++++
 pc-bios/s390-ccw/main.c                   |  88 +++++-
 pc-bios/s390-ccw/netmain.c                |   2 +-
 pc-bios/s390-ccw/pci.c                    | 118 ++++++++
 pc-bios/s390-ccw/virtio-blkdev.c          |  76 ++++--
 pc-bios/s390-ccw/virtio-ccw.c             | 239 +++++++++++++++++
 pc-bios/s390-ccw/virtio-net.c             |   5 +-
 pc-bios/s390-ccw/virtio-pci.c             | 433 ++++++++++++++++++++++++++++++
 pc-bios/s390-ccw/virtio-scsi.c            |   8 +-
 pc-bios/s390-ccw/virtio.c                 | 293 +++++++-------------
 tests/qtest/cdrom-test.c                  |   7 +
 pc-bios/s390-ccw.img                      | Bin 87824 -> 95992 bytes
 pc-bios/s390-ccw/Makefile                 |   3 +-
 tests/functional/meson.build              |   5 +-
 tests/functional/migration.py             |  46 ++--
 tests/functional/ppc/test_40p.py          |   2 +-
 tests/functional/ppc64/test_migration.py  |  11 -
 tests/functional/ppc64/test_pseries.py    |  10 +-
 tests/functional/x86_64/meson.build       |   9 +-
 tests/qemu-iotests/182                    |   1 +
 41 files changed, 1492 insertions(+), 312 deletions(-)
 rename include/hw/s390x/{ => ipl}/s390-pci-clp.h (100%)
 create mode 100644 pc-bios/s390-ccw/clp.h
 create mode 100644 pc-bios/s390-ccw/pci.h
 create mode 100644 pc-bios/s390-ccw/virtio-ccw.h
 create mode 100644 pc-bios/s390-ccw/virtio-pci.h
 create mode 100644 pc-bios/s390-ccw/clp.c
 create mode 100644 pc-bios/s390-ccw/pci.c
 create mode 100644 pc-bios/s390-ccw/virtio-ccw.c
 create mode 100644 pc-bios/s390-ccw/virtio-pci.c
Re: [PULL 00/25] s390x & functional tests pull request for the softfreeze
Posted by Peter Maydell 1 month ago
On Tue, 10 Mar 2026 at 05:55, Thomas Huth <thuth@redhat.com> wrote:
>
> The following changes since commit de61484ec39f418e5c0d4603017695f9ffb8fe24:
>
>   Merge tag 'linux-user-for-v11-pull-request' of https://github.com/hdeller/qemu-hppa into staging (2026-03-09 14:53:42 +0000)
>
> are available in the Git repository at:
>
>   https://gitlab.com/thuth/qemu.git tags/pull-request-2026-03-10
>
> for you to fetch changes up to f2bd9693f22b105182b0bacdba390a0e41b2cf82:
>
>   pc-bios/s390-ccw.img: Update the s390 bios blog with the latest changes (2026-03-10 06:46:45 +0100)
>
> ----------------------------------------------------------------
> - Improve the s390-ccw bios to be able to boot from virtio-blk-pci devices
> - Rework migration functional test to avoid a problem in the ppc64 test
> - Disable functional memlock test for asan builds
> - Some other minor tests improvements



Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/11.0
for any user-visible changes.

-- PMM