From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
Jason Wang <jasowang@redhat.com>,
qemu-stable@nongnu.org, Stefan Hajnoczi <stefanha@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>
Subject: [Qemu-devel] [PULL 5/7] net: invoke callback when purging queue
Date: Thu, 4 Sep 2014 16:50:09 +0100 [thread overview]
Message-ID: <1409845811-27943-6-git-send-email-stefanha@redhat.com> (raw)
In-Reply-To: <1409845811-27943-1-git-send-email-stefanha@redhat.com>
From: "Michael S. Tsirkin" <mst@redhat.com>
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 | 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
next prev parent reply other threads:[~2014-09-04 15:50 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-04 15:50 [Qemu-devel] [PULL 0/7] Net patches Stefan Hajnoczi
2014-09-04 15:50 ` [Qemu-devel] [PULL 1/7] net: Forbid dealing with packets when VM is not running Stefan Hajnoczi
2014-09-04 15:50 ` [Qemu-devel] [PULL 2/7] net: don't use set/get_pointer() in set/get_netdev() Stefan Hajnoczi
2014-09-04 15:50 ` [Qemu-devel] [PULL 3/7] virtio-net: don't run bh on vm stopped Stefan Hajnoczi
2014-09-04 15:50 ` [Qemu-devel] [PULL 4/7] virtio: don't call device on !vm_running Stefan Hajnoczi
2014-09-04 15:50 ` Stefan Hajnoczi [this message]
2014-09-04 15:50 ` [Qemu-devel] [PULL 6/7] net: complete all queued packets on VM stop Stefan Hajnoczi
2014-09-09 6:05 ` Jason Wang
2014-09-04 15:50 ` [Qemu-devel] [PULL 7/7] virtio-net: purge outstanding packets when starting vhost Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1409845811-27943-6-git-send-email-stefanha@redhat.com \
--to=stefanha@redhat.com \
--cc=jasowang@redhat.com \
--cc=mst@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-stable@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).