On Thu, Jan 23, 2020 at 1:19 PM Igor Mammedov <imamm...@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 <imamm...@redhat.com>
> Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com>
> Tested-by: Philippe Mathieu-Daudé <phi...@redhat.com>
> ---
> hw/mips/mips_malta.c | 10 ++++------
> 1 file changed, 4 insertions(+), 6 deletions(-)
>
>
Applied to MIPS queue.
> diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
> index 5aaeaa8..77995a5 100644
> --- a/hw/mips/mips_malta.c
> +++ b/hw/mips/mips_malta.c
> @@ -1223,7 +1223,6 @@ void mips_malta_init(MachineState *machine)
> char *filename;
> PFlashCFI01 *fl;
> MemoryRegion *system_memory = get_system_memory();
> - MemoryRegion *ram_high = g_new(MemoryRegion, 1);
> MemoryRegion *ram_low_preio = g_new(MemoryRegion, 1);
> MemoryRegion *ram_low_postio;
> MemoryRegion *bios, *bios_copy = g_new(MemoryRegion, 1);
> @@ -1261,13 +1260,11 @@ void mips_malta_init(MachineState *machine)
> }
>
> /* register RAM at high address where it is undisturbed by IO */
> - memory_region_allocate_system_memory(ram_high, NULL, "mips_malta.ram",
> - ram_size);
> - memory_region_add_subregion(system_memory, 0x80000000, ram_high);
> + memory_region_add_subregion(system_memory, 0x80000000, machine->ram);
>
> /* alias for pre IO hole access */
> memory_region_init_alias(ram_low_preio, NULL,
> "mips_malta_low_preio.ram",
> - ram_high, 0, MIN(ram_size, 256 * MiB));
> + machine->ram, 0, MIN(ram_size, 256 * MiB));
> memory_region_add_subregion(system_memory, 0, ram_low_preio);
>
> /* alias for post IO hole access, if there is enough RAM */
> @@ -1275,7 +1272,7 @@ void mips_malta_init(MachineState *machine)
> ram_low_postio = g_new(MemoryRegion, 1);
> memory_region_init_alias(ram_low_postio, NULL,
> "mips_malta_low_postio.ram",
> - ram_high, 512 * MiB,
> + machine->ram, 512 * MiB,
> ram_size - 512 * MiB);
> memory_region_add_subregion(system_memory, 512 * MiB,
> ram_low_postio);
> @@ -1447,6 +1444,7 @@ static void mips_malta_machine_init(MachineClass *mc)
> #else
> mc->default_cpu_type = MIPS_CPU_TYPE_NAME("24Kf");
> #endif
> + mc->default_ram_id = "mips_malta.ram";
> }
>
> DEFINE_MACHINE("malta", mips_malta_machine_init)
> --
> 2.7.4
>
>
>
