From patchwork Tue Feb 28 10:48:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 9595181 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6641960429 for ; Tue, 28 Feb 2017 10:50:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6636B272F9 for ; Tue, 28 Feb 2017 10:50:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5975D28522; Tue, 28 Feb 2017 10:50:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 00513272F9 for ; Tue, 28 Feb 2017 10:50:38 +0000 (UTC) Received: from localhost ([::1]:60106 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cifMb-0000CD-W2 for patchwork-qemu-devel@patchwork.kernel.org; Tue, 28 Feb 2017 05:50:38 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41484) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cifLz-00007M-Jv for qemu-devel@nongnu.org; Tue, 28 Feb 2017 05:50:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cifLw-0004lc-1s for qemu-devel@nongnu.org; Tue, 28 Feb 2017 05:49:59 -0500 Received: from [59.151.112.132] (port=36439 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cifLv-0004kD-KA for qemu-devel@nongnu.org; Tue, 28 Feb 2017 05:49:55 -0500 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="16050256" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 28 Feb 2017 18:49:46 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (unknown [10.167.33.80]) by cn.fujitsu.com (Postfix) with ESMTP id CF06B47C4EAD; Tue, 28 Feb 2017 18:49:42 +0800 (CST) Received: from localhost.localdomain (10.167.226.56) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 28 Feb 2017 18:49:42 +0800 From: Zhang Chen To: qemu devel , Jason Wang Date: Tue, 28 Feb 2017 18:48:21 +0800 Message-ID: <1488278902-11223-3-git-send-email-zhangchen.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488278902-11223-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> References: <1488278902-11223-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.56] X-yoursite-MailScanner-ID: CF06B47C4EAD.A1491 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: zhangchen.fnst@cn.fujitsu.com X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Subject: [Qemu-devel] [PATCH 2/3] COLO-compare: Add Xen notify chardev socket handler frame X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Li Zhijian , bian naimeng , "eddie . dong" , zhanghailiang , Zhang Chen Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Add chardev handler to get Xen colo-frame's notify. Signed-off-by: Zhang Chen --- net/colo-compare.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/net/colo-compare.c b/net/colo-compare.c index 57d336b..947a9e2 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -72,8 +72,10 @@ typedef struct CompareState { CharBackend chr_pri_in; CharBackend chr_sec_in; CharBackend chr_out; + CharBackend chr_notify_dev; SocketReadState pri_rs; SocketReadState sec_rs; + SocketReadState notify_rs; /* connection list: the connections belonged to this NIC could be found * in this list. @@ -513,6 +515,19 @@ static gboolean check_old_packet_regular(void *opaque) return TRUE; } +static void compare_notify_chr(void *opaque, const uint8_t *buf, int size) +{ + CompareState *s = COLO_COMPARE(opaque); + int ret; + + ret = net_fill_rstate(&s->notify_rs, buf, size); + if (ret == -1) { + qemu_chr_fe_set_handlers(&s->chr_notify_dev, NULL, NULL, NULL, + NULL, NULL, true); + error_report("colo-compare notify_dev error"); + } +} + static void *colo_compare_thread(void *opaque) { CompareState *s = opaque; @@ -524,6 +539,8 @@ static void *colo_compare_thread(void *opaque) compare_pri_chr_in, NULL, s, s->worker_context, true); qemu_chr_fe_set_handlers(&s->chr_sec_in, compare_chr_can_read, compare_sec_chr_in, NULL, s, s->worker_context, true); + qemu_chr_fe_set_handlers(&s->chr_notify_dev, compare_chr_can_read, + compare_notify_chr, NULL, s, s->worker_context, true); s->compare_loop = g_main_loop_new(s->worker_context, FALSE); @@ -626,6 +643,10 @@ static void compare_sec_rs_finalize(SocketReadState *sec_rs) } } +static void compare_notify_rs_finalize(SocketReadState *notify_rs) +{ + /* Get Xen colo-frame's notify and handle the message */ +} /* * Return 0 is success. @@ -689,8 +710,14 @@ static void colo_compare_complete(UserCreatable *uc, Error **errp) return; } + if (find_and_check_chardev(&chr, s->notify_dev, errp) || + !qemu_chr_fe_init(&s->chr_notify_dev, chr, errp)) { + return; + } + net_socket_rs_init(&s->pri_rs, compare_pri_rs_finalize); net_socket_rs_init(&s->sec_rs, compare_sec_rs_finalize); + net_socket_rs_init(&s->notify_rs, compare_notify_rs_finalize); g_queue_init(&s->conn_list); @@ -757,6 +784,7 @@ static void colo_compare_finalize(Object *obj) qemu_chr_fe_set_handlers(&s->chr_sec_in, NULL, NULL, NULL, NULL, s->worker_context, true); qemu_chr_fe_deinit(&s->chr_out); + qemu_chr_fe_deinit(&s->chr_notify_dev); g_main_loop_quit(s->compare_loop); qemu_thread_join(&s->thread);