[PATCH v2 00/20] hw/arm: Store the ARM boot info in the machine state

Bin Meng posted 20 patches 1 week, 3 days ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20260816131300.51799-1-bin.meng@processmission.com
Maintainers: "Cédric Le Goater" <clg@kaod.org>, Peter Maydell <peter.maydell@linaro.org>, Steven Lee <steven_lee@aspeedtech.com>, Troy Lee <leetroy@gmail.com>, Jamin Lin <jamin_lin@aspeedtech.com>, Kane Chen <kane_chen@aspeedtech.com>, Andrew Jeffery <andrew@codeconstruct.com.au>, Joel Stanley <joel@jms.id.au>, Strahinja Jankovic <strahinja.p.jankovic@gmail.com>, Jean-Christophe Dubois <jcd@tribudubois.net>, Gaurav Sharma <gaurav.sharma_7@nxp.com>, Jan Kiszka <jan.kiszka@web.de>, Tyrone Ting <kfting@nuvoton.com>, Hao Wu <wuhaotsh@google.com>, Niek Linnenbank <nieklinnenbank@gmail.com>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, Alistair Francis <alistair@alistair23.me>
hw/arm/aspeed.c              | 17 +++++++----------
hw/arm/aspeed_ast27x0-fc.c   | 13 ++++++-------
hw/arm/bananapi_m2u.c        | 21 +++++++++++++++------
hw/arm/collie.c              | 12 +++++-------
hw/arm/cubieboard.c          | 21 +++++++++++++++------
hw/arm/exynos4_boards.c      | 26 +++++++++++---------------
hw/arm/imx25_pdk.c           | 11 +++++------
hw/arm/imx8mm-evk.c          | 29 +++++++++++++++++++----------
hw/arm/integratorcp.c        | 22 ++++++++++++++++------
hw/arm/kzm.c                 | 12 +++++-------
hw/arm/mcimx7d-sabre.c       | 28 +++++++++++++++++++---------
hw/arm/musicpal.c            | 21 +++++++++++++++------
hw/arm/npcm7xx.c             | 28 +++++++++++++---------------
hw/arm/npcm7xx_boards.c      | 10 +++++-----
hw/arm/npcm8xx.c             | 28 +++++++++++++---------------
hw/arm/npcm8xx_boards.c      |  2 +-
hw/arm/omap_sx1.c            | 19 +++++++++++++------
hw/arm/orangepi.c            | 22 ++++++++++++++++------
hw/arm/realview.c            | 27 ++++++++++++++++++---------
hw/arm/sabrelite.c           | 22 ++++++++++------------
hw/arm/versatilepb.c         | 16 ++++++++++++----
hw/arm/xilinx_zynq.c         | 17 ++++++++---------
include/hw/arm/aspeed.h      |  2 ++
include/hw/arm/npcm7xx.h     | 10 ++++++++--
include/hw/arm/npcm8xx.h     | 10 ++++++++--
include/hw/arm/xilinx_zynq.h |  2 ++
26 files changed, 267 insertions(+), 181 deletions(-)
[PATCH v2 00/20] hw/arm: Store the ARM boot info in the machine state
Posted by Bin Meng 1 week, 3 days ago
Most ARM board files declare their struct arm_boot_info as a static
object at file scope (or, occasionally, as a function-local static
inside the machine init function). arm_load_kernel() stashes a pointer
to that struct in every CPU and dereferences it from do_cpu_reset() on
each reset, so the boot info conceptually belongs to the machine for the
lifetime of the VM, not to a static object whose ownership is left
implicit.

This is a longstanding leftover pattern: modern machines such as virt,
raspi and xlnx-zcu102 already keep the boot info in their MachineState
subclass. This series converts the remaining machines that still use
a static object, moving the struct into their machine state so that its
lifetime and ownership match how arm_load_kernel() actually uses it.

Changes in v2:

Addressed 2 review comments from Peter:

- All assignments now use individual field writes (e.g.:
  bpms->bootinfo.loader_start = ...). This applies to: collie, cubieboard,
  exynos4, imx8mm-evk, integratorcp, kzm, mcimx7d-sabre, musicpal, npcm7xx,
  npcm8xx, omap_sx1, realview, sabrelite
- The following boards that previously used DEFINE_MACHINE_ARM/AARCH64 now
  use the macro DEFINE_MACHINE_EXTENDED() instead: bananapi_m2u,
  cubieboard, imx8mm-evk, integratorcp, mcimx7d-sabre, musicpal,
  orangepi-pc

