From patchwork Tue Nov 3 11:56:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhanghailiang X-Patchwork-Id: 539353 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id ABBB11402C3 for ; Tue, 3 Nov 2015 23:09:49 +1100 (AEDT) Received: from localhost ([::1]:47474 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtaPL-0005OT-TA for incoming@patchwork.ozlabs.org; Tue, 03 Nov 2015 07:09:47 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59129) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtaGv-00075g-TA for qemu-devel@nongnu.org; Tue, 03 Nov 2015 07:01:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZtaGs-0002h6-Lk for qemu-devel@nongnu.org; Tue, 03 Nov 2015 07:01:05 -0500 Received: from szxga02-in.huawei.com ([119.145.14.65]:11244) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtaGr-0002gi-Si for qemu-devel@nongnu.org; Tue, 03 Nov 2015 07:01:02 -0500 Received: from 172.24.1.50 (EHLO SZXEML424-HUB.china.huawei.com) ([172.24.1.50]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CVQ66806; Tue, 03 Nov 2015 19:57:23 +0800 (CST) Received: from localhost (10.177.25.63) by SZXEML424-HUB.china.huawei.com (10.82.67.153) with Microsoft SMTP Server id 14.3.235.1; Tue, 3 Nov 2015 19:57:15 +0800 From: zhanghailiang To: Date: Tue, 3 Nov 2015 19:56:26 +0800 Message-ID: <1446551816-15768-9-git-send-email-zhang.zhanghailiang@huawei.com> X-Mailer: git-send-email 1.9.5.msysgit.1 In-Reply-To: <1446551816-15768-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1446551816-15768-1-git-send-email-zhang.zhanghailiang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.177.25.63] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A090203.5638A1EC.0031,ss=1,re=0.000,fgs=0, ip=0.0.0.0, so=2013-06-18 04:22:30, dmn=2011-05-27 18:58:46 X-Mirapoint-Loop-Id: 7298c7806bbad832880ec7ed49875e34 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 119.145.14.65 Cc: lizhijian@cn.fujitsu.com, quintela@redhat.com, yunhong.jiang@intel.com, eddie.dong@intel.com, peter.huangpeng@huawei.com, dgilbert@redhat.com, arei.gonglei@huawei.com, stefanha@redhat.com, amit.shah@redhat.com, zhanghailiang Subject: [Qemu-devel] [PATCH COLO-Frame v10 08/38] COLO/migration: establish a new communication path from destination to source X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Add a new member 'to_src_file' to MigrationIncomingState and a new member 'from_dst_file' to MigrationState. They will be used for returning messages from destination to source. It will also be used by post-copy migration. Signed-off-by: zhanghailiang Signed-off-by: Li Zhijian Cc: Dr. David Alan Gilbert --- v10: fix the the error log (Dave's suggestion). --- include/migration/migration.h | 3 ++- migration/colo.c | 44 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/include/migration/migration.h b/include/migration/migration.h index a874da1..0c0309d 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -50,7 +50,7 @@ typedef QLIST_HEAD(, LoadStateEntry) LoadStateEntry_Head; /* State for the incoming migration */ struct MigrationIncomingState { QEMUFile *from_src_file; - + QEMUFile *to_src_file; int state; bool have_colo_incoming_thread; @@ -74,6 +74,7 @@ struct MigrationState QemuThread thread; QEMUBH *cleanup_bh; QEMUFile *to_dst_file; + QEMUFile *from_dst_file; int parameters[MIGRATION_PARAMETER_MAX]; int state; diff --git a/migration/colo.c b/migration/colo.c index 6880aa0..4fdf3a9 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -36,6 +36,21 @@ bool migration_incoming_in_colo_state(void) static void colo_process_checkpoint(MigrationState *s) { + int fd, ret = 0; + + /* Dup the fd of to_dst_file */ + fd = dup(qemu_get_fd(s->to_dst_file)); + if (fd == -1) { + ret = -errno; + goto out; + } + s->from_dst_file = qemu_fopen_socket(fd, "rb"); + if (!s->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 +58,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->from_dst_file) { + qemu_fclose(s->from_dst_file); + } } void migrate_start_colo_process(MigrationState *s) @@ -59,12 +82,33 @@ void migrate_start_colo_process(MigrationState *s) void *colo_process_incoming_thread(void *opaque) { MigrationIncomingState *mis = opaque; + int fd, ret = 0; migrate_set_state(&mis->state, MIGRATION_STATUS_ACTIVE, MIGRATION_STATUS_COLO); + fd = dup(qemu_get_fd(mis->from_src_file)); + if (fd < 0) { + ret = -errno; + goto out; + } + mis->to_src_file = qemu_fopen_socket(fd, "wb"); + if (!mis->to_src_file) { + ret = -EINVAL; + error_report("colo incoming thread: Open QEMUFile to_src_file failed"); + goto out; + } /* 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;