| Message ID | 20200217173452.15243-30-imammedo@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | refactor main RAM allocation to use hostmem backend | expand |
On 2/17/20 6:34 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> > --- > CC: Andrew.Baumann@microsoft.com > CC: philmd@redhat.com > > v5: > * fixed rebase conflicts once more > v4: > * fixed rebase conflicts > --- > hw/arm/raspi.c | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c > index 90ad9b8115..acd2bb794d 100644 > --- a/hw/arm/raspi.c > +++ b/hw/arm/raspi.c > @@ -39,7 +39,6 @@ typedef struct RaspiMachineState { > MachineState parent_obj; > /*< public >*/ > BCM283XState soc; > - MemoryRegion ram; > } RaspiMachineState; > > typedef struct RaspiMachineClass { > @@ -277,16 +276,14 @@ static void raspi_machine_init(MachineState *machine) > exit(1); > } > > - /* Allocate and map RAM */ > - memory_region_allocate_system_memory(&s->ram, OBJECT(machine), "ram", > - machine->ram_size); > /* FIXME: Remove when we have custom CPU address space support */ > - memory_region_add_subregion_overlap(get_system_memory(), 0, &s->ram, 0); > + memory_region_add_subregion_overlap(get_system_memory(), 0, > + machine->ram, 0); > > /* Setup the SOC */ > object_initialize_child(OBJECT(machine), "soc", &s->soc, sizeof(s->soc), > board_soc_type(board_rev), &error_abort, NULL); > - object_property_add_const_link(OBJECT(&s->soc), "ram", OBJECT(&s->ram), > + object_property_add_const_link(OBJECT(&s->soc), "ram", OBJECT(machine->ram), > &error_abort); > object_property_set_int(OBJECT(&s->soc), board_rev, "board-rev", > &error_abort); > @@ -324,6 +321,7 @@ static void raspi_machine_class_init(ObjectClass *oc, void *data) > mc->no_cdrom = 1; > mc->default_cpus = mc->min_cpus = mc->max_cpus = cores_count(board_rev); > mc->default_ram_size = board_ram_size(board_rev); > + mc->default_ram_id = "ram"; > if (board_version(board_rev) == 2) { > mc->ignore_memory_transaction_failures = true; > } >
On 2/17/20 9:34 AM, 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: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index 90ad9b8115..acd2bb794d 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -39,7 +39,6 @@ typedef struct RaspiMachineState { MachineState parent_obj; /*< public >*/ BCM283XState soc; - MemoryRegion ram; } RaspiMachineState; typedef struct RaspiMachineClass { @@ -277,16 +276,14 @@ static void raspi_machine_init(MachineState *machine) exit(1); } - /* Allocate and map RAM */ - memory_region_allocate_system_memory(&s->ram, OBJECT(machine), "ram", - machine->ram_size); /* FIXME: Remove when we have custom CPU address space support */ - memory_region_add_subregion_overlap(get_system_memory(), 0, &s->ram, 0); + memory_region_add_subregion_overlap(get_system_memory(), 0, + machine->ram, 0); /* Setup the SOC */ object_initialize_child(OBJECT(machine), "soc", &s->soc, sizeof(s->soc), board_soc_type(board_rev), &error_abort, NULL); - object_property_add_const_link(OBJECT(&s->soc), "ram", OBJECT(&s->ram), + object_property_add_const_link(OBJECT(&s->soc), "ram", OBJECT(machine->ram), &error_abort); object_property_set_int(OBJECT(&s->soc), board_rev, "board-rev", &error_abort); @@ -324,6 +321,7 @@ static void raspi_machine_class_init(ObjectClass *oc, void *data) mc->no_cdrom = 1; mc->default_cpus = mc->min_cpus = mc->max_cpus = cores_count(board_rev); mc->default_ram_size = board_ram_size(board_rev); + mc->default_ram_id = "ram"; if (board_version(board_rev) == 2) { mc->ignore_memory_transaction_failures = true; }
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> --- CC: Andrew.Baumann@microsoft.com CC: philmd@redhat.com v5: * fixed rebase conflicts once more v4: * fixed rebase conflicts --- hw/arm/raspi.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)