aboutsummaryrefslogtreecommitdiff
path: root/hw/cris
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-07-07 15:42:49 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-07-14 17:59:42 +0100
commit1cfe48c1ce219b60a9096312f7a61806fae64ab3 (patch)
tree11f1c971d47662d6fcf7adf38a886b822d07981d /hw/cris
parenta5c0234bb2754f5248e67929a34c843dbe039da5 (diff)
downloadqemu-1cfe48c1ce219b60a9096312f7a61806fae64ab3.zip
qemu-1cfe48c1ce219b60a9096312f7a61806fae64ab3.tar.gz
qemu-1cfe48c1ce219b60a9096312f7a61806fae64ab3.tar.bz2
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/cris')
-rw-r--r--hw/cris/axis_dev88.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/cris/axis_dev88.c b/hw/cris/axis_dev88.c
index 60df887..8a2564d 100644
--- a/hw/cris/axis_dev88.c
+++ b/hw/cris/axis_dev88.c
@@ -281,7 +281,7 @@ void axisdev88_init(MachineState *machine)
/* The ETRAX-FS has 128Kb on chip ram, the docs refer to it as the
internal memory. */
- memory_region_init_ram(phys_intmem, NULL, "axisdev88.chipram", INTMEM_SIZE,
+ memory_region_init_ram_nomigrate(phys_intmem, NULL, "axisdev88.chipram", INTMEM_SIZE,
&error_fatal);
vmstate_register_ram_global(phys_intmem);
memory_region_add_subregion(address_space_mem, 0x38000000, phys_intmem);