diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-07-07 15:42:49 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-07-14 17:59:42 +0100 |
| commit | 1cfe48c1ce219b60a9096312f7a61806fae64ab3 (patch) | |
| tree | 11f1c971d47662d6fcf7adf38a886b822d07981d /hw/arm/vexpress.c | |
| parent | a5c0234bb2754f5248e67929a34c843dbe039da5 (diff) | |
| download | focaccia-qemu-1cfe48c1ce219b60a9096312f7a61806fae64ab3.tar.gz focaccia-qemu-1cfe48c1ce219b60a9096312f7a61806fae64ab3.zip | |
memory: Rename memory_region_init_ram() to memory_region_init_ram_nomigrate()
Rename memory_region_init_ram() to memory_region_init_ram_nomigrate(). This leaves the way clear for us to provide a memory_region_init_ram() which does handle migration. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Message-id: 1499438577-7674-4-git-send-email-peter.maydell@linaro.org
Diffstat (limited to 'hw/arm/vexpress.c')
| -rw-r--r-- | hw/arm/vexpress.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index c6b1e674b4..874d88500e 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -390,7 +390,7 @@ static void a15_daughterboard_init(const VexpressMachineState *vms, /* 0x2b060000: SP805 watchdog: not modelled */ /* 0x2b0a0000: PL341 dynamic memory controller: not modelled */ /* 0x2e000000: system SRAM */ - memory_region_init_ram(sram, NULL, "vexpress.a15sram", 0x10000, + memory_region_init_ram_nomigrate(sram, NULL, "vexpress.a15sram", 0x10000, &error_fatal); vmstate_register_ram_global(sram); memory_region_add_subregion(sysmem, 0x2e000000, sram); @@ -673,13 +673,13 @@ static void vexpress_common_init(MachineState *machine) } sram_size = 0x2000000; - memory_region_init_ram(sram, NULL, "vexpress.sram", sram_size, + memory_region_init_ram_nomigrate(sram, NULL, "vexpress.sram", sram_size, &error_fatal); vmstate_register_ram_global(sram); memory_region_add_subregion(sysmem, map[VE_SRAM], sram); vram_size = 0x800000; - memory_region_init_ram(vram, NULL, "vexpress.vram", vram_size, + memory_region_init_ram_nomigrate(vram, NULL, "vexpress.vram", vram_size, &error_fatal); vmstate_register_ram_global(vram); memory_region_add_subregion(sysmem, map[VE_VIDEORAM], vram); |