diff options
| author | Avi Kivity <avi@redhat.com> | 2011-12-20 15:59:12 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2012-01-04 13:34:48 +0200 |
| commit | c5705a7728b4a6bc9e4f2d35911adbaf28042b25 (patch) | |
| tree | e96a1e0c9fbd0fa3624b5454038659775c81fba2 /hw/mips_jazz.c | |
| parent | 8991c79b57b75fcdeb290df89b9b0adaccb0303c (diff) | |
| download | qemu-c5705a7728b4a6bc9e4f2d35911adbaf28042b25.zip qemu-c5705a7728b4a6bc9e4f2d35911adbaf28042b25.tar.gz qemu-c5705a7728b4a6bc9e4f2d35911adbaf28042b25.tar.bz2 | |
vmstate, memory: decouple vmstate from memory API
Currently creating a memory region automatically registers it for
live migration. This differs from other state (which is enumerated
in a VMStateDescription structure) and ties the live migration code
into the memory core.
Decouple the two by introducing a separate API, vmstate_register_ram(),
for registering a RAM block for migration. Currently the same
implementation is reused, but later it can be moved into a separate list,
and registrations can be moved to VMStateDescription blocks.
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'hw/mips_jazz.c')
| -rw-r--r-- | hw/mips_jazz.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c index da04982..63165b9 100644 --- a/hw/mips_jazz.c +++ b/hw/mips_jazz.c @@ -146,10 +146,12 @@ static void mips_jazz_init(MemoryRegion *address_space, qemu_register_reset(main_cpu_reset, env); /* allocate RAM */ - memory_region_init_ram(ram, NULL, "mips_jazz.ram", ram_size); + memory_region_init_ram(ram, "mips_jazz.ram", ram_size); + vmstate_register_ram_global(ram); memory_region_add_subregion(address_space, 0, ram); - memory_region_init_ram(bios, NULL, "mips_jazz.bios", MAGNUM_BIOS_SIZE); + memory_region_init_ram(bios, "mips_jazz.bios", MAGNUM_BIOS_SIZE); + vmstate_register_ram_global(bios); memory_region_set_readonly(bios, true); memory_region_init_alias(bios2, "mips_jazz.bios", bios, 0, MAGNUM_BIOS_SIZE); @@ -208,7 +210,8 @@ static void mips_jazz_init(MemoryRegion *address_space, { /* Simple ROM, so user doesn't have to provide one */ MemoryRegion *rom_mr = g_new(MemoryRegion, 1); - memory_region_init_ram(rom_mr, NULL, "g364fb.rom", 0x80000); + memory_region_init_ram(rom_mr, "g364fb.rom", 0x80000); + vmstate_register_ram_global(rom_mr); memory_region_set_readonly(rom_mr, true); uint8_t *rom = memory_region_get_ram_ptr(rom_mr); memory_region_add_subregion(address_space, 0x60000000, rom_mr); |