From 8e7ba4ed3a0b68ab35736c7859fd950f6705e0cf Mon Sep 17 00:00:00 2001 From: Dirk Müller Date: Tue, 24 Mar 2015 22:30:13 +0100 Subject: sparc: 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 Signed-off-by: Paolo Bonzini --- hw/sparc/leon3.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'hw/sparc/leon3.c') diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c index e41ec0bf3a..7f5dcd6d85 100644 --- a/hw/sparc/leon3.c +++ b/hw/sparc/leon3.c @@ -151,8 +151,7 @@ static void leon3_generic_hw_init(MachineState *machine) exit(1); } - memory_region_init_ram(ram, NULL, "leon3.ram", ram_size, &error_abort); - vmstate_register_ram_global(ram); + memory_region_allocate_system_memory(ram, NULL, "leon3.ram", ram_size); memory_region_add_subregion(address_space_mem, 0x40000000, ram); /* Allocate BIOS */ -- cgit 1.4.1