The following changes since commit 6f625ce2f21d6a1243065d236298277c56f972d5:

  Merge tag 'pull-request-2024-10-21' of https://gitlab.com/thuth/qemu into staging (2024-10-21 17:12:59 +0100)

are available in the Git repository at:

  https://gitlab.com/thuth/qemu.git tags/pull-request-2024-10-23

for you to fetch changes up to 239e351ec415ff3673d9da70d70ca3a5dd95a2f0:

  pc-bios/s390-ccw: Update s390-ccw.img with the full boot order support feature (2024-10-23 06:53:44 +0200)

----------------------------------------------------------------
* Allow multiple boot devices (via bootindex properties) on s390x
* Avoid TEXTREL relocations in the s390-ccw.img firmware

----------------------------------------------------------------
Jared Rossi (16):
      pc-bios/s390-ccw: Use the libc from SLOF and remove sclp prints
      pc-bios/s390-ccw: Link the netboot code into the main s390-ccw.img binary
      docs/system/s390x/bootdevices: Update the documentation about network booting
      pc-bios/s390-ccw: Remove panics from ISO IPL path
      pc-bios/s390-ccw: Remove panics from ECKD IPL path
      pc-bios/s390-ccw: Remove panics from SCSI IPL path
      pc-bios/s390-ccw: Remove panics from DASD IPL path
      pc-bios/s390-ccw: Remove panics from Netboot IPL path
      pc-bios/s390-ccw: Enable failed IPL to return after error
      include/hw/s390x: Add include files for common IPL structs
      s390x: Add individual loadparm assignment to CCW device
      hw/s390x: Build an IPLB for each boot device
      s390x: Rebuild IPLB for SCSI device directly from DIAG308
      pc-bios/s390x: Enable multi-device boot loop
      docs/system: Update documentation for s390x IPL
      tests/qtest: Add s390x boot order tests to cdrom-test.c

Jens Remus (2):
      pc-bios/s390-ccw: Clarify alignment is in bytes
      pc-bios/s390-ccw: Don't generate TEXTRELs

Marc Hartmayer (1):
      pc-bios/s390-ccw: Introduce `EXTRA_LDFLAGS`

Thomas Huth (4):
      hw/s390x/ipl: Provide more memory to the s390-ccw.img firmware
      hw/s390x: Remove the possibility to load the s390-netboot.img binary
      pc-bios/s390-ccw: Merge netboot.mak into the main Makefile
      pc-bios/s390-ccw: Update s390-ccw.img with the full boot order support feature

 docs/system/bootindex.rst               |   7 +-
 docs/system/s390x/bootdevices.rst       |  29 +-
 pc-bios/s390-ccw/netboot.mak            |  62 -----
 hw/s390x/ccw-device.h                   |   2 +
 hw/s390x/ipl.h                          | 123 +--------
 include/hw/s390x/ipl/qipl.h             | 127 +++++++++
 pc-bios/s390-ccw/bootmap.h              |  20 +-
 pc-bios/s390-ccw/cio.h                  |   2 +
 pc-bios/s390-ccw/dasd-ipl.h             |   2 +-
 pc-bios/s390-ccw/iplb.h                 | 108 ++------
 pc-bios/s390-ccw/libc.h                 |  89 -------
 pc-bios/s390-ccw/s390-ccw.h             |  36 +--
 pc-bios/s390-ccw/virtio.h               |   3 +-
 hw/s390x/ccw-device.c                   |  46 ++++
 hw/s390x/ipl.c                          | 282 ++++++++++----------
 hw/s390x/s390-virtio-ccw.c              |  28 +-
 hw/s390x/sclp.c                         |   9 +-
 pc-bios/s390-ccw/bootmap.c              | 455 ++++++++++++++++++++++----------
 pc-bios/s390-ccw/cio.c                  |  81 +++---
 pc-bios/s390-ccw/dasd-ipl.c             |  71 ++---
 pc-bios/s390-ccw/jump2ipl.c             |  22 +-
 pc-bios/s390-ccw/libc.c                 |  88 ------
 pc-bios/s390-ccw/main.c                 |  97 ++++---
 pc-bios/s390-ccw/menu.c                 |  51 ++--
 pc-bios/s390-ccw/netmain.c              |  38 ++-
 pc-bios/s390-ccw/sclp.c                 |   7 +-
 pc-bios/s390-ccw/virtio-blkdev.c        |  12 +-
 pc-bios/s390-ccw/virtio-net.c           |   7 +-
 pc-bios/s390-ccw/virtio-scsi.c          | 160 +++++++----
 pc-bios/s390-ccw/virtio.c               |  67 +++--
 target/s390x/diag.c                     |   9 +-
 tests/qtest/cdrom-test.c                |  24 ++
 tests/tcg/s390x/console.c               |   3 +
 pc-bios/meson.build                     |   1 -
 pc-bios/s390-ccw.img                    | Bin 42608 -> 79608 bytes
 pc-bios/s390-ccw/Makefile               |  72 ++++-
 pc-bios/s390-ccw/start.S                |  11 +-
 pc-bios/s390-netboot.img                | Bin 67232 -> 0 bytes
 tests/tcg/s390x/Makefile.softmmu-target |   2 +-
 39 files changed, 1171 insertions(+), 1082 deletions(-)
 delete mode 100644 pc-bios/s390-ccw/netboot.mak
 create mode 100644 include/hw/s390x/ipl/qipl.h
 delete mode 100644 pc-bios/s390-ccw/libc.h
 delete mode 100644 pc-bios/s390-ccw/libc.c
 delete mode 100644 pc-bios/s390-netboot.img

On Wed, 23 Oct 2024 at 14:17, Thomas Huth <thuth@redhat.com> wrote:
>
> The following changes since commit 6f625ce2f21d6a1243065d236298277c56f972d5:
>
>   Merge tag 'pull-request-2024-10-21' of https://gitlab.com/thuth/qemu into staging (2024-10-21 17:12:59 +0100)
>
> are available in the Git repository at:
>
>   https://gitlab.com/thuth/qemu.git tags/pull-request-2024-10-23
>
> for you to fetch changes up to 239e351ec415ff3673d9da70d70ca3a5dd95a2f0:
>
>   pc-bios/s390-ccw: Update s390-ccw.img with the full boot order support feature (2024-10-23 06:53:44 +0200)
>
> ----------------------------------------------------------------
> * Allow multiple boot devices (via bootindex properties) on s390x
> * Avoid TEXTREL relocations in the s390-ccw.img firmware
>


Applied, thanks.

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

-- PMM