OSDN Git Service

net: invoke callback when purging queue
authorMichael S. Tsirkin <mst@redhat.com>
Thu, 4 Sep 2014 08:39:10 +0000 (11:39 +0300)
committerStefan Hajnoczi <stefanha@redhat.com>
Thu, 4 Sep 2014 16:19:09 +0000 (17:19 +0100)
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>
net/queue.c

index 859d02a..f948318 100644 (file)
@@ -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);
         }
     }