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 AspeedMachineState.
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]>
---
hw/arm/aspeed.c | 17 +++++++----------
include/hw/arm/aspeed.h | 2 ++
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
index a9238e6217..8fa16b3831 100644
--- a/hw/arm/aspeed.c
+++ b/hw/arm/aspeed.c
@@ -24,10 +24,6 @@
#include "hw/core/qdev-clock.h"
#include "system/system.h"
-static struct arm_boot_info aspeed_board_binfo = {
- .board_id = -1, /* device-tree-only board */
-};
-
#define AST_SMP_MAILBOX_BASE 0x1e6e2180
#define AST_SMP_MBOX_FIELD_ENTRY (AST_SMP_MAILBOX_BASE + 0x0)
#define AST_SMP_MBOX_FIELD_GOSIGN (AST_SMP_MAILBOX_BASE + 0x4)
@@ -206,13 +202,14 @@ static void aspeed_machine_init(MachineState *machine)
memory_region_add_subregion(get_system_memory(),
AST_SMP_MAILBOX_BASE, smpboot);
- aspeed_board_binfo.write_secondary_boot = aspeed_write_smpboot;
- aspeed_board_binfo.secondary_cpu_reset_hook = aspeed_reset_secondary;
- aspeed_board_binfo.smp_loader_start = AST_SMP_MBOX_CODE;
+ bmc->bootinfo.write_secondary_boot = aspeed_write_smpboot;
+ bmc->bootinfo.secondary_cpu_reset_hook = aspeed_reset_secondary;
+ bmc->bootinfo.smp_loader_start = AST_SMP_MBOX_CODE;
}
- aspeed_board_binfo.ram_size = machine->ram_size;
- aspeed_board_binfo.loader_start = sc->memmap[ASPEED_DEV_SDRAM];
+ bmc->bootinfo.board_id = -1; /* device-tree-only board */
+ bmc->bootinfo.ram_size = machine->ram_size;
+ bmc->bootinfo.loader_start = sc->memmap[ASPEED_DEV_SDRAM];
if (amc->i2c_init) {
amc->i2c_init(bmc);
@@ -248,7 +245,7 @@ static void aspeed_machine_init(MachineState *machine)
aspeed_load_vbootrom(bmc->soc, bios_name, &error_abort);
}
- arm_load_kernel(ARM_CPU(first_cpu), machine, &aspeed_board_binfo);
+ arm_load_kernel(ARM_CPU(first_cpu), machine, &bmc->bootinfo);
}
void aspeed_create_pca9552(AspeedSoCState *soc, int bus_id, int addr)
diff --git a/include/hw/arm/aspeed.h b/include/hw/arm/aspeed.h
index a00238ed74..54f0d7643d 100644
--- a/include/hw/arm/aspeed.h
+++ b/include/hw/arm/aspeed.h
@@ -12,6 +12,7 @@
#include "hw/core/boards.h"
#include "qom/object.h"
#include "hw/arm/aspeed_soc.h"
+#include "hw/arm/boot.h"
typedef struct AspeedMachineState AspeedMachineState;
@@ -42,6 +43,7 @@ struct AspeedMachineState {
char *fmc_model;
char *spi_model;
uint32_t hw_strap1;
+ struct arm_boot_info bootinfo;
};
struct AspeedMachineClass {
--
2.53.0
