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/sh4 | |
| parent | a5c0234bb2754f5248e67929a34c843dbe039da5 (diff) | |
| download | qemu-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/sh4')
| -rw-r--r-- | hw/sh4/r2d.c | 2 | ||||
| -rw-r--r-- | hw/sh4/shix.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c index e6fc74e..82e3b19 100644 --- a/hw/sh4/r2d.c +++ b/hw/sh4/r2d.c @@ -259,7 +259,7 @@ static void r2d_init(MachineState *machine) qemu_register_reset(main_cpu_reset, reset_info); /* Allocate memory space */ - memory_region_init_ram(sdram, NULL, "r2d.sdram", SDRAM_SIZE, &error_fatal); + memory_region_init_ram_nomigrate(sdram, NULL, "r2d.sdram", SDRAM_SIZE, &error_fatal); vmstate_register_ram_global(sdram); memory_region_add_subregion(address_space_mem, SDRAM_BASE, sdram); /* Register peripherals */ diff --git a/hw/sh4/shix.c b/hw/sh4/shix.c index fd00cc5..bf0d8c3 100644 --- a/hw/sh4/shix.c +++ b/hw/sh4/shix.c @@ -63,15 +63,15 @@ static void shix_init(MachineState *machine) } /* Allocate memory space */ - memory_region_init_ram(rom, NULL, "shix.rom", 0x4000, &error_fatal); + memory_region_init_ram_nomigrate(rom, NULL, "shix.rom", 0x4000, &error_fatal); vmstate_register_ram_global(rom); memory_region_set_readonly(rom, true); memory_region_add_subregion(sysmem, 0x00000000, rom); - memory_region_init_ram(&sdram[0], NULL, "shix.sdram1", 0x01000000, + memory_region_init_ram_nomigrate(&sdram[0], NULL, "shix.sdram1", 0x01000000, &error_fatal); vmstate_register_ram_global(&sdram[0]); memory_region_add_subregion(sysmem, 0x08000000, &sdram[0]); - memory_region_init_ram(&sdram[1], NULL, "shix.sdram2", 0x01000000, + memory_region_init_ram_nomigrate(&sdram[1], NULL, "shix.sdram2", 0x01000000, &error_fatal); vmstate_register_ram_global(&sdram[1]); memory_region_add_subregion(sysmem, 0x0c000000, &sdram[1]); |