diff options
| author | Shreyas B. Prabhu <shreyas@linux.vnet.ibm.com> | 2014-07-10 17:31:03 +0530 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2014-07-15 16:11:58 +0200 |
| commit | e938ba0c35b0a6732a380b712b0f19511375a6a4 (patch) | |
| tree | b66e0a3ce53e6ad2ea0b87cc3474b9a85b83e8c2 /hw/ppc/prep.c | |
| parent | 063cac5326518abfcd4f3f0eaace3fa9b1a97424 (diff) | |
| download | focaccia-qemu-e938ba0c35b0a6732a380b712b0f19511375a6a4.tar.gz focaccia-qemu-e938ba0c35b0a6732a380b712b0f19511375a6a4.zip | |
ppc: 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: Shreyas B. Prabhu <shreyas@linux.vnet.ibm.com> Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'hw/ppc/prep.c')
| -rw-r--r-- | hw/ppc/prep.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index aa8717d75d..f0ef1af118 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -417,8 +417,7 @@ static void ppc_prep_init(MachineState *machine) } /* allocate RAM */ - memory_region_init_ram(ram, NULL, "ppc_prep.ram", ram_size); - vmstate_register_ram_global(ram); + memory_region_allocate_system_memory(ram, NULL, "ppc_prep.ram", ram_size); memory_region_add_subregion(sysmem, 0, ram); if (linux_boot) { |