From 6a926fbc6fff58598cce9404019204090a8e8361 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dirk=20M=C3=BCller?= Date: Tue, 24 Mar 2015 22:28:15 +0100 Subject: mips: memory: Replace memory_region_init_ram with memory_region_allocate_system_memory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Reviewed-by: Andreas Färber Acked-by: Leon Alrae Signed-off-by: Paolo Bonzini --- hw/mips/mips_r4k.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'hw/mips/mips_r4k.c') diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c index 52564be692..66e2a58e86 100644 --- a/hw/mips/mips_r4k.c +++ b/hw/mips/mips_r4k.c @@ -205,8 +205,7 @@ void mips_r4k_init(MachineState *machine) ((unsigned int)ram_size / (1 << 20))); exit(1); } - memory_region_init_ram(ram, NULL, "mips_r4k.ram", ram_size, &error_abort); - vmstate_register_ram_global(ram); + memory_region_allocate_system_memory(ram, NULL, "mips_r4k.ram", ram_size); memory_region_add_subregion(address_space_mem, 0, ram); -- cgit v1.2.3