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/digic_boards.c | |
| parent | 5a24f20a7208a58fb80d78ca0521bba6f4d7b145 (diff) | |
| download | focaccia-qemu-c8623c0215e18eb4a8ec73eba014d97e51ed707e.tar.gz focaccia-qemu-c8623c0215e18eb4a8ec73eba014d97e51ed707e.zip | |
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/digic_boards.c')
| -rw-r--r-- | hw/arm/digic_boards.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c index e576646e86..f8ba9e5958 100644 --- a/hw/arm/digic_boards.c +++ b/hw/arm/digic_boards.c @@ -51,9 +51,8 @@ typedef struct DigicBoard { static void digic4_board_setup_ram(DigicBoardState *s, hwaddr ram_size) { - memory_region_init_ram(&s->ram, NULL, "ram", ram_size, &error_abort); + memory_region_allocate_system_memory(&s->ram, NULL, "ram", ram_size); memory_region_add_subregion(get_system_memory(), 0, &s->ram); - vmstate_register_ram_global(&s->ram); } static void digic4_board_init(DigicBoard *board) |