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/vexpress.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'hw/arm/vexpress.c') diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index 54dd9673aa..3989bc52b7 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -276,9 +276,8 @@ static void a9_daughterboard_init(const VexpressMachineState *vms, exit(1); } - memory_region_init_ram(ram, NULL, "vexpress.highmem", ram_size, - &error_abort); - vmstate_register_ram_global(ram); + memory_region_allocate_system_memory(ram, NULL, "vexpress.highmem", + ram_size); low_ram_size = ram_size; if (low_ram_size > 0x4000000) { low_ram_size = 0x4000000; @@ -371,9 +370,8 @@ static void a15_daughterboard_init(const VexpressMachineState *vms, } } - memory_region_init_ram(ram, NULL, "vexpress.highmem", ram_size, - &error_abort); - vmstate_register_ram_global(ram); + memory_region_allocate_system_memory(ram, NULL, "vexpress.highmem", + ram_size); /* RAM is from 0x80000000 upwards; there is no low-memory alias for it. */ memory_region_add_subregion(sysmem, 0x80000000, ram); -- cgit 1.4.1