From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38369) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCS8u-0002FU-94 for qemu-devel@nongnu.org; Tue, 07 Jul 2015 08:38:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZCS8t-0000Vy-9x for qemu-devel@nongnu.org; Tue, 07 Jul 2015 08:38:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36436) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCS8t-0000V3-5B for qemu-devel@nongnu.org; Tue, 07 Jul 2015 08:38:31 -0400 From: Stefan Hajnoczi Date: Tue, 7 Jul 2015 13:38:18 +0100 Message-Id: <1436272705-28499-3-git-send-email-stefanha@redhat.com> In-Reply-To: <1436272705-28499-1-git-send-email-stefanha@redhat.com> References: <1436272705-28499-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL for-2.4 2/9] e1000: flush packets when link comes up List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Stefan Hajnoczi 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 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