diff options
| author | Dirk Müller <dirk@dmllr.de> | 2015-04-04 14:24:38 +0200 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-04-08 17:30:36 +0100 |
| commit | c8623c0215e18eb4a8ec73eba014d97e51ed707e (patch) | |
| tree | 97e3c93bdef107d2b3a4efc8ac0fc6b77fc6c960 /hw/arm/vexpress.c | |
| parent | 5a24f20a7208a58fb80d78ca0521bba6f4d7b145 (diff) | |
| download | qemu-c8623c0215e18eb4a8ec73eba014d97e51ed707e.zip qemu-c8623c0215e18eb4a8ec73eba014d97e51ed707e.tar.gz qemu-c8623c0215e18eb4a8ec73eba014d97e51ed707e.tar.bz2 | |
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 <dmueller@suse.com>
Message-id: CAL5wTH4UHYKpJF=dLJfFzxpufjY189chnCow47-ySuLf8GLbug@mail.gmail.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/arm/vexpress.c')
| -rw-r--r-- | hw/arm/vexpress.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index 54dd967..3989bc5 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); |