| Message ID | CAL5wTH6Ky05KMWVR9JacoFjrayQcE0HEsdoxG13gaAL8RMQ=og@mail.gmail.com |
|---|---|
| State | New |
| Headers | show |
Am 2015-04-04 14:16, schrieb Dirk Müller: > 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: Michael Walle <michael@walle.cc> > Signed-off-by: Dirk Mueller <dmueller@suse.com> Acked-by: Michael Walle <michael@walle.cc> Thanks for finding and fixing it. Who will pick this patch? Due to personal matters i won't have time to do it. Sorry :( -michael
On 10 April 2015 at 11:05, Michael Walle <michael@walle.cc> wrote: > Am 2015-04-04 14:16, schrieb Dirk Müller: >> >> 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: Michael Walle <michael@walle.cc> >> Signed-off-by: Dirk Mueller <dmueller@suse.com> > > > Acked-by: Michael Walle <michael@walle.cc> > > Thanks for finding and fixing it. > > Who will pick this patch? Due to personal matters i won't have time to do > it. Sorry :( No problem, applied to master. thanks -- PMM
diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c index af0abdb..14d0efc 100644 --- a/hw/lm32/lm32_boards.c +++ b/hw/lm32/lm32_boards.c @@ -111,9 +111,8 @@ static void lm32_evr_init(MachineState *machine) reset_info->flash_base = flash_base; - memory_region_init_ram(phys_ram, NULL, "lm32_evr.sdram", ram_size, - &error_abort); - vmstate_register_ram_global(phys_ram); + memory_region_allocate_system_memory(phys_ram, NULL, "lm32_evr.sdram", + ram_size); memory_region_add_subregion(address_space_mem, ram_base, phys_ram);c dinfo = drive_get(IF_PFLASH, 0, 0); @@ -214,9 +213,8 @@ static void lm32_uclinux_init(MachineState *machine) reset_info->flash_base = flash_base; - memory_region_init_ram(phys_ram, NULL, "lm32_uclinux.sdram", ram_size, - &error_abort); - vmstate_register_ram_global(phys_ram); + memory_region_allocate_system_memory(phys_ram, NULL, + "lm32_uclinux.sdram", ram_size); memory_region_add_subregion(address_space_mem, ram_base, phys_ram); dinfo = drive_get(IF_PFLASH, 0, 0); diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c index 7f62261..e0cec7d 100644 --- a/hw/lm32/milkymist.c +++ b/hw/lm32/milkymist.c @@ -118,9 +118,8 @@ milkymist_init(MachineState *machine) cpu_lm32_set_phys_msb_ignore(env, 1); - memory_region_init_ram(phys_sdram, NULL, "milkymist.sdram", sdram_size, - &error_abort); - vmstate_register_ram_global(phys_sdram); + memory_region_allocate_system_memory(phys_sdram, NULL, "milkymist.sdram", + sdram_size); memory_region_add_subregion(address_space_mem, sdram_base, phys_sdram); dinfo = drive_get(IF_PFLASH, 0, 0);
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: Michael Walle <michael@walle.cc> Signed-off-by: Dirk Mueller <dmueller@suse.com> --- hw/lm32/lm32_boards.c | 10 ++++------ hw/lm32/milkymist.c | 5 ++--- 2 files changed, 6 insertions(+), 9 deletions(-)