[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v9 47/56] Don't iterate on precopy-only devices duri
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PATCH v9 47/56] Don't iterate on precopy-only devices during postcopy |
Date: |
Thu, 5 Nov 2015 18:11:14 +0000 |
From: "Dr. David Alan Gilbert" <address@hidden>
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 <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
---
include/sysemu/sysemu.h | 2 +-
migration/migration.c | 2 +-
migration/savevm.c | 13 +++++++++++--
3 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index 76a0b36..05d1982 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 71efcac..2198719 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 9fd276e..9794945 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;
}
}
--
2.5.0
- [Qemu-devel] [PATCH v9 40/56] Page request: Add MIG_RP_MSG_REQ_PAGES reverse command, (continued)
- [Qemu-devel] [PATCH v9 40/56] Page request: Add MIG_RP_MSG_REQ_PAGES reverse command, Dr. David Alan Gilbert (git), 2015/11/05
- [Qemu-devel] [PATCH v9 39/56] Postcopy: End of iteration, Dr. David Alan Gilbert (git), 2015/11/05
- [Qemu-devel] [PATCH v9 41/56] Page request: Process incoming page request, Dr. David Alan Gilbert (git), 2015/11/05
- [Qemu-devel] [PATCH v9 42/56] Page request: Consume pages off the post-copy queue, Dr. David Alan Gilbert (git), 2015/11/05
- [Qemu-devel] [PATCH v9 44/56] Postcopy: Use helpers to map pages during migration, Dr. David Alan Gilbert (git), 2015/11/05
- [Qemu-devel] [PATCH v9 43/56] postcopy_ram.c: place_page and helpers, Dr. David Alan Gilbert (git), 2015/11/05
- [Qemu-devel] [PATCH v9 45/56] postcopy: Check order of received target pages, Dr. David Alan Gilbert (git), 2015/11/05
- [Qemu-devel] [PATCH v9 46/56] Don't sync dirty bitmaps in postcopy, Dr. David Alan Gilbert (git), 2015/11/05
- [Qemu-devel] [PATCH v9 47/56] Don't iterate on precopy-only devices during postcopy,
Dr. David Alan Gilbert (git) <=
- [Qemu-devel] [PATCH v9 48/56] Host page!=target page: Cleanup bitmaps, Dr. David Alan Gilbert (git), 2015/11/05
- [Qemu-devel] [PATCH v9 49/56] Round up RAMBlock sizes to host page sizes, Dr. David Alan Gilbert (git), 2015/11/05
- [Qemu-devel] [PATCH v9 50/56] Postcopy; Handle userfault requests, Dr. David Alan Gilbert (git), 2015/11/05
- [Qemu-devel] [PATCH v9 51/56] Start up a postcopy/listener thread ready for incoming page data, Dr. David Alan Gilbert (git), 2015/11/05
- [Qemu-devel] [PATCH v9 52/56] postcopy: Wire up loadvm_postcopy_handle_ commands, Dr. David Alan Gilbert (git), 2015/11/05
- [Qemu-devel] [PATCH v9 53/56] Postcopy: Mark nohugepage before discard, Dr. David Alan Gilbert (git), 2015/11/05
- [Qemu-devel] [PATCH v9 54/56] End of migration for postcopy, Dr. David Alan Gilbert (git), 2015/11/05
- [Qemu-devel] [PATCH v9 55/56] Disable mlock around incoming postcopy, Dr. David Alan Gilbert (git), 2015/11/05
- [Qemu-devel] [PATCH v9 56/56] Inhibit ballooning during postcopy, Dr. David Alan Gilbert (git), 2015/11/05