From 98a99ce0840991ed28fd4c570ae549c371e89970 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Fri, 7 Jul 2017 15:42:53 +0100 Subject: 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 Reviewed-by: Paolo Bonzini Message-id: 1499438577-7674-8-git-send-email-peter.maydell@linaro.org --- hw/moxie/moxiesim.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'hw/moxie') diff --git a/hw/moxie/moxiesim.c b/hw/moxie/moxiesim.c index e18fb74aa6..df3f1249ae 100644 --- a/hw/moxie/moxiesim.c +++ b/hw/moxie/moxiesim.c @@ -128,12 +128,10 @@ static void moxiesim_init(MachineState *machine) qemu_register_reset(main_cpu_reset, cpu); /* Allocate RAM. */ - memory_region_init_ram_nomigrate(ram, NULL, "moxiesim.ram", ram_size, &error_fatal); - vmstate_register_ram_global(ram); + memory_region_init_ram(ram, NULL, "moxiesim.ram", ram_size, &error_fatal); memory_region_add_subregion(address_space_mem, ram_base, ram); - memory_region_init_ram_nomigrate(rom, NULL, "moxie.rom", 128*0x1000, &error_fatal); - vmstate_register_ram_global(rom); + memory_region_init_ram(rom, NULL, "moxie.rom", 128 * 0x1000, &error_fatal); memory_region_add_subregion(get_system_memory(), 0x1000, rom); if (kernel_filename) { -- cgit v1.2.3