From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38368) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRzBz-0003DL-6y for qemu-devel@nongnu.org; Sat, 06 Feb 2016 04:30:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aRzBw-0001bS-Or for qemu-devel@nongnu.org; Sat, 06 Feb 2016 04:30:11 -0500 Received: from szxga02-in.huawei.com ([119.145.14.65]:19856) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRzBw-0001YP-7a for qemu-devel@nongnu.org; Sat, 06 Feb 2016 04:30:08 -0500 From: zhanghailiang Date: Sat, 6 Feb 2016 17:28:49 +0800 Message-ID: <1454750932-7556-38-git-send-email-zhang.zhanghailiang@huawei.com> In-Reply-To: <1454750932-7556-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1454750932-7556-1-git-send-email-zhang.zhanghailiang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH COLO-Frame v14 37/40] COLO: enable buffer filters for PVM 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, armbru@redhat.com, Jason Wang , 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 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 --- v14: - New patch --- migration/colo.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/migration/colo.c b/migration/colo.c index 235578b..86a7638 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -104,10 +104,26 @@ static void secondary_vm_do_failover(void) } } +static void colo_set_filter_status(NetFilterState *nf, void *opaque, + Error **errp) +{ + char colo_filter[128]; + char *name = object_get_canonical_path_component(OBJECT(nf)); + char *status = opaque; + + snprintf(colo_filter, sizeof(colo_filter), "%scolo", nf->netdev_id); + if (strcmp(colo_filter, name)) { + return; + } + object_property_set_str(OBJECT(nf), status, "status", errp); +} + static void primary_vm_do_failover(void) { MigrationState *s = migrate_get_current(); int old_state; + char *status; + Error *local_err = NULL; migrate_set_state(&s->state, MIGRATION_STATUS_COLO, MIGRATION_STATUS_COMPLETED); @@ -131,6 +147,14 @@ static void primary_vm_do_failover(void) old_state); return; } + + status = g_strdup("disable"); + qemu_foreach_netfilter(colo_set_filter_status, status, &local_err); + g_free(status); + if (local_err) { + error_report_err(local_err); + } + /* Notify COLO thread that failover work is finished */ qemu_sem_post(&s->colo_sem); } @@ -404,11 +428,19 @@ static void colo_process_checkpoint(MigrationState *s) { QEMUSizedBuffer *buffer = NULL; int64_t current_time, checkpoint_time = qemu_clock_get_ms(QEMU_CLOCK_HOST); + char *status; Error *local_err = NULL; int ret; failover_init_state(); + status = g_strdup("enable"); + qemu_foreach_netfilter(colo_set_filter_status, status, &local_err); + g_free(status); + 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