summaryrefslogtreecommitdiff
path: root/migration/migration.c
diff options
context:
space:
mode:
authorDr. David Alan Gilbert <dgilbert@redhat.com>2015-11-05 18:10:54 +0000
committerJuan Quintela <quintela@redhat.com>2015-11-10 15:00:26 +0100
commitc31b098f64c5bbbc26350b9b5cf98ae2d2888de7 (patch)
tree9d4dc89ab0824855de81d16848c1f559b2a5153d /migration/migration.c
parent11cf1d984b86b294972cd25df6286e5b2e98735d (diff)
downloadqemu-c31b098f64c5bbbc26350b9b5cf98ae2d2888de7.zip
Modify save_live_pending for postcopy
Modify save_live_pending to return separate postcopiable and non-postcopiable counts. Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Reviewed-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Amit Shah <amit.shah@redhat.com> Signed-off-by: Juan Quintela <quintela@redhat.com>
Diffstat (limited to 'migration/migration.c')
-rw-r--r--migration/migration.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/migration/migration.c b/migration/migration.c
index 7097e5bfe2..bb4c92ef93 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1288,8 +1288,13 @@ static void *migration_thread(void *opaque)
uint64_t pending_size;
if (!qemu_file_rate_limit(s->file)) {
- pending_size = qemu_savevm_state_pending(s->file, max_size);
- trace_migrate_pending(pending_size, max_size);
+ uint64_t pend_post, pend_nonpost;
+
+ qemu_savevm_state_pending(s->file, max_size, &pend_nonpost,
+ &pend_post);
+ pending_size = pend_nonpost + pend_post;
+ trace_migrate_pending(pending_size, max_size,
+ pend_post, pend_nonpost);
if (pending_size && pending_size >= max_size) {
qemu_savevm_state_iterate(s->file);
} else {