diff options
Diffstat (limited to 'hw/sh4')
| -rw-r--r-- | hw/sh4/r2d.c | 3 | ||||
| -rw-r--r-- | hw/sh4/shix.c | 9 |
2 files changed, 4 insertions, 8 deletions
diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c index 82e3b1955c..a0462adb97 100644 --- a/hw/sh4/r2d.c +++ b/hw/sh4/r2d.c @@ -259,8 +259,7 @@ static void r2d_init(MachineState *machine) qemu_register_reset(main_cpu_reset, reset_info); /* Allocate memory space */ - memory_region_init_ram_nomigrate(sdram, NULL, "r2d.sdram", SDRAM_SIZE, &error_fatal); - vmstate_register_ram_global(sdram); + memory_region_init_ram(sdram, NULL, "r2d.sdram", SDRAM_SIZE, &error_fatal); memory_region_add_subregion(address_space_mem, SDRAM_BASE, sdram); /* Register peripherals */ s = sh7750_init(cpu, address_space_mem); diff --git a/hw/sh4/shix.c b/hw/sh4/shix.c index bf0d8c3475..e22eaf0c8f 100644 --- a/hw/sh4/shix.c +++ b/hw/sh4/shix.c @@ -63,17 +63,14 @@ static void shix_init(MachineState *machine) } /* Allocate memory space */ - memory_region_init_ram_nomigrate(rom, NULL, "shix.rom", 0x4000, &error_fatal); - vmstate_register_ram_global(rom); + memory_region_init_ram(rom, NULL, "shix.rom", 0x4000, &error_fatal); memory_region_set_readonly(rom, true); memory_region_add_subregion(sysmem, 0x00000000, rom); - memory_region_init_ram_nomigrate(&sdram[0], NULL, "shix.sdram1", 0x01000000, + memory_region_init_ram(&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_nomigrate(&sdram[1], NULL, "shix.sdram2", 0x01000000, + memory_region_init_ram(&sdram[1], NULL, "shix.sdram2", 0x01000000, &error_fatal); - vmstate_register_ram_global(&sdram[1]); memory_region_add_subregion(sysmem, 0x0c000000, &sdram[1]); /* Load BIOS in 0 (and access it through P2, 0xA0000000) */ |