From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41748) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8jwD-0007e9-2R for qemu-devel@nongnu.org; Fri, 03 Jun 2016 03:54:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b8jw9-00050m-Dg for qemu-devel@nongnu.org; Fri, 03 Jun 2016 03:54:37 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:24939) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8jw8-0004zV-P2 for qemu-devel@nongnu.org; Fri, 03 Jun 2016 03:54:33 -0400 From: zhanghailiang Date: Fri, 3 Jun 2016 15:52:45 +0800 Message-ID: <1464940366-9880-34-git-send-email-zhang.zhanghailiang@huawei.com> In-Reply-To: <1464940366-9880-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1464940366-9880-1-git-send-email-zhang.zhanghailiang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH COLO-Frame v17 33/34] COLO: Control the status of buffer filters for PVM List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, amit.shah@redhat.com, quintela@redhat.com, dgilbert@redhat.com Cc: peter.huangpeng@huawei.com, eddie.dong@intel.com, yunhong.jiang@intel.com, wency@cn.fujitsu.com, lizhijian@cn.fujitsu.com, arei.gonglei@huawei.com, stefanha@redhat.com, hongyang.yang@easystack.cn, zhangchen.fnst@cn.fujitsu.com, xiecl.fnst@cn.fujitsu.com, zhanghailiang , Jason Wang Enable all buffer filters that added by COLO while go into COLO process, and disable them while exit COLO. Signed-off-by: zhanghailiang Cc: Jason Wang Cc: Yang Hongyang --- v16: - Stop buffer filter while doing checkpoint and resume it after checkpoint. v15: - Re-implement colo_set_filter_status() based on COLOBufferFilters list. - Fix the title of this patch --- migration/colo.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/migration/colo.c b/migration/colo.c index f9bd62c..de7174f 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -114,10 +114,22 @@ static void secondary_vm_do_failover(void) } } +static void colo_set_filter_status(const char *status, Error **errp) +{ + struct COLOListNode *e, *next; + NetFilterState *nf; + + QLIST_FOREACH_SAFE(e, &COLOBufferFilters, node, next) { + nf = e->opaque; + object_property_set_str(OBJECT(nf), status, "status", errp); + } +} + static void primary_vm_do_failover(void) { MigrationState *s = migrate_get_current(); int old_state; + Error *local_err = NULL; migrate_set_state(&s->state, MIGRATION_STATUS_COLO, MIGRATION_STATUS_COMPLETED); @@ -141,6 +153,12 @@ static void primary_vm_do_failover(void) old_state); return; } + + colo_set_filter_status("off", &local_err); + if (local_err) { + error_report_err(local_err); + } + /* Notify COLO thread that failover work is finished */ qemu_sem_post(&s->colo_exit_sem); } @@ -294,7 +312,11 @@ static int colo_do_checkpoint_transaction(MigrationState *s, if (failover_request_is_active()) { goto out; } - + /* Stop buffer filter and flush the buffered packets */ + colo_set_filter_status("off", &local_err); + if (local_err) { + goto out; + } colo_send_message(s->to_dst_file, COLO_MESSAGE_VMSTATE_SEND, &local_err); if (local_err) { goto out; @@ -360,6 +382,10 @@ static int colo_do_checkpoint_transaction(MigrationState *s, qemu_thread_exit(0); } + colo_set_filter_status("on", &local_err); + if (local_err) { + goto out; + } ret = 0; qemu_mutex_lock_iothread(); @@ -427,6 +453,11 @@ static void colo_process_checkpoint(MigrationState *s) failover_init_state(); + colo_set_filter_status("on", &local_err); + if (local_err) { + goto out; + } + 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"); -- 1.8.3.1