diff options
| author | Yang Hongyang <yanghy@cn.fujitsu.com> | 2015-10-07 11:52:17 +0800 |
|---|---|---|
| committer | Jason Wang <jasowang@redhat.com> | 2015-10-12 13:30:07 +0800 |
| commit | 3e033a46a7e39ea31e15f1b53402df990977115a (patch) | |
| tree | 9f0188f739cc1fb3b5fa42930f1cd18d755e9315 /net/queue.c | |
| parent | fefe2a78abde932e0f340b21bded2c86def1d242 (diff) | |
net/queue: introduce NetQueueDeliverFunc
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 <yanghy@cn.fujitsu.com>
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Diffstat (limited to 'net/queue.c')
| -rw-r--r-- | net/queue.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/queue.c b/net/queue.c index cf8db3ae95..16dddf0e71 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; |