[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 010/136] arm/aspeed: use memdev for RAM
From: |
Paolo Bonzini |
Subject: |
[PULL 010/136] arm/aspeed: use memdev for RAM |
Date: |
Tue, 25 Feb 2020 12:49:00 +0100 |
From: Igor Mammedov <address@hidden>
memory_region_allocate_system_memory() API is going away, so
replace it with memdev allocated MemoryRegion. The later is
initialized by generic code, so board only needs to opt in
to memdev scheme by providing
MachineClass::default_ram_id
and using MachineState::ram instead of manually initializing
RAM memory region.
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Cédric Le Goater <address@hidden>
Acked-by: Joel Stanley <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Message-Id: <address@hidden>
---
hw/arm/aspeed.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
index 805bebd..a6a2102 100644
--- a/hw/arm/aspeed.c
+++ b/hw/arm/aspeed.c
@@ -35,7 +35,6 @@ static struct arm_boot_info aspeed_board_binfo = {
struct AspeedBoardState {
AspeedSoCState soc;
MemoryRegion ram_container;
- MemoryRegion ram;
MemoryRegion max_ram;
};
@@ -197,6 +196,7 @@ static void aspeed_machine_init(MachineState *machine)
memory_region_init(&bmc->ram_container, NULL, "aspeed-ram-container",
UINT32_MAX);
+ memory_region_add_subregion(&bmc->ram_container, 0, machine->ram);
object_initialize_child(OBJECT(machine), "soc", &bmc->soc,
(sizeof(bmc->soc)), amc->soc_name, &error_abort,
@@ -232,8 +232,6 @@ static void aspeed_machine_init(MachineState *machine)
object_property_set_bool(OBJECT(&bmc->soc), true, "realized",
&error_abort);
- memory_region_allocate_system_memory(&bmc->ram, NULL, "ram", ram_size);
- memory_region_add_subregion(&bmc->ram_container, 0, &bmc->ram);
memory_region_add_subregion(get_system_memory(),
sc->memmap[ASPEED_SDRAM],
&bmc->ram_container);
@@ -436,6 +434,7 @@ static void aspeed_machine_class_init(ObjectClass *oc, void
*data)
mc->no_floppy = 1;
mc->no_cdrom = 1;
mc->no_parallel = 1;
+ mc->default_ram_id = "ram";
aspeed_machine_class_props_init(oc);
}
--
1.8.3.1
- [PULL 002/136] machine: introduce memory-backend property, (continued)
- [PULL 002/136] machine: introduce memory-backend property, Paolo Bonzini, 2020/02/25
- [PULL 006/136] vl.c: move -m parsing after memory backends has been processed, Paolo Bonzini, 2020/02/25
- [PULL 012/136] arm/cubieboard: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 009/136] arm/aspeed: actually check RAM size, Paolo Bonzini, 2020/02/25
- [PULL 008/136] alpha/dp264: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 014/136] arm/highbank: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 016/136] arm/imx25_pdk: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 018/136] arm/kzm: drop RAM size fixup, Paolo Bonzini, 2020/02/25
- [PULL 005/136] initialize MachineState::ram in NUMA case, Paolo Bonzini, 2020/02/25
- [PULL 013/136] arm/digic_boards: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 010/136] arm/aspeed: use memdev for RAM,
Paolo Bonzini <=
- [PULL 015/136] arm/imx25_pdk: drop RAM size fixup, Paolo Bonzini, 2020/02/25
- [PULL 022/136] arm/mps2-tz: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 023/136] arm/mps2: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 025/136] arm/nseries: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 017/136] arm/integratorcp: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 027/136] arm/palm: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 024/136] arm/musicpal: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 019/136] arm/kzm: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 020/136] arm/mcimx6ul-evk: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 021/136] arm/mcimx7d-sabre: use memdev for RAM, Paolo Bonzini, 2020/02/25