diff options
| author | Dirk Müller <dirk@dmllr.de> | 2015-03-24 22:28:15 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-03-25 14:35:31 +0100 |
| commit | 6a926fbc6fff58598cce9404019204090a8e8361 (patch) | |
| tree | 9c83eaafd3858f5a668980188cccf10d9844ca05 /hw/mips/mips_r4k.c | |
| parent | 1d5bfde1b978b57156d851d140b99eac8b2adbe4 (diff) | |
| download | qemu-6a926fbc6fff58598cce9404019204090a8e8361.zip qemu-6a926fbc6fff58598cce9404019204090a8e8361.tar.gz qemu-6a926fbc6fff58598cce9404019204090a8e8361.tar.bz2 | |
mips: 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: <CAL5wTH4-=HJUvwBu+2o6jGanJesJOyNf3sL8-5+d_-6C3cWBfA@mail.gmail.com>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Acked-by: Leon Alrae <leon.alrae@imgtec.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/mips/mips_r4k.c')
| -rw-r--r-- | hw/mips/mips_r4k.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c index 52564be..66e2a58 100644 --- a/hw/mips/mips_r4k.c +++ b/hw/mips/mips_r4k.c @@ -205,8 +205,7 @@ void mips_r4k_init(MachineState *machine) ((unsigned int)ram_size / (1 << 20))); exit(1); } - memory_region_init_ram(ram, NULL, "mips_r4k.ram", ram_size, &error_abort); - vmstate_register_ram_global(ram); + memory_region_allocate_system_memory(ram, NULL, "mips_r4k.ram", ram_size); memory_region_add_subregion(address_space_mem, 0, ram); |