diff options
| author | Dr. David Alan Gilbert <dgilbert@redhat.com> | 2015-11-05 18:11:14 +0000 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2015-11-10 15:00:28 +0100 |
| commit | 35ecd943e7ea8a29b6cc6872ad8ba620e91b4407 (patch) | |
| tree | 28a2971c2768c387af8bf499814fbfe0f3239b62 | |
| parent | 663e6c1df8721960c0a3bb6cd5dd047b610c3bad (diff) | |
| download | focaccia-qemu-35ecd943e7ea8a29b6cc6872ad8ba620e91b4407.tar.gz focaccia-qemu-35ecd943e7ea8a29b6cc6872ad8ba620e91b4407.zip | |
Don't iterate on precopy-only devices during postcopy
During the postcopy phase we must not call the iterate method on precopy-only devices, since they may have done some cleanup during the _complete call at the end of the precopy phase. Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Reviewed-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Juan Quintela <quintela@redhat.com>
| -rw-r--r-- | include/sysemu/sysemu.h | 2 | ||||
| -rw-r--r-- | migration/migration.c | 2 | ||||
| -rw-r--r-- | migration/savevm.c | 13 |
3 files changed, 13 insertions, 4 deletions
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 76a0b36497..05d1982bda 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -109,7 +109,7 @@ bool qemu_savevm_state_blocked(Error **errp); void qemu_savevm_state_begin(QEMUFile *f, const MigrationParams *params); void qemu_savevm_state_header(QEMUFile *f); -int qemu_savevm_state_iterate(QEMUFile *f); +int qemu_savevm_state_iterate(QEMUFile *f, bool postcopy); void qemu_savevm_state_cleanup(void); void qemu_savevm_state_complete_postcopy(QEMUFile *f); void qemu_savevm_state_complete_precopy(QEMUFile *f); diff --git a/migration/migration.c b/migration/migration.c index 7d64cd3240..38d64ea58b 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1628,7 +1628,7 @@ static void *migration_thread(void *opaque) continue; } /* Just another iteration step */ - qemu_savevm_state_iterate(s->file); + qemu_savevm_state_iterate(s->file, entered_postcopy); } else { trace_migration_thread_low_pending(pending_size); migration_completion(s, current_active_state, diff --git a/migration/savevm.c b/migration/savevm.c index a7210a22b4..308b7d1812 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -931,7 +931,7 @@ void qemu_savevm_state_begin(QEMUFile *f, * 0 : We haven't finished, caller have to go again * 1 : We have finished, we can go to complete phase */ -int qemu_savevm_state_iterate(QEMUFile *f) +int qemu_savevm_state_iterate(QEMUFile *f, bool postcopy) { SaveStateEntry *se; int ret = 1; @@ -946,6 +946,15 @@ int qemu_savevm_state_iterate(QEMUFile *f) continue; } } + /* + * In the postcopy phase, any device that doesn't know how to + * do postcopy should have saved it's state in the _complete + * call that's already run, it might get confused if we call + * iterate afterwards. + */ + if (postcopy && !se->ops->save_live_complete_postcopy) { + continue; + } if (qemu_file_rate_limit(f)) { return 0; } @@ -1160,7 +1169,7 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp) qemu_mutex_lock_iothread(); while (qemu_file_get_error(f) == 0) { - if (qemu_savevm_state_iterate(f) > 0) { + if (qemu_savevm_state_iterate(f, false) > 0) { break; } } |