From c0b8e49c695ac11e3ef543db9ea2d8a1f62ccfce Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Thu, 22 Oct 2009 17:43:40 +0100 Subject: [PATCH] net: add flags parameter to packet queue interface This allows for the addition of a raw flag, and leaves the way open for other flags too. Signed-off-by: Mark McLoughlin Signed-off-by: Anthony Liguori --- net-queue.c | 26 ++++++++++++++++++-------- net-queue.h | 6 ++++++ net.c | 14 ++++++++++++-- 3 files changed, 36 insertions(+), 10 deletions(-) diff --git a/net-queue.c b/net-queue.c index 75457f07e9..f6b01e9d14 100644 --- a/net-queue.c +++ b/net-queue.c @@ -41,6 +41,7 @@ struct NetPacket { QTAILQ_ENTRY(NetPacket) entry; VLANClientState *sender; + unsigned flags; int size; NetPacketSent *sent_cb; uint8_t data[0]; @@ -89,6 +90,7 @@ void qemu_del_net_queue(NetQueue *queue) static ssize_t qemu_net_queue_append(NetQueue *queue, VLANClientState *sender, + unsigned flags, const uint8_t *buf, size_t size, NetPacketSent *sent_cb) @@ -97,6 +99,7 @@ static ssize_t qemu_net_queue_append(NetQueue *queue, packet = qemu_malloc(sizeof(NetPacket) + size); packet->sender = sender; + packet->flags = flags; packet->size = size; packet->sent_cb = sent_cb; memcpy(packet->data, buf, size); @@ -108,6 +111,7 @@ static ssize_t qemu_net_queue_append(NetQueue *queue, static ssize_t qemu_net_queue_append_iov(NetQueue *queue, VLANClientState *sender, + unsigned flags, const struct iovec *iov, int iovcnt, NetPacketSent *sent_cb) @@ -123,6 +127,7 @@ static ssize_t qemu_net_queue_append_iov(NetQueue *queue, packet = qemu_malloc(sizeof(NetPacket) + max_len); packet->sender = sender; packet->sent_cb = sent_cb; + packet->flags = flags; packet->size = 0; for (i = 0; i < iovcnt; i++) { @@ -139,13 +144,14 @@ static ssize_t qemu_net_queue_append_iov(NetQueue *queue, static ssize_t qemu_net_queue_deliver(NetQueue *queue, VLANClientState *sender, + unsigned flags, const uint8_t *data, size_t size) { ssize_t ret = -1; queue->delivering = 1; - ret = queue->deliver(sender, data, size, queue->opaque); + ret = queue->deliver(sender, flags, data, size, queue->opaque); queue->delivering = 0; return ret; @@ -153,13 +159,14 @@ static ssize_t qemu_net_queue_deliver(NetQueue *queue, static ssize_t qemu_net_queue_deliver_iov(NetQueue *queue, VLANClientState *sender, + unsigned flags, const struct iovec *iov, int iovcnt) { ssize_t ret = -1; queue->delivering = 1; - ret = queue->deliver_iov(sender, iov, iovcnt, queue->opaque); + ret = queue->deliver_iov(sender, flags, iov, iovcnt, queue->opaque); queue->delivering = 0; return ret; @@ -167,6 +174,7 @@ static ssize_t qemu_net_queue_deliver_iov(NetQueue *queue, ssize_t qemu_net_queue_send(NetQueue *queue, VLANClientState *sender, + unsigned flags, const uint8_t *data, size_t size, NetPacketSent *sent_cb) @@ -174,12 +182,12 @@ ssize_t qemu_net_queue_send(NetQueue *queue, ssize_t ret; if (queue->delivering) { - return qemu_net_queue_append(queue, sender, data, size, NULL); + return qemu_net_queue_append(queue, sender, flags, data, size, NULL); } - ret = qemu_net_queue_deliver(queue, sender, data, size); + ret = qemu_net_queue_deliver(queue, sender, flags, data, size); if (ret == 0 && sent_cb != NULL) { - qemu_net_queue_append(queue, sender, data, size, sent_cb); + qemu_net_queue_append(queue, sender, flags, data, size, sent_cb); return 0; } @@ -190,6 +198,7 @@ ssize_t qemu_net_queue_send(NetQueue *queue, ssize_t qemu_net_queue_send_iov(NetQueue *queue, VLANClientState *sender, + unsigned flags, const struct iovec *iov, int iovcnt, NetPacketSent *sent_cb) @@ -197,12 +206,12 @@ ssize_t qemu_net_queue_send_iov(NetQueue *queue, ssize_t ret; if (queue->delivering) { - return qemu_net_queue_append_iov(queue, sender, iov, iovcnt, NULL); + return qemu_net_queue_append_iov(queue, sender, flags, iov, iovcnt, NULL); } - ret = qemu_net_queue_deliver_iov(queue, sender, iov, iovcnt); + ret = qemu_net_queue_deliver_iov(queue, sender, flags, iov, iovcnt); if (ret == 0 && sent_cb != NULL) { - qemu_net_queue_append_iov(queue, sender, iov, iovcnt, sent_cb); + qemu_net_queue_append_iov(queue, sender, flags, iov, iovcnt, sent_cb); return 0; } @@ -234,6 +243,7 @@ void qemu_net_queue_flush(NetQueue *queue) ret = qemu_net_queue_deliver(queue, packet->sender, + packet->flags, packet->data, packet->size); if (ret == 0 && packet->sent_cb != NULL) { diff --git a/net-queue.h b/net-queue.h index ea17df61c5..343760e9d4 100644 --- a/net-queue.h +++ b/net-queue.h @@ -32,15 +32,19 @@ typedef struct NetQueue NetQueue; typedef void (NetPacketSent) (VLANClientState *sender, ssize_t ret); typedef ssize_t (NetPacketDeliver) (VLANClientState *sender, + unsigned flags, const uint8_t *buf, size_t size, void *opaque); typedef ssize_t (NetPacketDeliverIOV) (VLANClientState *sender, + unsigned flags, const struct iovec *iov, int iovcnt, void *opaque); +#define QEMU_NET_PACKET_FLAG_NONE 0 + NetQueue *qemu_new_net_queue(NetPacketDeliver *deliver, NetPacketDeliverIOV *deliver_iov, void *opaque); @@ -48,12 +52,14 @@ void qemu_del_net_queue(NetQueue *queue); ssize_t qemu_net_queue_send(NetQueue *queue, VLANClientState *sender, + unsigned flags, const uint8_t *data, size_t size, NetPacketSent *sent_cb); ssize_t qemu_net_queue_send_iov(NetQueue *queue, VLANClientState *sender, + unsigned flags, const struct iovec *iov, int iovcnt, NetPacketSent *sent_cb); diff --git a/net.c b/net.c index 431101eac4..fefed6c0c6 100644 --- a/net.c +++ b/net.c @@ -317,10 +317,12 @@ static char *assign_name(VLANClientState *vc1, const char *model) } static ssize_t qemu_deliver_packet(VLANClientState *sender, + unsigned flags, const uint8_t *data, size_t size, void *opaque); static ssize_t qemu_deliver_packet_iov(VLANClientState *sender, + unsigned flags, const struct iovec *iov, int iovcnt, void *opaque); @@ -465,6 +467,7 @@ int qemu_can_send_packet(VLANClientState *sender) } static ssize_t qemu_deliver_packet(VLANClientState *sender, + unsigned flags, const uint8_t *data, size_t size, void *opaque) @@ -479,6 +482,7 @@ static ssize_t qemu_deliver_packet(VLANClientState *sender, } static ssize_t qemu_vlan_deliver_packet(VLANClientState *sender, + unsigned flags, const uint8_t *buf, size_t size, void *opaque) @@ -558,7 +562,9 @@ ssize_t qemu_send_packet_async(VLANClientState *sender, queue = sender->vlan->send_queue; } - return qemu_net_queue_send(queue, sender, buf, size, sent_cb); + return qemu_net_queue_send(queue, sender, + QEMU_NET_PACKET_FLAG_NONE, + buf, size, sent_cb); } void qemu_send_packet(VLANClientState *vc, const uint8_t *buf, int size) @@ -595,6 +601,7 @@ static ssize_t calc_iov_length(const struct iovec *iov, int iovcnt) } static ssize_t qemu_deliver_packet_iov(VLANClientState *sender, + unsigned flags, const struct iovec *iov, int iovcnt, void *opaque) @@ -613,6 +620,7 @@ static ssize_t qemu_deliver_packet_iov(VLANClientState *sender, } static ssize_t qemu_vlan_deliver_packet_iov(VLANClientState *sender, + unsigned flags, const struct iovec *iov, int iovcnt, void *opaque) @@ -661,7 +669,9 @@ ssize_t qemu_sendv_packet_async(VLANClientState *sender, queue = sender->vlan->send_queue; } - return qemu_net_queue_send_iov(queue, sender, iov, iovcnt, sent_cb); + return qemu_net_queue_send_iov(queue, sender, + QEMU_NET_PACKET_FLAG_NONE, + iov, iovcnt, sent_cb); } ssize_t