From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59895) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpX05-0004RM-SK for qemu-devel@nongnu.org; Thu, 29 Sep 2016 04:47:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bpX00-0002sd-MY for qemu-devel@nongnu.org; Thu, 29 Sep 2016 04:47:28 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:26570) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpX00-0002p0-1b for qemu-devel@nongnu.org; Thu, 29 Sep 2016 04:47:24 -0400 From: zhanghailiang Date: Thu, 29 Sep 2016 16:46:25 +0800 Message-ID: <1475138797-9908-6-git-send-email-zhang.zhanghailiang@huawei.com> In-Reply-To: <1475138797-9908-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1475138797-9908-1-git-send-email-zhang.zhanghailiang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH COLO-Frame (Base) v20 05/17] COLO: Establish a new communicating path for COLO List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: amit.shah@redhat.com, quintela@redhat.com Cc: qemu-devel@nongnu.org, dgilbert@redhat.com, wency@cn.fujitsu.com, lizhijian@cn.fujitsu.com, zhangchen.fnst@cn.fujitsu.com, xiecl.fnst@cn.fujitsu.com, zhanghailiang This new communication path will be used for returning messages from Secondary side to Primary side. Signed-off-by: zhanghailiang Signed-off-by: Li Zhijian Reviewed-by: Dr. David Alan Gilbert --- v13: - Remove useless error report v12: - Add Reviewed-by tag v11: - Rebase master to use qemu_file_get_return_path() for opening return path v10: - fix the the error log (Dave's suggestion). --- migration/colo.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/migration/colo.c b/migration/colo.c index 968cd51..7c5769b 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -14,6 +14,7 @@ #include "sysemu/sysemu.h" #include "migration/colo.h" #include "trace.h" +#include "qemu/error-report.h" bool colo_supported(void) { @@ -36,6 +37,12 @@ bool migration_incoming_in_colo_state(void) static void colo_process_checkpoint(MigrationState *s) { + s->rp_state.from_dst_file = qemu_file_get_return_path(s->to_dst_file); + if (!s->rp_state.from_dst_file) { + error_report("Open QEMUFile from_dst_file failed"); + goto out; + } + qemu_mutex_lock_iothread(); vm_start(); qemu_mutex_unlock_iothread(); @@ -43,8 +50,13 @@ static void colo_process_checkpoint(MigrationState *s) /* TODO: COLO checkpoint savevm loop */ +out: migrate_set_state(&s->state, MIGRATION_STATUS_COLO, MIGRATION_STATUS_COMPLETED); + + if (s->rp_state.from_dst_file) { + qemu_fclose(s->rp_state.from_dst_file); + } } void migrate_start_colo_process(MigrationState *s) @@ -63,8 +75,24 @@ void *colo_process_incoming_thread(void *opaque) migrate_set_state(&mis->state, MIGRATION_STATUS_ACTIVE, MIGRATION_STATUS_COLO); + mis->to_src_file = qemu_file_get_return_path(mis->from_src_file); + if (!mis->to_src_file) { + error_report("COLO incoming thread: Open QEMUFile to_src_file failed"); + goto out; + } + /* + * Note: We set the fd to unblocked in migration incoming coroutine, + * But here we are in the COLO incoming thread, so it is ok to set the + * fd back to blocked. + */ + qemu_file_set_blocking(mis->from_src_file, true); + /* TODO: COLO checkpoint restore loop */ +out: + if (mis->to_src_file) { + qemu_fclose(mis->to_src_file); + } migration_incoming_exit_colo(); return NULL; -- 1.8.3.1