aboutsummaryrefslogtreecommitdiff
path: root/arch_init.c
diff options
context:
space:
mode:
authorUmesh Deshpande <udeshpan@redhat.com>2011-08-18 11:41:17 -0700
committerJuan Quintela <quintela@redhat.com>2012-12-20 23:08:47 +0100
commitf798b07f517143df3a1e38bccc3f72ade2f080dc (patch)
tree0ea1d2ebed54e652c12c302711a86f2db72a7d30 /arch_init.c
parentabb26d63e7e4492d306c13b7e0e799d4c11a067c (diff)
downloadqemu-f798b07f517143df3a1e38bccc3f72ade2f080dc.zip
qemu-f798b07f517143df3a1e38bccc3f72ade2f080dc.tar.gz
qemu-f798b07f517143df3a1e38bccc3f72ade2f080dc.tar.bz2
add a version number to ram_list
This will be used to detect if last_block might have become invalid across different calls to ram_save_live. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Umesh Deshpande <udeshpan@redhat.com> Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Diffstat (limited to 'arch_init.c')
-rw-r--r--arch_init.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch_init.c b/arch_init.c
index 5c8df3a..1f737dc 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -336,6 +336,7 @@ static RAMBlock *last_block;
static ram_addr_t last_offset;
static unsigned long *migration_bitmap;
static uint64_t migration_dirty_pages;
+static uint32_t last_version;
static inline bool migration_bitmap_test_and_reset_dirty(MemoryRegion *mr,
ram_addr_t offset)
@@ -406,7 +407,6 @@ static void migration_bitmap_sync(void)
}
}
-
/*
* ram_save_block: Writes a page of memory to the stream f
*
@@ -533,6 +533,7 @@ static void reset_ram_globals(void)
{
last_block = NULL;
last_offset = 0;
+ last_version = ram_list.version;
}
#define MAX_WAIT 50 /* ms, half buffered_file limit */
@@ -587,6 +588,10 @@ static int ram_save_iterate(QEMUFile *f, void *opaque)
uint64_t expected_downtime;
MigrationState *s = migrate_get_current();
+ if (ram_list.version != last_version) {
+ reset_ram_globals();
+ }
+
bytes_transferred_last = bytes_transferred;
bwidth = qemu_get_clock_ns(rt_clock);