Bin Meng (20):
  hw/arm: aspeed: Store boot info in the machine state
  hw/arm: aspeed_ast27x0-fc: Store boot info in the machine state
  hw/arm: bananapi_m2u: Store boot info in the machine state
  hw/arm: collie: Store boot info in the machine state
  hw/arm: cubieboard: Store boot info in the machine state
  hw/arm: exynos4_boards: Store boot info in the board state
  hw/arm: imx25_pdk: Store boot info in the board state
  hw/arm: imx8mm-evk: Store boot info in the machine state
  hw/arm: integratorcp: Store boot info in the machine state
  hw/arm: kzm: Store boot info in the board state
  hw/arm: mcimx7d-sabre: Store boot info in the machine state
  hw/arm: musicpal: Store boot info in the machine state
  hw/arm: npcm7xx: Store boot info in the machine state
  hw/arm: npcm8xx: Store boot info in the machine state
  hw/arm: omap_sx1: Store boot info in the machine state
  hw/arm: orangepi: Store boot info in the machine state
  hw/arm: realview: Store boot info in the machine state
  hw/arm: sabrelite: Store boot info in the machine state
  hw/arm: versatilepb: Store boot info in the machine state
  hw/arm: xilinx_zynq: Store boot info in the machine state

 hw/arm/aspeed.c              | 17 +++++++----------
 hw/arm/aspeed_ast27x0-fc.c   | 13 ++++++-------
 hw/arm/bananapi_m2u.c        | 21 +++++++++++++++------
 hw/arm/collie.c              | 12 +++++-------
 hw/arm/cubieboard.c          | 21 +++++++++++++++------
 hw/arm/exynos4_boards.c      | 26 +++++++++++---------------
 hw/arm/imx25_pdk.c           | 11 +++++------
 hw/arm/imx8mm-evk.c          | 29 +++++++++++++++++++----------
 hw/arm/integratorcp.c        | 22 ++++++++++++++++------
 hw/arm/kzm.c                 | 12 +++++-------
 hw/arm/mcimx7d-sabre.c       | 28 +++++++++++++++++++---------
 hw/arm/musicpal.c            | 21 +++++++++++++++------
 hw/arm/npcm7xx.c             | 28 +++++++++++++---------------
 hw/arm/npcm7xx_boards.c      | 10 +++++-----
 hw/arm/npcm8xx.c             | 28 +++++++++++++---------------
 hw/arm/npcm8xx_boards.c      |  2 +-
 hw/arm/omap_sx1.c            | 19 +++++++++++++------
 hw/arm/orangepi.c            | 22 ++++++++++++++++------
 hw/arm/realview.c            | 27 ++++++++++++++++++---------
 hw/arm/sabrelite.c           | 22 ++++++++++------------
 hw/arm/versatilepb.c         | 16 ++++++++++++----
 hw/arm/xilinx_zynq.c         | 17 ++++++++---------
 include/hw/arm/aspeed.h      |  2 ++
 include/hw/arm/npcm7xx.h     | 10 ++++++++--
 include/hw/arm/npcm8xx.h     | 10 ++++++++--
 include/hw/arm/xilinx_zynq.h |  2 ++
 26 files changed, 267 insertions(+), 181 deletions(-)

---
base-commit: af06b5df2610fe5de6c02d17c17bced9e9f0d47d
branch: cleanup-arm-static-boot-info

-- 
2.53.0
Re: [PATCH v2 00/20] hw/arm: Store the ARM boot info in the machine state
Posted by Peter Maydell 5 days, 11 hours ago
On Sun, 16 Aug 2026 at 14:15, Bin Meng <bin.meng@processmission.com> wrote:
>
>
> Most ARM board files declare their struct arm_boot_info as a static
> object at file scope (or, occasionally, as a function-local static
> inside the machine init function). arm_load_kernel() stashes a pointer
> to that struct in every CPU and dereferences it from do_cpu_reset() on
> each reset, so the boot info conceptually belongs to the machine for the
> lifetime of the VM, not to a static object whose ownership is left
> implicit.
>
> This is a longstanding leftover pattern: modern machines such as virt,
> raspi and xlnx-zcu102 already keep the boot info in their MachineState
> subclass. This series converts the remaining machines that still use
> a static object, moving the struct into their machine state so that its
> lifetime and ownership match how arm_load_kernel() actually uses it.
>
> Changes in v2:
>
> Addressed 2 review comments from Peter:
>
> - All assignments now use individual field writes (e.g.:
>   bpms->bootinfo.loader_start = ...). This applies to: collie, cubieboard,
>   exynos4, imx8mm-evk, integratorcp, kzm, mcimx7d-sabre, musicpal, npcm7xx,
>   npcm8xx, omap_sx1, realview, sabrelite
> - The following boards that previously used DEFINE_MACHINE_ARM/AARCH64 now
>   use the macro DEFINE_MACHINE_EXTENDED() instead: bananapi_m2u,
>   cubieboard, imx8mm-evk, integratorcp, mcimx7d-sabre, musicpal,
>   orangepi-pc
>



Applied to target-arm.next, thanks.

-- PMM