| Message ID | 1579779525-20065-54-git-send-email-imammedo@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | refactor main RAM allocation to use hostmem backend | expand |
On Thu, Jan 23, 2020 at 1:15 PM Igor Mammedov <imammedo@redhat.com> 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> > --- > hw/mips/mips_jazz.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > Applied to MIPS queue. > diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c > index 66fd4d8..85d49cf 100644 > --- a/hw/mips/mips_jazz.c > +++ b/hw/mips/mips_jazz.c > @@ -159,7 +159,6 @@ static void mips_jazz_init(MachineState *machine, > ISABus *isa_bus; > ISADevice *pit; > DriveInfo *fds[MAX_FD]; > - MemoryRegion *ram = g_new(MemoryRegion, 1); > MemoryRegion *bios = g_new(MemoryRegion, 1); > MemoryRegion *bios2 = g_new(MemoryRegion, 1); > SysBusESPState *sysbus_esp; > @@ -191,9 +190,7 @@ static void mips_jazz_init(MachineState *machine, > cc->do_transaction_failed = mips_jazz_do_transaction_failed; > > /* allocate RAM */ > - memory_region_allocate_system_memory(ram, NULL, "mips_jazz.ram", > - machine->ram_size); > - memory_region_add_subregion(address_space, 0, ram); > + memory_region_add_subregion(address_space, 0, machine->ram); > > memory_region_init_ram(bios, NULL, "mips_jazz.bios", MAGNUM_BIOS_SIZE, > &error_fatal); > @@ -393,6 +390,7 @@ static void mips_magnum_class_init(ObjectClass *oc, > void *data) > mc->init = mips_magnum_init; > mc->block_default_type = IF_SCSI; > mc->default_cpu_type = MIPS_CPU_TYPE_NAME("R4000"); > + mc->default_ram_id = "mips_jazz.ram"; > } > > static const TypeInfo mips_magnum_type = { > @@ -409,6 +407,7 @@ static void mips_pica61_class_init(ObjectClass *oc, > void *data) > mc->init = mips_pica61_init; > mc->block_default_type = IF_SCSI; > mc->default_cpu_type = MIPS_CPU_TYPE_NAME("R4000"); > + mc->default_ram_id = "mips_jazz.ram"; > } > > static const TypeInfo mips_pica61_type = { > -- > 2.7.4 > > >
diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c index 66fd4d8..85d49cf 100644 --- a/hw/mips/mips_jazz.c +++ b/hw/mips/mips_jazz.c @@ -159,7 +159,6 @@ static void mips_jazz_init(MachineState *machine, ISABus *isa_bus; ISADevice *pit; DriveInfo *fds[MAX_FD]; - MemoryRegion *ram = g_new(MemoryRegion, 1); MemoryRegion *bios = g_new(MemoryRegion, 1); MemoryRegion *bios2 = g_new(MemoryRegion, 1); SysBusESPState *sysbus_esp; @@ -191,9 +190,7 @@ static void mips_jazz_init(MachineState *machine, cc->do_transaction_failed = mips_jazz_do_transaction_failed; /* allocate RAM */ - memory_region_allocate_system_memory(ram, NULL, "mips_jazz.ram", - machine->ram_size); - memory_region_add_subregion(address_space, 0, ram); + memory_region_add_subregion(address_space, 0, machine->ram); memory_region_init_ram(bios, NULL, "mips_jazz.bios", MAGNUM_BIOS_SIZE, &error_fatal); @@ -393,6 +390,7 @@ static void mips_magnum_class_init(ObjectClass *oc, void *data) mc->init = mips_magnum_init; mc->block_default_type = IF_SCSI; mc->default_cpu_type = MIPS_CPU_TYPE_NAME("R4000"); + mc->default_ram_id = "mips_jazz.ram"; } static const TypeInfo mips_magnum_type = { @@ -409,6 +407,7 @@ static void mips_pica61_class_init(ObjectClass *oc, void *data) mc->init = mips_pica61_init; mc->block_default_type = IF_SCSI; mc->default_cpu_type = MIPS_CPU_TYPE_NAME("R4000"); + mc->default_ram_id = "mips_jazz.ram"; } static const TypeInfo mips_pica61_type = {