[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 67/80] ppc/spapr: use memdev for RAM
From: |
Igor Mammedov |
Subject: |
[PATCH v4 67/80] ppc/spapr: use memdev for RAM |
Date: |
Fri, 31 Jan 2020 16:09:37 +0100 |
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>
Acked-by: David Gibson <address@hidden>
---
hw/ppc/spapr.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index a0076e5..b792e72 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -2587,7 +2587,6 @@ static void spapr_machine_init(MachineState *machine)
PCIHostState *phb;
int i;
MemoryRegion *sysmem = get_system_memory();
- MemoryRegion *ram = g_new(MemoryRegion, 1);
hwaddr node0_size = spapr_node0_size(machine);
long load_limit, fw_size;
char *filename;
@@ -2766,10 +2765,8 @@ static void spapr_machine_init(MachineState *machine)
kvmppc_enable_h_page_init();
}
- /* allocate RAM */
- memory_region_allocate_system_memory(ram, NULL, "ppc_spapr.ram",
- machine->ram_size);
- memory_region_add_subregion(sysmem, 0, ram);
+ /* map RAM */
+ memory_region_add_subregion(sysmem, 0, machine->ram);
/* always allocate the device memory information */
machine->device_memory = g_malloc0(sizeof(*machine->device_memory));
@@ -4344,6 +4341,7 @@ static void spapr_machine_class_init(ObjectClass *oc,
void *data)
mc->no_parallel = 1;
mc->default_boot_order = "";
mc->default_ram_size = 512 * MiB;
+ mc->default_ram_id = "ppc_spapr.ram";
mc->default_display = "std";
mc->kvm_type = spapr_kvm_type;
machine_class_allow_dynamic_sysbus_dev(mc, TYPE_SPAPR_PCI_HOST_BRIDGE);
--
2.7.4
- [PATCH v4 55/80] mips/mips_mipssim: use memdev for RAM, (continued)
- [PATCH v4 55/80] mips/mips_mipssim: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 52/80] mips/mips_fulong2e: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 53/80] mips/mips_jazz: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 58/80] ppc/e500: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 57/80] ppc/e500: drop RAM size fixup, Igor Mammedov, 2020/01/31
- [PATCH v4 56/80] mips/mips_r4k: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 54/80] mips/mips_malta: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 60/80] ppc/mac_oldworld: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 61/80] ppc/pnv: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 63/80] ppc/ppc405_boards: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 67/80] ppc/spapr: use memdev for RAM,
Igor Mammedov <=
- [PATCH v4 59/80] ppc/mac_newworld: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 66/80] ppc/prep: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 62/80] ppc/ppc405_boards: add RAM size checks, Igor Mammedov, 2020/01/31
- [PATCH v4 69/80] ppc/virtex_ml507: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 65/80] ppc/{ppc440_bamboo, sam460ex}: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 64/80] ppc/{ppc440_bamboo, sam460ex}: drop RAM size fixup, Igor Mammedov, 2020/01/31
- [PATCH v4 72/80] sparc/niagara: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 68/80] ppc/virtex_ml507: remove unused arguments, Igor Mammedov, 2020/01/31
- [PATCH v4 70/80] sparc/leon3: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 71/80] sparc/sun4m: use memdev for RAM, Igor Mammedov, 2020/01/31