On 8/13/26 4:38 PM, Michael Tokarev wrote:
On 8/12/26 20:17, Eric Farman wrote:
Update the s390 bios with recent fixes for out-of-bounds accesses.

Signed-off-by: Eric Farman <[email protected]>
---
  pc-bios/s390-ccw.img | Bin 104136 -> 104216 bytes
  1 file changed, 0 insertions(+), 0 deletions(-)

How do you guys build s390x-ccw.img - which compiler version(s) are
used for that?

This was gcc-16.1.1


Since we're updating source files in the stable series, where this
image is not the same as in current master, I'll have to rebuild
it after patching.  Now I wonder how should I build it.

In official debian we always build it from source, and there were no
complains - maybe because no one uses debian to run qemu-system-s390x? :)

Anyway, on debian stable we have gcc-14.2.0, -- is it okay to use it for
building the image?

I should think so. But if it doesn't work, let's look into why.


Also, there's little changes in s390-ccw.img between qemu 11.0 and 11.1,
here's the list:

  b2b5dec9295 s390x: Enable boot menu for virtio pci device
 d0473643803 pc-bios/s390-ccw: write IPLB location for non-net virtio devices  e26dafb207b pc-bios/s390-ccw: Verify virtio support when booting from virtio PCI device on s390x  084feb90980 pc-bios/s390-ccw: Add per-queue notification offset for multi-queue virtio configurations  730173107a9 pc-bios/s390-ccw/virtio.c: Fix missing break for PCI notifications
  c12bb74fd57 pc-bios/s390-ccw: Refactor byte swapping

I think I can pick all that stuff for 11.0.x series just fine, to avoid
(re)building the image for 11.0.x series.

For 10.0.x, things are really much larger:

 14c29f29064 pc-bios/s390-ccw: Fix compiler warning when compiling with DEBUG enabled
  d72fb5e6b2e pc-bios/s390-ccw: Add support for virtio-blk-pci IPL
  40d80aedd5a pc-bios/s390-ccw: Introduce virtio-pci functions
  5ed17bb32ab pc-bios/s390-ccw: Introduce PCI device
  d3da8afd1dd pc-bios/s390-ccw: Introduce CLP Architecture
  4ff1499adab pc-bios/s390-ccw: Split virtio-ccw and generic virtio
  ada7a60056c pc-bios/s390-ccw: Store device type independent of sense data
  4228a92b2a3 s390x: Remove duplicate definitions of IPL types
 dd8c8f16c02 pc-bios/s390-ccw: Always reset virtio device on failed boot attempt
  5dbabcfee89 pc-bios/s390-ccw: Remove redundant vring schid attribute
  1ef532cbcfc pc-bios/s390-ccw: Fix misattributed function prototypes
  acb00a7aae4 pc-bios/s390-ccw: link statically
 fc24fd9342e pc-bios/s390-ccw: Add a boot menu for booting via pxelinux.cfg
  47d68f7475f pc-bios/s390-ccw: Make get_boot_index() from menu.c global
  108977796fb pc-bios/s390-ccw: Allow up to 31 entries for pxelinux.cfg
 a4adf071dc7 pc-bios/s390-ccw: Allow to select a different pxelinux.cfg entry via loadparm

basically it's whole virtio and pci support added, which might be too much?
Please note that 10.0.x is an LTS series, also used in current debian stable
(trixie), so maybe it is also okay to pick everything up to this series, to
bring the image in-line with current development.

In this case I'll just pick the commits updating the image too :)

What do you think?

Yeah, might be a bit much. The smaller fixes were contained enough that targeting them for stable made sense. Of the four fixes that were in this rebuild, three of the blamed commits date to the v2/v3 days. The fourth went in in 9.2.

Everything else in your lists is new function and whatnot, so my gut says leave it there.

Thanks,
Eric

Reply via email to