Commit 8e7ba4ed authored by Dirk Müller's avatar Dirk Müller Committed by Paolo Bonzini
Browse files

sparc: 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: <CAL5wTH7o8uA59Ep0n41i0M19VFWa73n9m172j2W3fjz6=PSVBA@mail.gmail.com>
Reviewed-by: default avatarAndreas Färber <afaerber@suse.de>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 6a926fbc

hw/sparc/leon3.c

+1 −2
Original line number Diff line number Diff line
@@ -151,8 +151,7 @@ static void leon3_generic_hw_init(MachineState *machine) 
        exit(1);

    }



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

    vmstate_register_ram_global(ram);

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

    memory_region_add_subregion(address_space_mem, 0x40000000, ram);



    /* Allocate BIOS */

hw/sparc/sun4m.c

+2 −3
Original line number Diff line number Diff line
@@ -805,9 +805,8 @@ static int ram_init1(SysBusDevice *dev) 
{

    RamDevice *d = SUN4M_RAM(dev);



    memory_region_init_ram(&d->ram, OBJECT(d), "sun4m.ram", d->size,

                           &error_abort);

    vmstate_register_ram_global(&d->ram);

    memory_region_allocate_system_memory(&d->ram, OBJECT(d), "sun4m.ram",

                                         d->size);

    sysbus_init_mmio(dev, &d->ram);

    return 0;

}