| Message ID | 1579100861-73692-17-git-send-email-imammedo@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | refactor main RAM allocation to use hostmem backend | expand |
On 1/15/20 4:06 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> > --- > CC: jcd@tribudubois.net > CC: peter.maydell@linaro.org > CC: qemu-arm@nongnu.org > --- > hw/arm/imx25_pdk.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/hw/arm/imx25_pdk.c b/hw/arm/imx25_pdk.c > index a2b7b35..9087fcb 100644 > --- a/hw/arm/imx25_pdk.c > +++ b/hw/arm/imx25_pdk.c > @@ -58,7 +58,6 @@ > > typedef struct IMX25PDK { > FslIMX25State soc; > - MemoryRegion ram; > MemoryRegion ram_alias; > } IMX25PDK; > > @@ -84,10 +83,8 @@ static void imx25_pdk_init(MachineState *machine) > exit(EXIT_FAILURE); > } > > - memory_region_allocate_system_memory(&s->ram, NULL, "imx25.ram", > - machine->ram_size); > memory_region_add_subregion(get_system_memory(), FSL_IMX25_SDRAM0_ADDR, > - &s->ram); > + machine->ram); > > /* initialize the alias memory if any */ > for (i = 0, ram_size = machine->ram_size, alias_offset = 0; > @@ -107,7 +104,8 @@ static void imx25_pdk_init(MachineState *machine) > > if (size < ram[i].size) { > memory_region_init_alias(&s->ram_alias, NULL, "ram.alias", > - &s->ram, alias_offset, ram[i].size - size); > + machine->ram, > + alias_offset, ram[i].size - size); > memory_region_add_subregion(get_system_memory(), > ram[i].addr + size, &s->ram_alias); > } > @@ -135,6 +133,7 @@ static void imx25_pdk_machine_init(MachineClass *mc) > mc->desc = "ARM i.MX25 PDK board (ARM926)"; > mc->init = imx25_pdk_init; > mc->ignore_memory_transaction_failures = true; > + mc->default_ram_id = "imx25.ram"; > } > > DEFINE_MACHINE("imx25-pdk", imx25_pdk_machine_init) > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
diff --git a/hw/arm/imx25_pdk.c b/hw/arm/imx25_pdk.c index a2b7b35..9087fcb 100644 --- a/hw/arm/imx25_pdk.c +++ b/hw/arm/imx25_pdk.c @@ -58,7 +58,6 @@ typedef struct IMX25PDK { FslIMX25State soc; - MemoryRegion ram; MemoryRegion ram_alias; } IMX25PDK; @@ -84,10 +83,8 @@ static void imx25_pdk_init(MachineState *machine) exit(EXIT_FAILURE); } - memory_region_allocate_system_memory(&s->ram, NULL, "imx25.ram", - machine->ram_size); memory_region_add_subregion(get_system_memory(), FSL_IMX25_SDRAM0_ADDR, - &s->ram); + machine->ram); /* initialize the alias memory if any */ for (i = 0, ram_size = machine->ram_size, alias_offset = 0; @@ -107,7 +104,8 @@ static void imx25_pdk_init(MachineState *machine) if (size < ram[i].size) { memory_region_init_alias(&s->ram_alias, NULL, "ram.alias", - &s->ram, alias_offset, ram[i].size - size); + machine->ram, + alias_offset, ram[i].size - size); memory_region_add_subregion(get_system_memory(), ram[i].addr + size, &s->ram_alias); } @@ -135,6 +133,7 @@ static void imx25_pdk_machine_init(MachineClass *mc) mc->desc = "ARM i.MX25 PDK board (ARM926)"; mc->init = imx25_pdk_init; mc->ignore_memory_transaction_failures = true; + mc->default_ram_id = "imx25.ram"; } DEFINE_MACHINE("imx25-pdk", imx25_pdk_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> --- CC: jcd@tribudubois.net CC: peter.maydell@linaro.org CC: qemu-arm@nongnu.org --- hw/arm/imx25_pdk.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)