From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52306) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YvLcf-0002BC-TT for qemu-devel@nongnu.org; Thu, 21 May 2015 04:14:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YvLcd-0002h7-C9 for qemu-devel@nongnu.org; Thu, 21 May 2015 04:14:33 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:55035) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YvLcc-0002g6-M3 for qemu-devel@nongnu.org; Thu, 21 May 2015 04:14:31 -0400 From: zhanghailiang Date: Thu, 21 May 2015 16:12:57 +0800 Message-ID: <1432196001-10352-6-git-send-email-zhang.zhanghailiang@huawei.com> In-Reply-To: <1432196001-10352-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1432196001-10352-1-git-send-email-zhang.zhanghailiang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH COLO-Frame v5 05/29] migration: Integrate COLO checkpoint process into loadvm List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: lizhijian@cn.fujitsu.com, quintela@redhat.com, yunhong.jiang@intel.com, eddie.dong@intel.com, peter.huangpeng@huawei.com, dgilbert@redhat.com, zhanghailiang , arei.gonglei@huawei.com, amit.shah@redhat.com, Lai Jiangshan , Yang Hongyang , david@gibson.dropbear.id.au Switch from normal migration loadvm process into COLO checkpoint process if COLO mode is enabled. Signed-off-by: zhanghailiang Signed-off-by: Li Zhijian Signed-off-by: Lai Jiangshan Signed-off-by: Yang Hongyang --- include/migration/migration-colo.h | 13 +++++++++++++ migration/colo-comm.c | 10 ++++++++++ migration/colo.c | 15 +++++++++++++++ migration/migration.c | 21 ++++++++++++++++++++- stubs/migration-colo.c | 5 +++++ trace-events | 1 + 6 files changed, 64 insertions(+), 1 deletion(-) diff --git a/include/migration/migration-colo.h b/include/migration/migration-colo.h index b4f75c2..b2798f7 100644 --- a/include/migration/migration-colo.h +++ b/include/migration/migration-colo.h @@ -15,11 +15,24 @@ #include "qemu-common.h" #include "migration/migration.h" +#include "block/coroutine.h" +#include "qemu/thread.h" bool colo_supported(void); void colo_info_mig_init(void); +struct colo_incoming { + QEMUFile *file; + QemuThread thread; +}; + void colo_init_checkpointer(MigrationState *s); bool migrate_in_colo_state(void); +/* loadvm */ +extern Coroutine *migration_incoming_co; +bool loadvm_enable_colo(void); +void loadvm_exit_colo(void); +void *colo_process_incoming_checkpoints(void *opaque); +bool loadvm_in_colo_state(void); #endif diff --git a/migration/colo-comm.c b/migration/colo-comm.c index 0b76eb4..f8be027 100644 --- a/migration/colo-comm.c +++ b/migration/colo-comm.c @@ -45,3 +45,13 @@ void colo_info_mig_init(void) register_savevm_live(NULL, "colo", -1, 1, &savevm_colo_info_handlers, NULL); } + +bool loadvm_enable_colo(void) +{ + return colo_requested; +} + +void loadvm_exit_colo(void) +{ + colo_requested = false; +} diff --git a/migration/colo.c b/migration/colo.c index 1ff4e55..33d3105 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -13,8 +13,10 @@ #include "sysemu/sysemu.h" #include "migration/migration-colo.h" #include "trace.h" +#include "qemu/error-report.h" static QEMUBH *colo_bh; +static Coroutine *colo; bool colo_supported(void) { @@ -71,3 +73,16 @@ void colo_init_checkpointer(MigrationState *s) colo_bh = qemu_bh_new(colo_start_checkpointer, s); qemu_bh_schedule(colo_bh); } + +void *colo_process_incoming_checkpoints(void *opaque) +{ + colo = qemu_coroutine_self(); + assert(colo != NULL); + + /* TODO: COLO checkpoint restore loop */ + + colo = NULL; + loadvm_exit_colo(); + + return NULL; +} diff --git a/migration/migration.c b/migration/migration.c index eea31f4..fc79ab8 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -110,6 +110,7 @@ void qemu_start_incoming_migration(const char *uri, Error **errp) } } +Coroutine *migration_incoming_co; static void process_incoming_migration_co(void *opaque) { QEMUFile *f = opaque; @@ -117,7 +118,25 @@ static void process_incoming_migration_co(void *opaque) int ret; ret = qemu_loadvm_state(f); - qemu_fclose(f); + + /* we get colo info, and know if we are in colo mode */ + if (loadvm_enable_colo()) { + struct colo_incoming *colo_in = g_malloc0(sizeof(*colo_in)); + + colo_in->file = f; + migration_incoming_co = qemu_coroutine_self(); + qemu_thread_create(&colo_in->thread, "colo incoming", + colo_process_incoming_checkpoints, colo_in, QEMU_THREAD_JOINABLE); + qemu_coroutine_yield(); + migration_incoming_co = NULL; +#if 0 + /* FIXME wait checkpoint incoming thread exit, and free resource */ + qemu_thread_join(&colo_in->thread); + g_free(colo_in); +#endif + } else { + qemu_fclose(f); + } free_xbzrle_decoded_buf(); if (ret < 0) { error_report("load of migration failed: %s", strerror(-ret)); diff --git a/stubs/migration-colo.c b/stubs/migration-colo.c index c0bb8d8..45b992a 100644 --- a/stubs/migration-colo.c +++ b/stubs/migration-colo.c @@ -25,3 +25,8 @@ bool migrate_in_colo_state(void) void colo_init_checkpointer(MigrationState *s) { } + +void *colo_process_incoming_checkpoints(void *opaque) +{ + return NULL; +} diff --git a/trace-events b/trace-events index 6787009..2b95743 100644 --- a/trace-events +++ b/trace-events @@ -1448,6 +1448,7 @@ colo_info_load(const char *msg) "%s" # migration/colo.c colo_vm_state_change(const char *old, const char *new) "Change '%s' => '%s'" +colo_receive_message(const char *msg) "Receive '%s'" # kvm-all.c kvm_ioctl(int type, void *arg) "type 0x%x, arg %p" -- 1.7.12.4