On Sat, Apr 04, 2015 at 02:15:10PM +0200, 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. > > Cc: Edgar E. Iglesias <edgar.igles...@gmail.com> > Signed-off-by: Dirk Mueller <dmuel...@suse.com> > --- > hw/cris/axis_dev88.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-)
Hi, A question, should this only be done for one of the memories? BTW, I'm having problems git am:ing this patch, not sure why... Cheers, Edgar > > diff --git a/hw/cris/axis_dev88.c b/hw/cris/axis_dev88.c > index 0479196..3cae480 100644 > --- a/hw/cris/axis_dev88.c > +++ b/hw/cris/axis_dev88.c > @@ -270,9 +270,8 @@ void axisdev88_init(MachineState *machine) > env = &cpu->env; > > /* allocate RAM */ > - memory_region_init_ram(phys_ram, NULL, "axisdev88.ram", ram_size, > - &error_abort); > - vmstate_register_ram_global(phys_ram); > + memory_region_allocate_system_memory(phys_ram, NULL, "axisdev88.ram", > + ram_size); > memory_region_add_subregion(address_space_mem, 0x40000000, phys_ram); > > /* The ETRAX-FS has 128Kb on chip ram, the docs refer to it as the > -- > 2.0.4
