[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH REPOST v3 70/80] sparc/leon3: use memdev for RAM
From: |
Igor Mammedov |
Subject: |
[PATCH REPOST v3 70/80] sparc/leon3: use memdev for RAM |
Date: |
Thu, 23 Jan 2020 12:38:35 +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>
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 8038887..64399eb 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.7.4
- [PATCH REPOST v3 62/80] ppc/ppc405_boards: add RAM size checks, (continued)
- [PATCH REPOST v3 62/80] ppc/ppc405_boards: add RAM size checks, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 65/80] ppc/{ppc440_bamboo, sam460ex}: use memdev for RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 68/80] ppc/virtex_ml507: remove unused arguments, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 64/80] ppc/{ppc440_bamboo, sam460ex}: drop RAM size fixup, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 66/80] ppc/prep: use memdev for RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 70/80] sparc/leon3: use memdev for RAM,
Igor Mammedov <=
- [PATCH REPOST v3 67/80] ppc/spapr: use memdev for RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 71/80] sparc/sun4m: use memdev for RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 72/80] sparc/niagara: use memdev for RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 69/80] ppc/virtex_ml507: use memdev for RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 74/80] exec: cleanup qemu_minrampagesize()/qemu_maxrampagesize(), Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 75/80] exec: drop bogus mem_path from qemu_ram_alloc_from_fd(), Igor Mammedov, 2020/01/23