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.


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        | 37 ++++++++++++++++++++++++++-------
 hw/arm/collie.c              | 14 ++++++-------
 hw/arm/cubieboard.c          | 38 +++++++++++++++++++++++++++-------
 hw/arm/exynos4_boards.c      | 26 +++++++++++------------
 hw/arm/imx25_pdk.c           | 11 +++++-----
 hw/arm/imx8mm-evk.c          | 34 +++++++++++++++++++++++++-----
 hw/arm/integratorcp.c        | 40 +++++++++++++++++++++++++++++-------
 hw/arm/kzm.c                 | 14 ++++++-------
 hw/arm/mcimx7d-sabre.c       | 36 +++++++++++++++++++++++++++-----
 hw/arm/musicpal.c            | 32 ++++++++++++++++++++++-------
 hw/arm/npcm7xx.c             | 28 ++++++++++++-------------
 hw/arm/npcm7xx_boards.c      | 15 +++++++++-----
 hw/arm/npcm8xx.c             | 30 +++++++++++++--------------
 hw/arm/npcm8xx_boards.c      |  3 ++-
 hw/arm/omap_sx1.c            | 21 +++++++++++++------
 hw/arm/orangepi.c            | 37 ++++++++++++++++++++++++++-------
 hw/arm/realview.c            | 30 +++++++++++++++++++--------
 hw/arm/sabrelite.c           | 24 +++++++++++-----------
 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, 382 insertions(+), 175 deletions(-)

---
base-commit: 539bc315538afe036a4b99088659aa82e3b489f2
branch: cleanup-arm-static-boot-info

-- 
2.53.0


Reply via email to