From: Michael S. Tsirkin <mst@redhat.com>
Date: Thu, 4 Sep 2014 08:39:10 +0000 (+0300)
Subject: net: invoke callback when purging queue
X-Git-Tag: v2.1.1~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d9c06c0d794a3729be7f9772b0ee654ddfc7f5a7;p=thirdparty%2Fqemu.git

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>
(cherry picked from commit 07d8084624b3f5cbde7777849147a6a3a862e90a)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---

diff --git a/net/queue.c b/net/queue.c
index 859d02a1362..f9483187181 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);
         }
     }