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/an5206.c | |
| parent | 8991c79b57b75fcdeb290df89b9b0adaccb0303c (diff) | |
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/an5206.c')
| -rw-r--r-- | hw/an5206.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/an5206.c b/hw/an5206.c index 319a40e1d2..d57306d3ad 100644 --- a/hw/an5206.c +++ b/hw/an5206.c @@ -46,11 +46,13 @@ static void an5206_init(ram_addr_t ram_size, env->rambar0 = AN5206_RAMBAR_ADDR | 1; /* DRAM at address zero */ - memory_region_init_ram(ram, NULL, "an5206.ram", ram_size); + memory_region_init_ram(ram, "an5206.ram", ram_size); + vmstate_register_ram_global(ram); memory_region_add_subregion(address_space_mem, 0, ram); /* Internal SRAM. */ - memory_region_init_ram(sram, NULL, "an5206.sram", 512); + memory_region_init_ram(sram, "an5206.sram", 512); + vmstate_register_ram_global(sram); memory_region_add_subregion(address_space_mem, AN5206_RAMBAR_ADDR, sram); mcf5206_init(address_space_mem, AN5206_MBAR_ADDR, env); |