From 5df6a1855b62dc653515d919e48c5b6f00c48f32 Mon Sep 17 00:00:00 2001 From: Stefan Hajnoczi Date: Thu, 25 Jun 2015 10:18:05 +0100 Subject: [PATCH] e1000: flush packets when link comes up 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 Signed-off-by: Stefan Hajnoczi Reviewed-by: Fam Zheng 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 bab8e2abfb3..5c6bcd00149 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.39.5