From patchwork Mon May 15 05:58:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 762240 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 3wR9220DhLz9s65 for ; Mon, 15 May 2017 16:01:30 +1000 (AEST) Received: from localhost ([::1]:34951 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dA94R-00071j-J5 for incoming@patchwork.ozlabs.org; Mon, 15 May 2017 02:01:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56711) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dA92G-0005Pn-Lm for qemu-devel@nongnu.org; Mon, 15 May 2017 01:59:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dA92F-0003Db-LJ for qemu-devel@nongnu.org; Mon, 15 May 2017 01:59:12 -0400 Received: from [59.151.112.132] (port=29582 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dA92F-0003D5-07 for qemu-devel@nongnu.org; Mon, 15 May 2017 01:59:11 -0400 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="18844523" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 15 May 2017 13:59:10 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id 83F3F4D14A48; Mon, 15 May 2017 13:59:04 +0800 (CST) Received: from localhost.localdomain (10.167.226.56) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 15 May 2017 13:59:07 +0800 From: Zhang Chen To: qemu devel , Jason Wang Date: Mon, 15 May 2017 13:58:28 +0800 Message-ID: <1494827909-640-3-git-send-email-zhangchen.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1494827909-640-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> References: <1494827909-640-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.56] X-yoursite-MailScanner-ID: 83F3F4D14A48.AD7C2 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 V2 2/3] net/filter-mirror.c: Rename filter_mirror_send() and fix codestyle 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: zhanghailiang , Zhang Chen Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Because filter_mirror_receive_iov() and filter_redirector_receive_iov() both use the filter_mirror_send() to send packet, so I change filter_mirror_send() to filter_send() that looks more common. And fix some codestyle. Signed-off-by: Zhang Chen --- net/filter-mirror.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/net/filter-mirror.c b/net/filter-mirror.c index fd0322f..8b1b069 100644 --- a/net/filter-mirror.c +++ b/net/filter-mirror.c @@ -43,9 +43,9 @@ typedef struct MirrorState { SocketReadState rs; } MirrorState; -static int filter_mirror_send(CharBackend *chr_out, - const struct iovec *iov, - int iovcnt) +static int filter_send(CharBackend *chr_out, + const struct iovec *iov, + int iovcnt) { int ret = 0; ssize_t size = 0; @@ -141,9 +141,9 @@ static ssize_t filter_mirror_receive_iov(NetFilterState *nf, MirrorState *s = FILTER_MIRROR(nf); int ret; - ret = filter_mirror_send(&s->chr_out, iov, iovcnt); + ret = filter_send(&s->chr_out, iov, iovcnt); if (ret) { - error_report("filter_mirror_send failed(%s)", strerror(-ret)); + error_report("filter mirror send failed(%s)", strerror(-ret)); } /* @@ -164,9 +164,9 @@ static ssize_t filter_redirector_receive_iov(NetFilterState *nf, int ret; if (qemu_chr_fe_get_driver(&s->chr_out)) { - ret = filter_mirror_send(&s->chr_out, iov, iovcnt); + ret = filter_send(&s->chr_out, iov, iovcnt); if (ret) { - error_report("filter_mirror_send failed(%s)", strerror(-ret)); + error_report("filter redirector send failed(%s)", strerror(-ret)); } return iov_size(iov, iovcnt); } else { @@ -286,8 +286,9 @@ static char *filter_redirector_get_indev(Object *obj, Error **errp) return g_strdup(s->indev); } -static void -filter_redirector_set_indev(Object *obj, const char *value, Error **errp) +static void filter_redirector_set_indev(Object *obj, + const char *value, + Error **errp) { MirrorState *s = FILTER_REDIRECTOR(obj); @@ -302,8 +303,9 @@ static char *filter_mirror_get_outdev(Object *obj, Error **errp) return g_strdup(s->outdev); } -static void -filter_mirror_set_outdev(Object *obj, const char *value, Error **errp) +static void filter_mirror_set_outdev(Object *obj, + const char *value, + Error **errp) { MirrorState *s = FILTER_MIRROR(obj); @@ -323,8 +325,9 @@ static char *filter_redirector_get_outdev(Object *obj, Error **errp) return g_strdup(s->outdev); } -static void -filter_redirector_set_outdev(Object *obj, const char *value, Error **errp) +static void filter_redirector_set_outdev(Object *obj, + const char *value, + Error **errp) { MirrorState *s = FILTER_REDIRECTOR(obj);