summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2014-09-04 11:39:10 +0300
committerStefan Hajnoczi <stefanha@redhat.com>2014-09-04 17:19:09 +0100
commit07d8084624b3f5cbde7777849147a6a3a862e90a (patch)
treec293e54558eccc444213ab399426eb11168d3954
parent269bd822e7f5ab80048b05fb7076236ed66ffbce (diff)
downloadqemu-07d8084624b3f5cbde7777849147a6a3a862e90a.zip
net: invoke callback when purging queue
devices rely on packet callbacks eventually running, but we violate this rule whenever we purge the queue. To fix, invoke callbacks on all packets on purge. Set length to 0, this way callers can detect that this happened and re-queue if necessary. Cc: qemu-stable@nongnu.org Cc: Jason Wang <jasowang@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Acked-by: Jason Wang <jasowang@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-rw-r--r--net/queue.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/queue.c b/net/queue.c
index 859d02a136..f948318718 100644
--- a/net/queue.c
+++ b/net/queue.c
@@ -233,6 +233,9 @@ void qemu_net_queue_purge(NetQueue *queue, NetClientState *from)
if (packet->sender == from) {
QTAILQ_REMOVE(&queue->packets, packet, entry);
queue->nq_count--;
+ if (packet->sent_cb) {
+ packet->sent_cb(packet->sender, 0);
+ }
g_free(packet);
}
}