Skip to content

pc-bios/s390-ccw: Merge the netboot loader into s390-ccw.img

Thomas Huth qemu-devel 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest7 patches 10 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/7pc-bios/s390-ccw: Remove duplicated LDFLAGSpc-bios/s390-ccw/Makefile+1 -30 replies
2/7hw/s390x/ipl: Provide more memory to the s390-ccw.img firmwarehw/s390x/ipl.c+9 -10 replies
3/7pc-bios/s390-ccw: Use the libc from SLOF for the main s390-ccw.img binary, toopc-bios/s390-ccw/Makefile pc-bios/s390-ccw/bootmap.c pc-bios/s390-ccw/cio.c +12 more+34 -2130 replies
4/7pc-bios/s390-ccw: Link the netboot code into the main s390-ccw.img binarypc-bios/s390-ccw/Makefile pc-bios/s390-ccw/bootmap.c pc-bios/s390-ccw/cio.h +6 more+24 -400 replies
5/7hw/s390x: Remove the possibility to load the s390-netboot.img binaryhw/s390x/ipl.c hw/s390x/ipl.h hw/s390x/s390-virtio-ccw.c +2 more+6 -720 replies
6/7pc-bios/s390-ccw: Merge netboot.mak into the main Makefilepc-bios/s390-ccw/Makefile pc-bios/s390-ccw/netboot.mak+46 -460 replies
7/7docs/system/s390x/bootdevices: Update the documentation about network bootingdocs/system/s390x/bootdevices.rst+7 -130 replies

Reviews trailers per patch

None of the 7 patches has a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchEric Farman
SeriesR-b
1/7
2/7
3/7
4/7
5/7
6/7
7/7

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH 0/7] pc-bios/s390-ccw: Merge the netboot loader into s390-ccw.img

We originally built a separate binary for the netboot code since it was considered as experimental and we could not be sure that the necessary SLOF module had been checked out. Time passed, the netboot code proved its usefulness, and the build system nowadays makes sure that the SLOF module is checked out if you have a s390x compiler available for building the s390-ccw bios. In fact, the possibility to build the s390-ccw.img without s390-netboot.img has been removed in commit bf6903f6944f ("pc-bios/s390-ccw: always build network bootloader") already.

So it does not make too much sense anymore to keep the netboot code in a separate binary. To make it easier to support a more flexible boot process soon that supports more than one boot device via the bootindex properties, let's finally merge the netboot code into the main s390-ccw.img binary now.

Thomas Huth (7):
pc-bios/s390-ccw: Remove duplicated LDFLAGS
hw/s390x/ipl: Provide more memory to the s390-ccw.img firmware pc-bios/s390-ccw: Use the libc from SLOF for the main s390-ccw.img
binary, too
pc-bios/s390-ccw: Link the netboot code into the main s390-ccw.img
binary
hw/s390x: Remove the possibility to load the s390-netboot.img binary pc-bios/s390-ccw: Merge netboot.mak into the main Makefile docs/system/s390x/bootdevices: Update the documentation about network
booting

 docs/system/s390x/bootdevices.rst |  20 +++----
 pc-bios/s390-ccw/netboot.mak      |  62 ---------------------
 hw/s390x/ipl.h                    |  12 ++--
 pc-bios/s390-ccw/cio.h            |   2 +
 pc-bios/s390-ccw/iplb.h           |   4 +-
 pc-bios/s390-ccw/libc.h           |  89 ------------------------------
 pc-bios/s390-ccw/s390-ccw.h       |  10 +++-
 pc-bios/s390-ccw/virtio.h         |   1 -
 hw/s390x/ipl.c                    |  65 +++-------------------
 hw/s390x/s390-virtio-ccw.c        |  10 +---
 pc-bios/s390-ccw/bootmap.c        |   4 +-
 pc-bios/s390-ccw/cio.c            |   2 +-
 pc-bios/s390-ccw/dasd-ipl.c       |   2 +-
 pc-bios/s390-ccw/jump2ipl.c       |   2 +-
 pc-bios/s390-ccw/libc.c           |  88 -----------------------------
 pc-bios/s390-ccw/main.c           |  15 +++--
 pc-bios/s390-ccw/menu.c           |  25 ++++-----
 pc-bios/s390-ccw/netmain.c        |  15 +----
 pc-bios/s390-ccw/sclp.c           |   2 +-
 pc-bios/s390-ccw/virtio-blkdev.c  |   1 -
 pc-bios/s390-ccw/virtio-scsi.c    |   2 +-
 pc-bios/s390-ccw/virtio.c         |   2 +-
 pc-bios/meson.build               |   1 -
 pc-bios/s390-ccw/Makefile         |  69 +++++++++++++++++++----
 pc-bios/s390-netboot.img          | Bin 67232 -> 0 bytes
 25 files changed, 122 insertions(+), 383 deletions(-)
 delete mode 100644 pc-bios/s390-ccw/netboot.mak
 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
Signature · 1 line
2.45.2