On 24/03/2015 22:26, Dirk Müller wrote: > Commit 0b183fc871:"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: Dirk Mueller <dmuel...@suse.com> > --- > hw/m68k/an5206.c | 3 +-- > hw/m68k/dummy_m68k.c | 3 ++- > hw/m68k/mcf5208.c | 3 +-- > 3 files changed, 4 insertions(+), 5 deletions(-) > > diff --git a/hw/m68k/an5206.c b/hw/m68k/an5206.c > index f1f1350..f63ab2b 100644 > --- a/hw/m68k/an5206.c > +++ b/hw/m68k/an5206.c > @@ -50,8 +50,7 @@ static void an5206_init(MachineState *machine) > env->rambar0 = AN5206_RAMBAR_ADDR | 1; > > /* DRAM at address zero */ > - memory_region_init_ram(ram, NULL, "an5206.ram", ram_size, &error_abort); > - vmstate_register_ram_global(ram); > + memory_region_allocate_system_memory(ram, NULL, "an5206.ram", ram_size); > memory_region_add_subregion(address_space_mem, 0, ram); > > /* Internal SRAM. */ > diff --git a/hw/m68k/dummy_m68k.c b/hw/m68k/dummy_m68k.c > index 278f4c0..6e5fa50 100644 > --- a/hw/m68k/dummy_m68k.c > +++ b/hw/m68k/dummy_m68k.c > @@ -42,7 +42,8 @@ static void dummy_m68k_init(MachineState *machine) > env->vbr = 0; > > /* RAM at address zero */ > - memory_region_init_ram(ram, NULL, "dummy_m68k.ram", ram_size, > &error_abort); > + memory_region_allocate_system_memory(ram, NULL, "dummy_m68k.ram", > + ram_size); > vmstate_register_ram_global(ram);
You need to remove vmstate_register_ram_global too. Paolo > memory_region_add_subregion(address_space_mem, 0, ram); > > diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c > index a01a445..326a42d 100644 > --- a/hw/m68k/mcf5208.c > +++ b/hw/m68k/mcf5208.c > @@ -218,8 +218,7 @@ static void mcf5208evb_init(MachineState *machine) > /* TODO: Configure BARs. */ > > /* DRAM at 0x40000000 */ > - memory_region_init_ram(ram, NULL, "mcf5208.ram", ram_size, &error_abort); > - vmstate_register_ram_global(ram); > + memory_region_allocate_system_memory(ram, NULL, "mcf5208.ram", ram_size); > memory_region_add_subregion(address_space_mem, 0x40000000, ram); > > /* Internal SRAM. */ >
