From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
Stefan Hajnoczi <stefanha@redhat.com>
Subject: [Qemu-devel] [PULL for-2.4 2/9] e1000: flush packets when link comes up
Date: Tue, 7 Jul 2015 13:38:18 +0100 [thread overview]
Message-ID: <1436272705-28499-3-git-send-email-stefanha@redhat.com> (raw)
In-Reply-To: <1436272705-28499-1-git-send-email-stefanha@redhat.com>
e1000_can_receive() checks the link up status register bit. If the bit
is clear, packets will be queued and the peer may disable receive to
avoid wasting CPU reading packets that cannot be delivered. The queue
must be flushed once the link comes back up again.
This patch fixes broken e1000 receive with Mac OS X Snow Leopard guests
and tap networking. Flushing the queue invokes the async send callback,
which re-enables tap fd read.
Reported-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Message-id: 1435223885-12745-1-git-send-email-stefanha@redhat.com
---
hw/net/e1000.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/hw/net/e1000.c b/hw/net/e1000.c
index bab8e2a..5c6bcd0 100644
--- a/hw/net/e1000.c
+++ b/hw/net/e1000.c
@@ -185,6 +185,9 @@ e1000_link_up(E1000State *s)
{
s->mac_reg[STATUS] |= E1000_STATUS_LU;
s->phy_reg[PHY_STATUS] |= MII_SR_LINK_STATUS;
+
+ /* E1000_STATUS_LU is tested by e1000_can_receive() */
+ qemu_flush_queued_packets(qemu_get_queue(s->nic));
}
static bool
--
2.4.3
next prev parent reply other threads:[~2015-07-07 12:38 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-07 12:38 [Qemu-devel] [PULL for-2.4 0/9] Net patches Stefan Hajnoczi
2015-07-07 12:38 ` [Qemu-devel] [PULL for-2.4 1/9] rocker: fix memory leak Stefan Hajnoczi
2015-07-07 12:38 ` Stefan Hajnoczi [this message]
2015-07-07 12:38 ` [Qemu-devel] [PULL for-2.4 3/9] vmxnet3: Fix incorrect small packet padding Stefan Hajnoczi
2015-07-07 12:38 ` [Qemu-devel] [PULL for-2.4 4/9] rocker: don't queue receive pkts when port is disabled Stefan Hajnoczi
2015-07-07 12:38 ` [Qemu-devel] [PULL for-2.4 5/9] rocker: fix misplaced break statement Stefan Hajnoczi
2015-07-07 12:38 ` [Qemu-devel] [PULL for-2.4 6/9] rocker: fix missing break statements Stefan Hajnoczi
2015-07-07 12:38 ` [Qemu-devel] [PULL for-2.4 7/9] rocker: return -1 when dropping packet on ingress Stefan Hajnoczi
2015-07-07 12:38 ` [Qemu-devel] [PULL for-2.4 8/9] rocker: mark copy-to-cpu pkts as forwarding offloaded Stefan Hajnoczi
2015-07-07 12:38 ` [Qemu-devel] [PULL for-2.4 9/9] rocker: tests: don't need to specify master/self when setting vlans Stefan Hajnoczi
2015-07-07 15:57 ` [Qemu-devel] [PULL for-2.4 0/9] Net patches Peter Maydell
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=1436272705-28499-3-git-send-email-stefanha@redhat.com \
--to=stefanha@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@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).