[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/14] net/queue: introduce NetQueueDeliverFunc
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL 09/14] net/queue: introduce NetQueueDeliverFunc |
Date: |
Mon, 12 Oct 2015 16:17:11 +0800 |
From: Yang Hongyang <address@hidden>
net/queue.c has logic to send/queue/flush packets but a
qemu_deliver_packet_iov() call is hardcoded. Abstract this
func so that we can use our own deliver function in netfilter.
Signed-off-by: Yang Hongyang <address@hidden>
Cc: Stefan Hajnoczi <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
include/net/queue.h | 13 ++++++++++++-
net/net.c | 2 +-
net/queue.c | 8 +++++---
3 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/include/net/queue.h b/include/net/queue.h
index fc02b33..b4a7183 100644
--- a/include/net/queue.h
+++ b/include/net/queue.h
@@ -34,7 +34,18 @@ typedef void (NetPacketSent) (NetClientState *sender,
ssize_t ret);
#define QEMU_NET_PACKET_FLAG_NONE 0
#define QEMU_NET_PACKET_FLAG_RAW (1<<0)
-NetQueue *qemu_new_net_queue(void *opaque);
+/* Returns:
+ * >0 - success
+ * 0 - queue packet for future redelivery
+ * <0 - failure (discard packet)
+ */
+typedef ssize_t (NetQueueDeliverFunc)(NetClientState *sender,
+ unsigned flags,
+ const struct iovec *iov,
+ int iovcnt,
+ void *opaque);
+
+NetQueue *qemu_new_net_queue(NetQueueDeliverFunc *deliver, void *opaque);
void qemu_del_net_queue(NetQueue *queue);
diff --git a/net/net.c b/net/net.c
index 2f939f9..c0ebb13 100644
--- a/net/net.c
+++ b/net/net.c
@@ -286,7 +286,7 @@ static void qemu_net_client_setup(NetClientState *nc,
}
QTAILQ_INSERT_TAIL(&net_clients, nc, next);
- nc->incoming_queue = qemu_new_net_queue(nc);
+ nc->incoming_queue = qemu_new_net_queue(qemu_deliver_packet_iov, nc);
nc->destructor = destructor;
QTAILQ_INIT(&nc->filters);
}
diff --git a/net/queue.c b/net/queue.c
index cf8db3a..16dddf0 100644
--- a/net/queue.c
+++ b/net/queue.c
@@ -52,13 +52,14 @@ struct NetQueue {
void *opaque;
uint32_t nq_maxlen;
uint32_t nq_count;
+ NetQueueDeliverFunc *deliver;
QTAILQ_HEAD(packets, NetPacket) packets;
unsigned delivering : 1;
};
-NetQueue *qemu_new_net_queue(void *opaque)
+NetQueue *qemu_new_net_queue(NetQueueDeliverFunc *deliver, void *opaque)
{
NetQueue *queue;
@@ -67,6 +68,7 @@ NetQueue *qemu_new_net_queue(void *opaque)
queue->opaque = opaque;
queue->nq_maxlen = 10000;
queue->nq_count = 0;
+ queue->deliver = deliver;
QTAILQ_INIT(&queue->packets);
@@ -158,7 +160,7 @@ static ssize_t qemu_net_queue_deliver(NetQueue *queue,
};
queue->delivering = 1;
- ret = qemu_deliver_packet_iov(sender, flags, &iov, 1, queue->opaque);
+ ret = queue->deliver(sender, flags, &iov, 1, queue->opaque);
queue->delivering = 0;
return ret;
@@ -173,7 +175,7 @@ static ssize_t qemu_net_queue_deliver_iov(NetQueue *queue,
ssize_t ret = -1;
queue->delivering = 1;
- ret = qemu_deliver_packet_iov(sender, flags, iov, iovcnt, queue->opaque);
+ ret = queue->deliver(sender, flags, iov, iovcnt, queue->opaque);
queue->delivering = 0;
return ret;
--
2.1.4
- [Qemu-devel] [PULL 00/14] Net patches, Jason Wang, 2015/10/12
- [Qemu-devel] [PULL 01/14] net/vmxnet3: Refine l2 header validation, Jason Wang, 2015/10/12
- [Qemu-devel] [PULL 03/14] e1000: use alias for default model, Jason Wang, 2015/10/12
- [Qemu-devel] [PULL 07/14] netfilter: hook packets before net queue send, Jason Wang, 2015/10/12
- [Qemu-devel] [PULL 09/14] net/queue: introduce NetQueueDeliverFunc,
Jason Wang <=
- [Qemu-devel] [PULL 10/14] netfilter: add an API to pass the packet to next filter, Jason Wang, 2015/10/12
- [Qemu-devel] [PULL 13/14] netfilter: add a netbuffer filter, Jason Wang, 2015/10/12
- [Qemu-devel] [PULL 14/14] tests: add test cases for netfilter object, Jason Wang, 2015/10/12
- Re: [Qemu-devel] [PULL 00/14] Net patches, Peter Maydell, 2015/10/12
- [Qemu-devel] [PULL 02/14] vmxnet3: Support reading IMR registers on bar0, Jason Wang, 2015/10/15
- [Qemu-devel] [PULL 04/14] vmxnet3: Add support for VMXNET3_CMD_GET_ADAPTIVE_RING_INFO command, Jason Wang, 2015/10/15
- [Qemu-devel] [PULL 06/14] init/cleanup of netfilter object, Jason Wang, 2015/10/15
- [Qemu-devel] [PULL 08/14] net: merge qemu_deliver_packet and qemu_deliver_packet_iov, Jason Wang, 2015/10/15
- [Qemu-devel] [PULL 05/14] vl.c: init delayed object after net_init_clients, Jason Wang, 2015/10/15