From c8623c0215e18eb4a8ec73eba014d97e51ed707e Mon Sep 17 00:00:00 2001 From: Dirk Müller Date: Sat, 4 Apr 2015 14:24:38 +0200 Subject: arm: 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. Signed-off-by: Dirk Mueller Message-id: CAL5wTH4UHYKpJF=dLJfFzxpufjY189chnCow47-ySuLf8GLbug@mail.gmail.com Signed-off-by: Peter Maydell --- hw/arm/xilinx_zynq.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'hw/arm/xilinx_zynq.c') diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index 5c37521422..a4e7b5c637 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -161,9 +161,8 @@ static void zynq_init(MachineState *machine) } /* DDR remapped to address zero. */ - memory_region_init_ram(ext_ram, NULL, "zynq.ext_ram", ram_size, - &error_abort); - vmstate_register_ram_global(ext_ram); + memory_region_allocate_system_memory(ext_ram, NULL, "zynq.ext_ram", + ram_size); memory_region_add_subregion(address_space_mem, 0, ext_ram); /* 256K of on-chip memory */ -- cgit 1.4.1