From nobody Sun Apr 28 10:17:41 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494829246371536.1031682789308; Sun, 14 May 2017 23:20:46 -0700 (PDT) Received: from localhost ([::1]:34997 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dA9N6-0003Gq-Mg for importer@patchew.org; Mon, 15 May 2017 02:20:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60324) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dA9Lc-0002LV-Io for qemu-devel@nongnu.org; Mon, 15 May 2017 02:19:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dA9LZ-0004Cw-Fp for qemu-devel@nongnu.org; Mon, 15 May 2017 02:19:12 -0400 Received: from [59.151.112.132] (port=48072 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dA9LZ-000497-3c for qemu-devel@nongnu.org; Mon, 15 May 2017 02:19:09 -0400 Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 15 May 2017 14:18:59 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id 118C347E64CE; Mon, 15 May 2017 14:18:58 +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 14:19:00 +0800 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="18845392" From: Zhang Chen To: qemu devel , Jason Wang Date: Mon, 15 May 2017 14:18:20 +0800 Message-ID: <1494829102-1812-2-git-send-email-zhangchen.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1494829102-1812-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> References: <1494829102-1812-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.56] X-yoursite-MailScanner-ID: 118C347E64CE.ADDAD 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 RESEND V2 1/3] net/filter-mirror.c: Remove duplicate check code. 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The s->outdev have checked in filter_mirror_set_outdev(). Signed-off-by: Zhang Chen --- net/filter-mirror.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/net/filter-mirror.c b/net/filter-mirror.c index 72fa7c2..fd0322f 100644 --- a/net/filter-mirror.c +++ b/net/filter-mirror.c @@ -194,12 +194,6 @@ static void filter_mirror_setup(NetFilterState *nf, Er= ror **errp) MirrorState *s =3D FILTER_MIRROR(nf); Chardev *chr; =20 - if (!s->outdev) { - error_setg(errp, "filter mirror needs 'outdev' " - "property set"); - return; - } - chr =3D qemu_chr_find(s->outdev); if (chr =3D=3D NULL) { error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND, --=20 2.7.4 From nobody Sun Apr 28 10:17:41 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494829328658694.3680870021377; Sun, 14 May 2017 23:22:08 -0700 (PDT) Received: from localhost ([::1]:35002 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dA9OR-0004Im-Cm for importer@patchew.org; Mon, 15 May 2017 02:22:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60322) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dA9Lc-0002LT-IK for qemu-devel@nongnu.org; Mon, 15 May 2017 02:19:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dA9LZ-0004Du-Pd for qemu-devel@nongnu.org; Mon, 15 May 2017 02:19:12 -0400 Received: from [59.151.112.132] (port=24427 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dA9LZ-00048O-3x for qemu-devel@nongnu.org; Mon, 15 May 2017 02:19:09 -0400 Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 15 May 2017 14:19:05 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id F210A47E64CC; Mon, 15 May 2017 14:19: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 14:19:07 +0800 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="18845396" From: Zhang Chen To: qemu devel , Jason Wang Date: Mon, 15 May 2017 14:18:21 +0800 Message-ID: <1494829102-1812-3-git-send-email-zhangchen.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1494829102-1812-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> References: <1494829102-1812-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.56] X-yoursite-MailScanner-ID: F210A47E64CC.AE5C1 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 RESEND 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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; =20 -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 =3D 0; ssize_t size =3D 0; @@ -141,9 +141,9 @@ static ssize_t filter_mirror_receive_iov(NetFilterState= *nf, MirrorState *s =3D FILTER_MIRROR(nf); int ret; =20 - ret =3D filter_mirror_send(&s->chr_out, iov, iovcnt); + ret =3D 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)); } =20 /* @@ -164,9 +164,9 @@ static ssize_t filter_redirector_receive_iov(NetFilterS= tate *nf, int ret; =20 if (qemu_chr_fe_get_driver(&s->chr_out)) { - ret =3D filter_mirror_send(&s->chr_out, iov, iovcnt); + ret =3D 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(-re= t)); } return iov_size(iov, iovcnt); } else { @@ -286,8 +286,9 @@ static char *filter_redirector_get_indev(Object *obj, E= rror **errp) return g_strdup(s->indev); } =20 -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 =3D FILTER_REDIRECTOR(obj); =20 @@ -302,8 +303,9 @@ static char *filter_mirror_get_outdev(Object *obj, Erro= r **errp) return g_strdup(s->outdev); } =20 -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 =3D FILTER_MIRROR(obj); =20 @@ -323,8 +325,9 @@ static char *filter_redirector_get_outdev(Object *obj, = Error **errp) return g_strdup(s->outdev); } =20 -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 =3D FILTER_REDIRECTOR(obj); =20 --=20 2.7.4 From nobody Sun Apr 28 10:17:41 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 149482924673874.77102486587694; Sun, 14 May 2017 23:20:46 -0700 (PDT) Received: from localhost ([::1]:34998 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dA9N7-0003HW-5G for importer@patchew.org; Mon, 15 May 2017 02:20:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60325) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dA9Lc-0002LW-Iw for qemu-devel@nongnu.org; Mon, 15 May 2017 02:19:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dA9La-0004Gb-Mb for qemu-devel@nongnu.org; Mon, 15 May 2017 02:19:12 -0400 Received: from [59.151.112.132] (port=48072 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dA9La-000497-AD for qemu-devel@nongnu.org; Mon, 15 May 2017 02:19:10 -0400 Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 15 May 2017 14:19:07 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id 38E8047E64CD; Mon, 15 May 2017 14:19:07 +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 14:19:09 +0800 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="18845397" From: Zhang Chen To: qemu devel , Jason Wang Date: Mon, 15 May 2017 14:18:22 +0800 Message-ID: <1494829102-1812-4-git-send-email-zhangchen.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1494829102-1812-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> References: <1494829102-1812-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.56] X-yoursite-MailScanner-ID: 38E8047E64CD.ADA1C 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 RESEND V2 3/3] net/filter-rewriter: Remove unused option in filter-rewriter 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Signed-off-by: Zhang Chen --- qemu-options.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu-options.hx b/qemu-options.hx index f806af9..cbec279 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4038,7 +4038,7 @@ Create a filter-redirector we need to differ outdev i= d from indev id, id can not be the same. we can just use indev or outdev, but at least one of indev or= outdev need to be specified. =20 -@item -object filter-rewriter,id=3D@var{id},netdev=3D@var{netdevid},rewrit= er-mode=3D@var{mode}[,queue=3D@var{all|rx|tx}] +@item -object filter-rewriter,id=3D@var{id},netdev=3D@var{netdevid}[,queue= =3D@var{all|rx|tx}] =20 Filter-rewriter is a part of COLO project.It will rewrite tcp packet to secondary from primary to keep secondary tcp connection,and rewrite --=20 2.7.4