diff options
| author | Peter Maydell | 2017-07-07 16:42:49 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-07-14 18:59:42 +0200 |
| commit | 1cfe48c1ce219b60a9096312f7a61806fae64ab3 (patch) | |
| tree | 11f1c971d47662d6fcf7adf38a886b822d07981d /hw/arm/omap_sx1.c | |
| parent | memory: Document that the RAM MR initializers do not handle migration (diff) | |
| download | qemu-1cfe48c1ce219b60a9096312f7a61806fae64ab3.tar.gz qemu-1cfe48c1ce219b60a9096312f7a61806fae64ab3.tar.xz 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/omap_sx1.c')
| -rw-r--r-- | hw/arm/omap_sx1.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c index 5d74026cb2..d70c6b60dd 100644 --- a/hw/arm/omap_sx1.c +++ b/hw/arm/omap_sx1.c @@ -123,7 +123,7 @@ static void sx1_init(MachineState *machine, const int version) machine->cpu_model); /* External Flash (EMIFS) */ - memory_region_init_ram(flash, NULL, "omap_sx1.flash0-0", flash_size, + memory_region_init_ram_nomigrate(flash, NULL, "omap_sx1.flash0-0", flash_size, &error_fatal); vmstate_register_ram_global(flash); memory_region_set_readonly(flash, true); @@ -167,7 +167,7 @@ static void sx1_init(MachineState *machine, const int version) if ((version == 1) && (dinfo = drive_get(IF_PFLASH, 0, fl_idx)) != NULL) { MemoryRegion *flash_1 = g_new(MemoryRegion, 1); - memory_region_init_ram(flash_1, NULL, "omap_sx1.flash1-0", flash1_size, + memory_region_init_ram_nomigrate(flash_1, NULL, "omap_sx1.flash1-0", flash1_size, &error_fatal); vmstate_register_ram_global(flash_1); memory_region_set_readonly(flash_1, true); |