aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDirk Müller <dirk@dmllr.de>2015-04-04 14:15:10 +0200
committerEdgar E. Iglesias <edgar.iglesias@xilinx.com>2015-04-11 20:03:57 +1000
commitc0c8584142a13e728178e51f2477c23a84ce74b4 (patch)
tree17540c02c1da833ba86c5b51c89f7343e2f43686
parent58c24a4775ef7ccf16cfcd695753dfdf149fe29d (diff)
downloadqemu-arm-c0c8584142a13e728178e51f2477c23a84ce74b4.tar.gz
cris: memory: Replace memory_region_init_ram with memory_region_allocate_system_memory
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. Tested-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com> Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com> Cc: Edgar E. Iglesias <edgar.iglesias@gmail.com> Signed-off-by: Dirk Mueller <dmueller@suse.com> Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
-rw-r--r--hw/cris/axis_dev88.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/hw/cris/axis_dev88.c b/hw/cris/axis_dev88.c
index 047919686d..3cae480fa2 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