summaryrefslogtreecommitdiff
path: root/hw/m68k/mcf5208.c
diff options
context:
space:
mode:
authorDirk Müller <dirk@dmllr.de>2015-03-24 23:11:03 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2015-03-25 14:35:24 +0100
commit1d5bfde1b978b57156d851d140b99eac8b2adbe4 (patch)
tree1ffb9da2a07452947419501502137a781681fcb4 /hw/m68k/mcf5208.c
parent78fa62ff1bc0d66f0115b7147c4eb260ad22022a (diff)
m68k: 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 <dmueller@suse.com> Message-Id: <CAL5wTH6X-GsT1AA8kEtP_e7oZWGZgi=fCcDfSs3wLgJN30DbUw@mail.gmail.com> Reviewed-by: Andreas Färber <afaerber@suse.de> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/m68k/mcf5208.c')
-rw-r--r--hw/m68k/mcf5208.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c
index a01a4458e6..326a42d27e 100644
--- a/hw/m68k/mcf5208.c
+++ b/hw/m68k/mcf5208.c
@@ -218,8 +218,7 @@ static void mcf5208evb_init(MachineState *machine)
/* TODO: Configure BARs. */
/* DRAM at 0x40000000 */
- memory_region_init_ram(ram, NULL, "mcf5208.ram", ram_size, &error_abort);
- vmstate_register_ram_global(ram);
+ memory_region_allocate_system_memory(ram, NULL, "mcf5208.ram", ram_size);
memory_region_add_subregion(address_space_mem, 0x40000000, ram);
/* Internal SRAM. */