From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53626) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a19vf-0006YU-U0 for qemu-devel@nongnu.org; Tue, 24 Nov 2015 04:30:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a19vf-00084W-0o for qemu-devel@nongnu.org; Tue, 24 Nov 2015 04:30:27 -0500 Received: from szxga02-in.huawei.com ([119.145.14.65]:40204) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a19ve-00084F-DV for qemu-devel@nongnu.org; Tue, 24 Nov 2015 04:30:26 -0500 From: zhanghailiang Date: Tue, 24 Nov 2015 17:25:19 +0800 Message-ID: <1448357149-17572-10-git-send-email-zhang.zhanghailiang@huawei.com> In-Reply-To: <1448357149-17572-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1448357149-17572-1-git-send-email-zhang.zhanghailiang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH COLO-Frame v11 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: 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, 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 Cc: Dr. David Alan Gilbert --- 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 | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/migration/colo.c b/migration/colo.c index 6880aa0..0ab9618 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -36,6 +36,15 @@ bool migration_incoming_in_colo_state(void) static void colo_process_checkpoint(MigrationState *s) { + int ret = 0; + + s->rp_state.from_dst_file = qemu_file_get_return_path(s->to_dst_file); + if (!s->rp_state.from_dst_file) { + ret = -EINVAL; + error_report("Open QEMUFile from_dst_file failed"); + goto out; + } + qemu_mutex_lock_iothread(); vm_start(); qemu_mutex_unlock_iothread(); @@ -43,8 +52,16 @@ static void colo_process_checkpoint(MigrationState *s) /*TODO: COLO checkpoint savevm loop*/ +out: + if (ret < 0) { + error_report("%s: %s", __func__, strerror(-ret)); + } 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) @@ -59,12 +76,34 @@ void migrate_start_colo_process(MigrationState *s) void *colo_process_incoming_thread(void *opaque) { MigrationIncomingState *mis = opaque; + int ret = 0; 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) { + ret = -EINVAL; + 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_set_block(qemu_get_fd(mis->from_src_file)); + /* TODO: COLO checkpoint restore loop */ +out: + if (ret < 0) { + error_report("colo incoming thread will exit, detect error: %s", + strerror(-ret)); + } + + if (mis->to_src_file) { + qemu_fclose(mis->to_src_file); + } migration_incoming_exit_colo(); return NULL; -- 1.8.3.1