Op do 13 aug. 2026 17:51 schreef Bin Meng <[email protected]>:
> arm_load_kernel() keeps a pointer to the boot info struct for the
> lifetime of the VM, so the struct logically belongs to the machine
> rather than to a file scoped static object.
>
> Move it into a new OrangePiMachineState and register the machine type
> explicitly instead of through the DEFINE_MACHINE_ARM macro.
>
> As in the xlnx-zcu102 and raspi machines, the boot info belongs to
> the machine rather than to a static object:
>
> 4d1ac883a7 ("hw/arm: xlnx-zcu102: Move arm_boot_info into XlnxZCU102")
> 0f15c6e338 ("hw/arm/raspi: Move arm_boot_info structure to
> RaspiMachineState")
>
> Signed-off-by: Bin Meng <[email protected]>
>
Reviewed-by: Niek Linnenbank <[email protected]>
---
>
> hw/arm/orangepi.c | 37 ++++++++++++++++++++++++++++++-------
> 1 file changed, 30 insertions(+), 7 deletions(-)
>
> diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c
> index d84443bb7b..5b2c13f364 100644
> --- a/hw/arm/orangepi.c
> +++ b/hw/arm/orangepi.c
> @@ -28,10 +28,18 @@
> #include "hw/arm/boot.h"
> #include "hw/arm/machines-qom.h"
>
> -static struct arm_boot_info orangepi_binfo;
> +#define TYPE_ORANGEPI_MACHINE MACHINE_TYPE_NAME("orangepi-pc")
> +OBJECT_DECLARE_SIMPLE_TYPE(OrangePiMachineState, ORANGEPI_MACHINE)
> +
> +struct OrangePiMachineState {
> + MachineState parent;
> +
> + struct arm_boot_info bootinfo;
> +};
>
> static void orangepi_init(MachineState *machine)
> {
> + OrangePiMachineState *opms = ORANGEPI_MACHINE(machine);
> AwH3State *h3;
> DriveInfo *di;
> BlockBackend *blk;
> @@ -98,14 +106,16 @@ static void orangepi_init(MachineState *machine)
> /* Use Boot ROM to copy data from SD card to SRAM */
> allwinner_h3_bootrom_setup(h3, blk);
> }
> - orangepi_binfo.loader_start = h3->memmap[AW_H3_DEV_SDRAM];
> - orangepi_binfo.ram_size = machine->ram_size;
> - orangepi_binfo.psci_conduit = QEMU_PSCI_CONDUIT_SMC;
> - arm_load_kernel(&h3->cpus[0], machine, &orangepi_binfo);
> + opms->bootinfo.loader_start = h3->memmap[AW_H3_DEV_SDRAM];
> + opms->bootinfo.ram_size = machine->ram_size;
> + opms->bootinfo.psci_conduit = QEMU_PSCI_CONDUIT_SMC;
> + arm_load_kernel(&h3->cpus[0], machine, &opms->bootinfo);
> }
>
> -static void orangepi_machine_init(MachineClass *mc)
> +static void orangepi_machine_class_init(ObjectClass *oc, const void *data)
> {
> + MachineClass *mc = MACHINE_CLASS(oc);
> +
> static const char * const valid_cpu_types[] = {
> ARM_CPU_TYPE_NAME("cortex-a7"),
> NULL
> @@ -125,4 +135,17 @@ static void orangepi_machine_init(MachineClass *mc)
> mc->auto_create_sdcard = true;
> }
>
> -DEFINE_MACHINE_ARM("orangepi-pc", orangepi_machine_init)
> +static const TypeInfo orangepi_machine_typeinfo = {
> + .name = TYPE_ORANGEPI_MACHINE,
> + .parent = TYPE_MACHINE,
> + .class_init = orangepi_machine_class_init,
> + .instance_size = sizeof(OrangePiMachineState),
> + .interfaces = arm_machine_interfaces,
> +};
> +
> +static void orangepi_machine_register_types(void)
> +{
> + type_register_static(&orangepi_machine_typeinfo);
> +}
> +
> +type_init(orangepi_machine_register_types)
> --
> 2.53.0
>
>
