On Thu, Jan 23, 2020 at 1:22 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_mipssim.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
>
Applied to MIPS queue.
> diff --git a/hw/mips/mips_mipssim.c b/hw/mips/mips_mipssim.c
> index 84c03dd..8df16d8 100644
> --- a/hw/mips/mips_mipssim.c
> +++ b/hw/mips/mips_mipssim.c
> @@ -143,14 +143,12 @@ static void mipsnet_init(int base, qemu_irq irq,
> NICInfo *nd)
> static void
> mips_mipssim_init(MachineState *machine)
> {
> - ram_addr_t ram_size = machine->ram_size;
> const char *kernel_filename = machine->kernel_filename;
> const char *kernel_cmdline = machine->kernel_cmdline;
> const char *initrd_filename = machine->initrd_filename;
> char *filename;
> MemoryRegion *address_space_mem = get_system_memory();
> MemoryRegion *isa = g_new(MemoryRegion, 1);
> - MemoryRegion *ram = g_new(MemoryRegion, 1);
> MemoryRegion *bios = g_new(MemoryRegion, 1);
> MIPSCPU *cpu;
> CPUMIPSState *env;
> @@ -167,13 +165,11 @@ mips_mipssim_init(MachineState *machine)
> qemu_register_reset(main_cpu_reset, reset_info);
>
> /* Allocate RAM. */
> - memory_region_allocate_system_memory(ram, NULL, "mips_mipssim.ram",
> - ram_size);
> memory_region_init_ram(bios, NULL, "mips_mipssim.bios", BIOS_SIZE,
> &error_fatal);
> memory_region_set_readonly(bios, true);
>
> - memory_region_add_subregion(address_space_mem, 0, ram);
> + memory_region_add_subregion(address_space_mem, 0, machine->ram);
>
> /* Map the BIOS / boot exception handler. */
> memory_region_add_subregion(address_space_mem, 0x1fc00000LL, bios);
> @@ -200,7 +196,7 @@ mips_mipssim_init(MachineState *machine)
> }
>
> if (kernel_filename) {
> - loaderparams.ram_size = ram_size;
> + loaderparams.ram_size = machine->ram_size;
> loaderparams.kernel_filename = kernel_filename;
> loaderparams.kernel_cmdline = kernel_cmdline;
> loaderparams.initrd_filename = initrd_filename;
> @@ -245,6 +241,7 @@ static void mips_mipssim_machine_init(MachineClass *mc)
> #else
> mc->default_cpu_type = MIPS_CPU_TYPE_NAME("24Kf");
> #endif
> + mc->default_ram_id = "mips_mipssim.ram";
> }
>
> DEFINE_MACHINE("mipssim", mips_mipssim_machine_init)
> --
> 2.7.4
>
>
>
