diff options
Diffstat (limited to 'net-queue.c')
| -rw-r--r-- | net-queue.c | 26 |
1 files changed, 18 insertions, 8 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) { |