From nobody Thu May 1 02:45:15 2025
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.zohomail.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: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by
mx.zohomail.com
with SMTPS id 1500294332827829.696039476882;
Mon, 17 Jul 2017 05:25:32 -0700 (PDT)
Received: from localhost ([::1]:50059 helo=lists.gnu.org)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1dX55d-0003TH-CV
for importer@patchew.org; Mon, 17 Jul 2017 08:25:29 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:48256)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <jasowang@redhat.com>) id 1dX52I-0000Zk-TI
for qemu-devel@nongnu.org; Mon, 17 Jul 2017 08:22:06 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <jasowang@redhat.com>) id 1dX52H-0007x1-VV
for qemu-devel@nongnu.org; Mon, 17 Jul 2017 08:22:02 -0400
Received: from mx1.redhat.com ([209.132.183.28]:38788)
by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
(Exim 4.71) (envelope-from <jasowang@redhat.com>) id 1dX52H-0007vv-Pr
for qemu-devel@nongnu.org; Mon, 17 Jul 2017 08:22:01 -0400
Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com
[10.5.11.11])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mx1.redhat.com (Postfix) with ESMTPS id C5A1B4E33D;
Mon, 17 Jul 2017 12:22:00 +0000 (UTC)
Received: from jason-ThinkPad-T450s.redhat.com (ovpn-12-128.pek2.redhat.com
[10.72.12.128])
by smtp.corp.redhat.com (Postfix) with ESMTP id 2BCC2600C2;
Mon, 17 Jul 2017 12:21:58 +0000 (UTC)
DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com C5A1B4E33D
Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com;
dmarc=none (p=none dis=none) header.from=redhat.com
Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com;
spf=pass smtp.mailfrom=jasowang@redhat.com
DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com C5A1B4E33D
From: Jason Wang <jasowang@redhat.com>
To: peter.maydell@linaro.org,
qemu-devel@nongnu.org
Date: Mon, 17 Jul 2017 20:21:34 +0800
Message-Id: <1500294105-13713-4-git-send-email-jasowang@redhat.com>
In-Reply-To: <1500294105-13713-1-git-send-email-jasowang@redhat.com>
References: <1500294105-13713-1-git-send-email-jasowang@redhat.com>
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16
(mx1.redhat.com [10.5.110.38]);
Mon, 17 Jul 2017 12:22:00 +0000 (UTC)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
[fuzzy]
X-Received-From: 209.132.183.28
Subject: [Qemu-devel] [PULL 03/14] net/filter-mirror.c: Introduce parameter
for filter_send()
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Cc: Jason Wang <jasowang@redhat.com>,
Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail: RSF_0 Z_629925259 SPT_0
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
This patch change the filter_send() parameter from CharBackend to MirrorSta=
te,
we can get more information like vnet_hdr(We use it to support packet with =
vnet_header).
Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
net/filter-mirror.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/net/filter-mirror.c b/net/filter-mirror.c
index 1b6211b..e8e5b60 100644
--- a/net/filter-mirror.c
+++ b/net/filter-mirror.c
@@ -43,7 +43,7 @@ typedef struct MirrorState {
SocketReadState rs;
} MirrorState;
=20
-static int filter_send(CharBackend *chr_out,
+static int filter_send(MirrorState *s,
const struct iovec *iov,
int iovcnt)
{
@@ -58,14 +58,14 @@ static int filter_send(CharBackend *chr_out,
}
=20
len =3D htonl(size);
- ret =3D qemu_chr_fe_write_all(chr_out, (uint8_t *)&len, sizeof(len));
+ ret =3D qemu_chr_fe_write_all(&s->chr_out, (uint8_t *)&len, sizeof(len=
));
if (ret !=3D sizeof(len)) {
goto err;
}
=20
buf =3D g_malloc(size);
iov_to_buf(iov, iovcnt, 0, buf, size);
- ret =3D qemu_chr_fe_write_all(chr_out, (uint8_t *)buf, size);
+ ret =3D qemu_chr_fe_write_all(&s->chr_out, (uint8_t *)buf, size);
g_free(buf);
if (ret !=3D size) {
goto err;
@@ -141,7 +141,7 @@ static ssize_t filter_mirror_receive_iov(NetFilterState=
*nf,
MirrorState *s =3D FILTER_MIRROR(nf);
int ret;
=20
- ret =3D filter_send(&s->chr_out, iov, iovcnt);
+ ret =3D filter_send(s, iov, iovcnt);
if (ret) {
error_report("filter mirror send failed(%s)", strerror(-ret));
}
@@ -164,7 +164,7 @@ static ssize_t filter_redirector_receive_iov(NetFilterS=
tate *nf,
int ret;
=20
if (qemu_chr_fe_backend_connected(&s->chr_out)) {
- ret =3D filter_send(&s->chr_out, iov, iovcnt);
+ ret =3D filter_send(s, iov, iovcnt);
if (ret) {
error_report("filter redirector send failed(%s)", strerror(-re=
t));
}
--=20
2.7.4