From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46236) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPZIy-000451-Go for qemu-devel@nongnu.org; Thu, 04 Sep 2014 11:50:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XPZIt-0006gN-8m for qemu-devel@nongnu.org; Thu, 04 Sep 2014 11:50:36 -0400 From: Stefan Hajnoczi Date: Thu, 4 Sep 2014 16:50:09 +0100 Message-Id: <1409845811-27943-6-git-send-email-stefanha@redhat.com> In-Reply-To: <1409845811-27943-1-git-send-email-stefanha@redhat.com> References: <1409845811-27943-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 5/7] net: invoke callback when purging queue List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Jason Wang , qemu-stable@nongnu.org, Stefan Hajnoczi , "Michael S. Tsirkin" From: "Michael S. Tsirkin" 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 Signed-off-by: Michael S. Tsirkin Acked-by: Jason Wang Signed-off-by: Stefan Hajnoczi --- net/queue.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/queue.c b/net/queue.c index 859d02a..f948318 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); } } -- 1.9.3