[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 3/6] Postcopy: Send events/change state on incoming s
From: |
Amit Shah |
Subject: |
[Qemu-devel] [PULL 3/6] Postcopy: Send events/change state on incoming side |
Date: |
Wed, 13 Jan 2016 16:10:44 +0530 |
From: "Dr. David Alan Gilbert" <address@hidden>
I missed the calls to send migration events on the destination side
as we enter postcopy.
Take care when adding them not to do it after state has been freed.
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: zhanghailiang <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Reviewed-by: Amit Shah <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Amit Shah <address@hidden>
---
migration/savevm.c | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/migration/savevm.c b/migration/savevm.c
index 0ad1b93..c469bad 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -1399,6 +1399,8 @@ static void *postcopy_ram_listen_thread(void *opaque)
MigrationIncomingState *mis = migration_incoming_get_current();
int load_res;
+ migrate_set_state(&mis->state, MIGRATION_STATUS_ACTIVE,
+ MIGRATION_STATUS_POSTCOPY_ACTIVE);
qemu_sem_post(&mis->listen_thread_sem);
trace_postcopy_ram_listen_thread_start();
@@ -1415,6 +1417,8 @@ static void *postcopy_ram_listen_thread(void *opaque)
if (load_res < 0) {
error_report("%s: loadvm failed: %d", __func__, load_res);
qemu_file_set_error(f, load_res);
+ migrate_set_state(&mis->state, MIGRATION_STATUS_POSTCOPY_ACTIVE,
+ MIGRATION_STATUS_FAILED);
} else {
/*
* This looks good, but it's possible that the device loading in the
@@ -1424,13 +1428,6 @@ static void *postcopy_ram_listen_thread(void *opaque)
qemu_event_wait(&mis->main_thread_load_event);
}
postcopy_ram_incoming_cleanup(mis);
- /*
- * If everything has worked fine, then the main thread has waited
- * for us to start, and we're the last use of the mis.
- * (If something broke then qemu will have to exit anyway since it's
- * got a bad migration state).
- */
- migration_incoming_state_destroy();
if (load_res < 0) {
/*
@@ -1442,6 +1439,17 @@ static void *postcopy_ram_listen_thread(void *opaque)
exit(EXIT_FAILURE);
}
+ migrate_set_state(&mis->state, MIGRATION_STATUS_POSTCOPY_ACTIVE,
+ MIGRATION_STATUS_COMPLETED);
+ /*
+ * If everything has worked fine, then the main thread has waited
+ * for us to start, and we're the last use of the mis.
+ * (If something broke then qemu will have to exit anyway since it's
+ * got a bad migration state).
+ */
+ migration_incoming_state_destroy();
+
+
return NULL;
}
--
2.5.0
- [Qemu-devel] [PULL 0/6] migration fixes, Amit Shah, 2016/01/13
- [Qemu-devel] [PULL 1/6] migration: Export migrate_set_state(), Amit Shah, 2016/01/13
- [Qemu-devel] [PULL 5/6] Use qemu_get_buffer_in_place for xbzrle data, Amit Shah, 2016/01/13
- [Qemu-devel] [PULL 2/6] migration: Add state records for migration incoming, Amit Shah, 2016/01/13
- [Qemu-devel] [PULL 3/6] Postcopy: Send events/change state on incoming side,
Amit Shah <=
- [Qemu-devel] [PULL 4/6] Migration: Emit event at start of pass, Amit Shah, 2016/01/13
- [Qemu-devel] [PULL 6/6] multithread decompression: Avoid one copy, Amit Shah, 2016/01/13
- Re: [Qemu-devel] [PULL 0/6] migration fixes, Peter Maydell, 2016/01/14