Commit 6a926fbc authored by Dirk Müller's avatar Dirk Müller Committed by Paolo Bonzini
Browse files

mips: memory: Replace memory_region_init_ram with memory_region_allocate_system_memory 



Commit 0b183fc8:"memory: move mem_path handling to
memory_region_allocate_system_memory" split memory_region_init_ram and
memory_region_init_ram_from_file. Also it moved mem-path handling a step
up from memory_region_init_ram to memory_region_allocate_system_memory.

Therefore for any board that uses memory_region_init_ram directly,
-mem-path is not supported.

Fix this by replacing memory_region_init_ram with
memory_region_allocate_system_memory.

Signed-off-by: default avatarDirk Mueller <dmueller@suse.com>
Message-Id: <CAL5wTH4-=HJUvwBu+2o6jGanJesJOyNf3sL8-5+d_-6C3cWBfA@mail.gmail.com>
Reviewed-by: default avatarAndreas Färber <afaerber@suse.de>
Acked-by: default avatarLeon Alrae <leon.alrae@imgtec.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 1d5bfde1

hw/mips/mips_fulong2e.c

+1 −2
Original line number Diff line number Diff line
@@ -301,8 +301,7 @@ static void mips_fulong2e_init(MachineState *machine) 
    bios_size = 1024 * 1024;



    /* allocate RAM */

    memory_region_init_ram(ram, NULL, "fulong2e.ram", ram_size, &error_abort);

    vmstate_register_ram_global(ram);

    memory_region_allocate_system_memory(ram, NULL, "fulong2e.ram", ram_size);

    memory_region_init_ram(bios, NULL, "fulong2e.bios", bios_size,

                           &error_abort);

    vmstate_register_ram_global(bios);

hw/mips/mips_jazz.c

+2 −3
Original line number Diff line number Diff line
@@ -182,9 +182,8 @@ static void mips_jazz_init(MachineState *machine, 
    cc->do_unassigned_access = mips_jazz_do_unassigned_access;



    /* allocate RAM */

    memory_region_init_ram(ram, NULL, "mips_jazz.ram", machine->ram_size,

                           &error_abort);

    vmstate_register_ram_global(ram);

    memory_region_allocate_system_memory(ram, NULL, "mips_jazz.ram",

                                         machine->ram_size);

    memory_region_add_subregion(address_space, 0, ram);



    memory_region_init_ram(bios, NULL, "mips_jazz.bios", MAGNUM_BIOS_SIZE,

hw/mips/mips_malta.c

+2 −3
Original line number Diff line number Diff line
@@ -993,9 +993,8 @@ void mips_malta_init(MachineState *machine) 
    }



    /* register RAM at high address where it is undisturbed by IO */

    memory_region_init_ram(ram_high, NULL, "mips_malta.ram", ram_size,

                           &error_abort);

    vmstate_register_ram_global(ram_high);

    memory_region_allocate_system_memory(ram_high, NULL, "mips_malta.ram",

                                         ram_size);

    memory_region_add_subregion(system_memory, 0x80000000, ram_high);



    /* alias for pre IO hole access */

hw/mips/mips_mipssim.c

+2 −3
Original line number Diff line number Diff line
@@ -171,9 +171,8 @@ mips_mipssim_init(MachineState *machine) 
    qemu_register_reset(main_cpu_reset, reset_info);



    /* Allocate RAM. */

    memory_region_init_ram(ram, NULL, "mips_mipssim.ram", ram_size,

                           &error_abort);

    vmstate_register_ram_global(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_abort);

    vmstate_register_ram_global(bios);

hw/mips/mips_r4k.c

+1 −2
Original line number Diff line number Diff line
@@ -205,8 +205,7 @@ void mips_r4k_init(MachineState *machine) 
                ((unsigned int)ram_size / (1 << 20)));

        exit(1);

    }

    memory_region_init_ram(ram, NULL, "mips_r4k.ram", ram_size, &error_abort);

    vmstate_register_ram_global(ram);

    memory_region_allocate_system_memory(ram, NULL, "mips_r4k.ram", ram_size);



    memory_region_add_subregion(address_space_mem, 0, ram);