hw/arm: xilinx_zynq: Store boot info in the machine state
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 the boot info into the existing ZynqMachineState. 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 <bin.meng@processmission.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Message-id: 20260816131300.51799-21-bin.meng@processmission.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Bin Meng committed
Aug 16, 2026 at 21:12 UTC
37c0a0059db0dd6f35945196ddb17684c458886a
2 files changed
+10
-9
hw/arm/xilinx_zynq.c
+8
-9
@@ -103,8 +103,6 @@ static void zynq_write_board_setup(ARMCPU *cpu,
103
sizeof(board_setup_blob), BOARD_SETUP_ADDR);
104
}
105
106
-static struct arm_boot_info zynq_binfo = {};
107
-
106
static void gem_init(uint32_t base, qemu_irq irq)
107
{
108
DeviceState *dev;
@@ -268,7 +266,7 @@ static void zynq_init(MachineState *machine)
266
busdev = SYS_BUS_DEVICE(dev);
267
sysbus_realize_and_unref(busdev, &error_fatal);
268
sysbus_mmio_map(busdev, 0, MPCORE_PERIPHBASE);
271
- zynq_binfo.gic_cpu_if_addr = MPCORE_PERIPHBASE + 0x100;
269
+ zynq_machine->bootinfo.gic_cpu_if_addr = MPCORE_PERIPHBASE + 0x100;
270
sysbus_create_varargs("l2x0", MPCORE_PERIPHBASE + 0x2000, NULL);
271
for (n = 0; n < smp_cpus; n++) {
272
/* See "hw/intc/arm_gic.h" for the IRQ line association */
@@ -444,13 +442,14 @@ static void zynq_init(MachineState *machine)
442
create_unimplemented_device("zynq.qos301_dmac", 0xF8947000, 0x130);
443
create_unimplemented_device("zynq.qos301_iou", 0xF8948000, 0x130);
444
447
- zynq_binfo.ram_size = machine->ram_size;
448
- zynq_binfo.board_id = 0xd32;
449
- zynq_binfo.loader_start = 0;
450
- zynq_binfo.board_setup_addr = BOARD_SETUP_ADDR;
451
- zynq_binfo.write_board_setup = zynq_write_board_setup;
445
+ zynq_machine->bootinfo.ram_size = machine->ram_size;
446
+ zynq_machine->bootinfo.board_id = 0xd32;
447
+ zynq_machine->bootinfo.loader_start = 0;
448
+ zynq_machine->bootinfo.board_setup_addr = BOARD_SETUP_ADDR;
449
+ zynq_machine->bootinfo.write_board_setup = zynq_write_board_setup;
450
453
- arm_load_kernel(zynq_machine->cpu[0], machine, &zynq_binfo);
451
+ arm_load_kernel(zynq_machine->cpu[0], machine,
452
+ &zynq_machine->bootinfo);
453
}
454
455
static void zynq_machine_class_init(ObjectClass *oc, const void *data)
include/hw/arm/xilinx_zynq.h
+2
@@ -14,6 +14,7 @@
14
15
#include "target/arm/cpu-qom.h"
16
#include "hw/core/qdev-clock.h"
17
+#include "hw/arm/boot.h"
18
19
#define TYPE_ZYNQ_MACHINE MACHINE_TYPE_NAME("xilinx-zynq-a9")
20
OBJECT_DECLARE_SIMPLE_TYPE(ZynqMachineState, ZYNQ_MACHINE)
@@ -25,6 +26,7 @@ struct ZynqMachineState {
26
Clock *ps_clk;
27
ARMCPU *cpu[ZYNQ_MAX_CPUS];
28
uint8_t boot_mode;
29
+ struct arm_boot_info bootinfo;
30
};
31
32
#endif /* QEMU_ARM_ZYNQ_H */