| Message ID | 1577797450-88458-73-git-send-email-imammedo@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | refactor main RAM allocation to use hostmem backend | expand |
On 12/31/19 2:03 PM, Igor Mammedov wrote: > 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 <imammedo@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > 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 c5f1b1e..19927d1 100644 > --- a/hw/sparc/leon3.c > +++ b/hw/sparc/leon3.c > @@ -184,7 +184,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; > @@ -244,8 +243,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; > @@ -351,6 +350,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) >
diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c index c5f1b1e..19927d1 100644 --- a/hw/sparc/leon3.c +++ b/hw/sparc/leon3.c @@ -184,7 +184,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; @@ -244,8 +243,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; @@ -351,6 +350,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)
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 <imammedo@redhat.com> --- hw/sparc/leon3.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)