| Message ID | 1577797450-88458-51-git-send-email-imammedo@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | refactor main RAM allocation to use hostmem backend | expand |
On 31/12/2019 14.03, 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> > --- > hw/m68k/mcf5208.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c > index 158c5e4..d050cb7 100644 > --- a/hw/m68k/mcf5208.c > +++ b/hw/m68k/mcf5208.c > @@ -234,7 +234,6 @@ static void mcf5208evb_init(MachineState *machine) > qemu_irq *pic; > MemoryRegion *address_space_mem = get_system_memory(); > MemoryRegion *rom = g_new(MemoryRegion, 1); > - MemoryRegion *ram = g_new(MemoryRegion, 1); > MemoryRegion *sram = g_new(MemoryRegion, 1); > > cpu = M68K_CPU(cpu_create(machine->cpu_type)); > @@ -249,8 +248,7 @@ static void mcf5208evb_init(MachineState *machine) > memory_region_add_subregion(address_space_mem, 0x00000000, rom); > > /* DRAM at 0x40000000 */ > - memory_region_allocate_system_memory(ram, NULL, "mcf5208.ram", ram_size); > - memory_region_add_subregion(address_space_mem, 0x40000000, ram); > + memory_region_add_subregion(address_space_mem, 0x40000000, machine->ram); > > /* Internal SRAM. */ > memory_region_init_ram(sram, NULL, "mcf5208.sram", 16 * KiB, &error_fatal); > @@ -354,6 +352,7 @@ static void mcf5208evb_machine_init(MachineClass *mc) > mc->init = mcf5208evb_init; > mc->is_default = 1; > mc->default_cpu_type = M68K_CPU_TYPE_NAME("m5208"); > + mc->default_ram_id = "mcf5208.ram"; > } > > DEFINE_MACHINE("mcf5208evb", mcf5208evb_machine_init) > Acked-by: Thomas Huth <thuth@redhat.com>
diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c index 158c5e4..d050cb7 100644 --- a/hw/m68k/mcf5208.c +++ b/hw/m68k/mcf5208.c @@ -234,7 +234,6 @@ static void mcf5208evb_init(MachineState *machine) qemu_irq *pic; MemoryRegion *address_space_mem = get_system_memory(); MemoryRegion *rom = g_new(MemoryRegion, 1); - MemoryRegion *ram = g_new(MemoryRegion, 1); MemoryRegion *sram = g_new(MemoryRegion, 1); cpu = M68K_CPU(cpu_create(machine->cpu_type)); @@ -249,8 +248,7 @@ static void mcf5208evb_init(MachineState *machine) memory_region_add_subregion(address_space_mem, 0x00000000, rom); /* DRAM at 0x40000000 */ - memory_region_allocate_system_memory(ram, NULL, "mcf5208.ram", ram_size); - memory_region_add_subregion(address_space_mem, 0x40000000, ram); + memory_region_add_subregion(address_space_mem, 0x40000000, machine->ram); /* Internal SRAM. */ memory_region_init_ram(sram, NULL, "mcf5208.sram", 16 * KiB, &error_fatal); @@ -354,6 +352,7 @@ static void mcf5208evb_machine_init(MachineClass *mc) mc->init = mcf5208evb_init; mc->is_default = 1; mc->default_cpu_type = M68K_CPU_TYPE_NAME("m5208"); + mc->default_ram_id = "mcf5208.ram"; } DEFINE_MACHINE("mcf5208evb", mcf5208evb_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/m68k/mcf5208.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)