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/realview.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/realview.c')
| -rw-r--r-- | hw/arm/realview.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/arm/realview.c b/hw/arm/realview.c index b7d4753400..a5e8f86e17 100644 --- a/hw/arm/realview.c +++ b/hw/arm/realview.c @@ -143,13 +143,13 @@ static void realview_init(MachineState *machine, ram_lo = g_new(MemoryRegion, 1); low_ram_size = ram_size - 0x20000000; ram_size = 0x20000000; - memory_region_init_ram(ram_lo, NULL, "realview.lowmem", low_ram_size, + memory_region_init_ram_nomigrate(ram_lo, NULL, "realview.lowmem", low_ram_size, &error_fatal); vmstate_register_ram_global(ram_lo); memory_region_add_subregion(sysmem, 0x20000000, ram_lo); } - memory_region_init_ram(ram_hi, NULL, "realview.highmem", ram_size, + memory_region_init_ram_nomigrate(ram_hi, NULL, "realview.highmem", ram_size, &error_fatal); vmstate_register_ram_global(ram_hi); low_ram_size = ram_size; @@ -345,7 +345,7 @@ static void realview_init(MachineState *machine, startup code. I guess this works on real hardware because the BootROM happens to be in ROM/flash or in memory that isn't clobbered until after Linux boots the secondary CPUs. */ - memory_region_init_ram(ram_hack, NULL, "realview.hack", 0x1000, + memory_region_init_ram_nomigrate(ram_hack, NULL, "realview.hack", 0x1000, &error_fatal); vmstate_register_ram_global(ram_hack); memory_region_add_subregion(sysmem, SMP_BOOT_ADDR, ram_hack); |