[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 69/79] sparc/leon3: use memdev for RAM
From: |
Igor Mammedov |
Subject: |
[PATCH v5 69/79] sparc/leon3: use memdev for RAM |
Date: |
Mon, 17 Feb 2020 12:34:42 -0500 |
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>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/sparc/leon3.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c
index f5a087dd86..5fa58aa55f 100644
--- a/hw/sparc/leon3.c
+++ b/hw/sparc/leon3.c
@@ -189,7 +189,6 @@ static void leon3_generic_hw_init(MachineState *machine)
SPARCCPU *cpu;
CPUSPARCState *env;
MemoryRegion *address_space_mem = get_system_memory();
- MemoryRegion *ram = g_new(MemoryRegion, 1);
MemoryRegion *prom = g_new(MemoryRegion, 1);
int ret;
char *filename;
@@ -251,8 +250,8 @@ static void leon3_generic_hw_init(MachineState *machine)
exit(1);
}
- memory_region_allocate_system_memory(ram, NULL, "leon3.ram", ram_size);
- memory_region_add_subregion(address_space_mem, LEON3_RAM_OFFSET, ram);
+ memory_region_add_subregion(address_space_mem, LEON3_RAM_OFFSET,
+ machine->ram);
/* Allocate BIOS */
prom_size = 8 * MiB;
@@ -358,6 +357,7 @@ static void leon3_generic_machine_init(MachineClass *mc)
mc->desc = "Leon-3 generic";
mc->init = leon3_generic_hw_init;
mc->default_cpu_type = SPARC_CPU_TYPE_NAME("LEON3");
+ mc->default_ram_id = "leon3.ram";
}
DEFINE_MACHINE("leon3_generic", leon3_generic_machine_init)
--
2.18.1
- Re: [PATCH v5 61/79] ppc/mac_oldworld: use memdev for RAM, (continued)
- [PATCH v5 63/79] ppc/ppc405_boards: add RAM size checks, Igor Mammedov, 2020/02/17
- [PATCH v5 64/79] ppc/ppc405_boards: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 66/79] ppc/{ppc440_bamboo, sam460ex}: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 68/79] ppc/virtex_ml507: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 69/79] sparc/leon3: use memdev for RAM,
Igor Mammedov <=
- [PATCH v5 67/79] ppc/spapr: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 65/79] ppc/{ppc440_bamboo, sam460ex}: drop RAM size fixup, Igor Mammedov, 2020/02/17
- [PATCH v5 70/79] sparc/sun4m: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 72/79] remove no longer used memory_region_allocate_system_memory(), Igor Mammedov, 2020/02/17
- [PATCH v5 74/79] exec: drop bogus mem_path from qemu_ram_alloc_from_fd(), Igor Mammedov, 2020/02/17