From: Yang Hongyang <yanghy@cn.fujitsu.com>
To: qemu-devel@nongnu.org
Cc: thuth@redhat.com, zhang.zhanghailiang@huawei.com,
jasowang@redhat.com, mrhines@linux.vnet.ibm.com,
stefanha@redhat.com, Yang Hongyang <yanghy@cn.fujitsu.com>
Subject: [Qemu-devel] [PATCH 06/12] netfilter: provide a compat receive_iov
Date: Wed, 29 Jul 2015 18:51:50 +0800 [thread overview]
Message-ID: <1438167116-29270-7-git-send-email-yanghy@cn.fujitsu.com> (raw)
In-Reply-To: <1438167116-29270-1-git-send-email-yanghy@cn.fujitsu.com>
if a filter do not provide a receive_iov, use a compat
receive_iov instead.
Signed-off-by: Yang Hongyang <yanghy@cn.fujitsu.com>
---
net/filter.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/net/filter.c b/net/filter.c
index 3d3b7bc..50fb837 100644
--- a/net/filter.c
+++ b/net/filter.c
@@ -14,12 +14,27 @@
#include "qapi/dealloc-visitor.h"
#include "qemu/config-file.h"
#include "qmp-commands.h"
+#include "qemu/iov.h"
#include "net/filter.h"
#include "net/net.h"
static QTAILQ_HEAD(, NetFilterState) net_filters;
+static ssize_t filter_receive_iov_compat(NetFilterState *nf,
+ NetClientState *sender,
+ unsigned flags,
+ const struct iovec *iov,
+ int iovcnt)
+{
+ uint8_t buffer[NET_BUFSIZE];
+ size_t offset;
+
+ offset = iov_to_buf(iov, iovcnt, 0, buffer, sizeof(buffer));
+
+ return nf->info->receive(nf, sender, flags, buffer, offset);
+}
+
NetFilterState *qemu_new_net_filter(NetFilterInfo *info,
NetClientState *netdev,
const char *model,
@@ -34,6 +49,9 @@ NetFilterState *qemu_new_net_filter(NetFilterInfo *info,
nf->model = g_strdup(model);
nf->name = g_strdup(name);
nf->netdev = netdev;
+ if (!nf->info->receive_iov) {
+ nf->info->receive_iov = filter_receive_iov_compat;
+ }
QTAILQ_INSERT_TAIL(&net_filters, nf, next);
qemu_netdev_add_filter(netdev, nf);
--
1.9.1
next prev parent reply other threads:[~2015-07-29 10:58 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-29 10:51 [Qemu-devel] [PATCH 00/12] For QEMU 2.5: Add a netfilter object and netbuffer filter Yang Hongyang
2015-07-29 10:51 ` [Qemu-devel] [PATCH 01/12] net: add a new object netfilter Yang Hongyang
2015-07-29 13:53 ` Thomas Huth
2015-07-29 14:05 ` Yang Hongyang
2015-07-29 14:20 ` Thomas Huth
2015-07-29 14:32 ` Yang Hongyang
2015-07-29 10:51 ` [Qemu-devel] [PATCH 02/12] init/cleanup of netfilter object Yang Hongyang
2015-07-29 13:33 ` Thomas Huth
2015-07-29 13:50 ` Yang Hongyang
2015-07-29 13:58 ` Thomas Huth
2015-07-29 14:08 ` Yang Hongyang
2015-07-29 10:51 ` [Qemu-devel] [PATCH 03/12] netfilter: add netfilter_{add|del} commands Yang Hongyang
2015-07-29 14:15 ` Thomas Huth
2015-07-29 14:28 ` Yang Hongyang
2015-07-29 14:30 ` Yang Hongyang
2015-07-29 10:51 ` [Qemu-devel] [PATCH 04/12] net: add/remove filters from network backend Yang Hongyang
2015-07-29 10:51 ` [Qemu-devel] [PATCH 05/12] netfilter: hook packets before receive Yang Hongyang
2015-07-30 4:51 ` Jason Wang
2015-07-30 7:22 ` Yang Hongyang
2015-07-29 10:51 ` Yang Hongyang [this message]
2015-07-29 10:51 ` [Qemu-devel] [PATCH 07/12] net/queue: export qemu_net_queue_append Yang Hongyang
2015-07-29 10:51 ` [Qemu-devel] [PATCH 08/12] move out net queue structs define Yang Hongyang
2015-07-29 10:51 ` [Qemu-devel] [PATCH 09/12] netfilter: add a netbuffer filter Yang Hongyang
2015-07-30 1:45 ` Li Zhijian
2015-07-30 1:53 ` Yang Hongyang
2015-07-30 5:13 ` Jason Wang
2015-07-30 6:47 ` Yang Hongyang
2015-07-30 8:40 ` Jason Wang
2015-07-30 9:04 ` Yang Hongyang
2015-07-30 9:33 ` Jason Wang
2015-07-30 9:49 ` Yang Hongyang
2015-07-30 10:14 ` Jason Wang
2015-07-30 10:28 ` Yang Hongyang
2015-07-30 14:16 ` Thomas Huth
2015-07-30 15:00 ` Yang Hongyang
2015-07-30 13:46 ` Yang Hongyang
2015-07-30 7:00 ` Yang Hongyang
2015-07-30 8:52 ` Jason Wang
2015-07-29 10:51 ` [Qemu-devel] [PATCH 10/12] netbuffer: add a public api filter_buffer_release_all Yang Hongyang
2015-07-30 5:25 ` Jason Wang
2015-07-30 5:50 ` Yang Hongyang
2015-07-30 8:42 ` Jason Wang
2015-07-30 8:53 ` Yang Hongyang
2015-07-30 8:50 ` Jason Wang
2015-07-30 9:06 ` Yang Hongyang
2015-07-29 10:51 ` [Qemu-devel] [PATCH 11/12] filter/buffer: add an interval option to buffer filter Yang Hongyang
2015-07-30 5:27 ` Jason Wang
2015-07-30 5:37 ` Yang Hongyang
2015-07-30 8:53 ` Jason Wang
2015-07-30 9:12 ` Yang Hongyang
2015-07-29 10:51 ` [Qemu-devel] [PATCH 12/12] filter/buffer: update command description and help Yang Hongyang
2015-07-29 12:56 ` [Qemu-devel] [PATCH 00/12] For QEMU 2.5: Add a netfilter object and netbuffer filter Thomas Huth
2015-07-29 13:39 ` Yang Hongyang
2015-07-29 13:48 ` Thomas Huth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1438167116-29270-7-git-send-email-yanghy@cn.fujitsu.com \
--to=yanghy@cn.fujitsu.com \
--cc=jasowang@redhat.com \
--cc=mrhines@linux.vnet.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=thuth@redhat.com \
--cc=zhang.zhanghailiang@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).