diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-07-07 15:42:53 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-07-14 17:59:42 +0100 |
| commit | 98a99ce0840991ed28fd4c570ae549c371e89970 (patch) | |
| tree | 8e437a7afbf94d498d0579550c0ce6d6d2faed01 /hw/m68k | |
| parent | 96d851a64b42aea4974f2c25a56cd2a05f34905d (diff) | |
hw: Use new memory_region_init_{ram, rom, rom_device}() functions
Use the new functions memory_region_init_{ram,rom,rom_device}()
instead of manually calling the _nomigrate() version and then
vmstate_register_ram_global().
Patch automatically created using coccinelle script:
spatch --in-place -sp_file scripts/coccinelle/memory-region-init-ram.cocci -dir hw
(As it turns out, there are no instances of the rom and
rom_device functions that are caught by this script.)
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1499438577-7674-8-git-send-email-peter.maydell@linaro.org
Diffstat (limited to 'hw/m68k')
| -rw-r--r-- | hw/m68k/an5206.c | 3 | ||||
| -rw-r--r-- | hw/m68k/mcf5208.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/hw/m68k/an5206.c b/hw/m68k/an5206.c index 6fd3c6fd84..c76244176f 100644 --- a/hw/m68k/an5206.c +++ b/hw/m68k/an5206.c @@ -60,8 +60,7 @@ static void an5206_init(MachineState *machine) memory_region_add_subregion(address_space_mem, 0, ram); /* Internal SRAM. */ - memory_region_init_ram_nomigrate(sram, NULL, "an5206.sram", 512, &error_fatal); - vmstate_register_ram_global(sram); + memory_region_init_ram(sram, NULL, "an5206.sram", 512, &error_fatal); memory_region_add_subregion(address_space_mem, AN5206_RAMBAR_ADDR, sram); mcf5206_init(address_space_mem, AN5206_MBAR_ADDR, cpu); diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c index f4abe1dfd9..f4b1387c0d 100644 --- a/hw/m68k/mcf5208.c +++ b/hw/m68k/mcf5208.c @@ -248,8 +248,7 @@ static void mcf5208evb_init(MachineState *machine) memory_region_add_subregion(address_space_mem, 0x40000000, ram); /* Internal SRAM. */ - memory_region_init_ram_nomigrate(sram, NULL, "mcf5208.sram", 16384, &error_fatal); - vmstate_register_ram_global(sram); + memory_region_init_ram(sram, NULL, "mcf5208.sram", 16384, &error_fatal); memory_region_add_subregion(address_space_mem, 0x80000000, sram); /* Internal peripherals. */ |