From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45530) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aDoRP-0005qM-8L for qemu-devel@nongnu.org; Tue, 29 Dec 2015 02:11:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aDoRM-00071q-1g for qemu-devel@nongnu.org; Tue, 29 Dec 2015 02:11:31 -0500 Received: from szxga01-in.huawei.com ([58.251.152.64]:52312) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aDoRL-000708-7w for qemu-devel@nongnu.org; Tue, 29 Dec 2015 02:11:27 -0500 From: zhanghailiang Date: Tue, 29 Dec 2015 15:09:05 +0800 Message-ID: <1451372975-5048-10-git-send-email-zhang.zhanghailiang@huawei.com> In-Reply-To: <1451372975-5048-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1451372975-5048-1-git-send-email-zhang.zhanghailiang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH COLO-Frame v13 09/39] COLO/migration: Create a new communication path from destination to source List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: xiecl.fnst@cn.fujitsu.com, 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, stefanha@redhat.com, amit.shah@redhat.com, zhangchen.fnst@cn.fujitsu.com, hongyang.yang@easystack.cn This new communication path will be used for returning messages from destination to source. 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 | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/migration/colo.c b/migration/colo.c index 6880aa0..65ac0c9 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -36,6 +36,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 +49,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 +74,23 @@ 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