From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1KQTFj-0000wA-Ke
	for qemu-devel@nongnu.org; Tue, 05 Aug 2008 16:35:31 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1KQTFh-0000vy-90
	for qemu-devel@nongnu.org; Tue, 05 Aug 2008 16:35:30 -0400
Received: from [199.232.76.173] (port=54873 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1KQTFh-0000vv-1F
	for qemu-devel@nongnu.org; Tue, 05 Aug 2008 16:35:29 -0400
Received: from main.gmane.org ([80.91.229.2]:44358 helo=ciao.gmane.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <gceq-qemu-devel@m.gmane.org>)
	id 1KQTFg-000294-MT
	for qemu-devel@nongnu.org; Tue, 05 Aug 2008 16:35:28 -0400
Received: from list by ciao.gmane.org with local (Exim 4.43)
	id 1KQTFb-0002mW-KY
	for qemu-devel@nongnu.org; Tue, 05 Aug 2008 20:35:23 +0000
Received: from rrcs-71-41-149-67.sw.biz.rr.com ([71.41.149.67])
	by main.gmane.org with esmtp (Gmexim 0.1 (Debian))
	id 1AlnuQ-0007hv-00
	for <qemu-devel@nongnu.org>; Tue, 05 Aug 2008 20:35:23 +0000
Received: from Charles_Duffy by rrcs-71-41-149-67.sw.biz.rr.com with local
	(Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00
	for <qemu-devel@nongnu.org>; Tue, 05 Aug 2008 20:35:23 +0000
From: Charles Duffy <Charles_Duffy@messageone.com>
Date: Tue, 05 Aug 2008 15:35:07 -0500
Message-ID: <g7adi4$as5$1@ger.gmane.org>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="------------040304030703030905030206"
Sender: news <news@ger.gmane.org>
Subject: [Qemu-devel] [PATCH] only check RCTL_EN in e1000_can_receive()
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

This is a multi-part message in MIME format.
--------------040304030703030905030206
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

e1000_receive() has code to raise a receive overflow interrupt when the 
receive buffer head and tail match. However, with the present 
implementation of e1000_can_receive(), this code is unreachable -- and 
etherboot breaks as a result.

The attached quick-and-dirty patch fixes etherboot for e1000, and does 
not appear to break post-boot functionality.

--------------040304030703030905030206
Content-Type: text/x-diff;
 name="qemu-e1000-receive-overflow-handler-reachability.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename*0="qemu-e1000-receive-overflow-handler-reachability.patch"

Signed-off-by: Charles Duffy <charles_duffy@messageone.com>

Index: hw/e1000.c
===================================================================
--- hw/e1000.c	(revision 4985)
+++ hw/e1000.c	(working copy)
@@ -524,8 +524,7 @@
 {
     E1000State *s = opaque;
 
-    return (!(s->mac_reg[RCTL] & E1000_RCTL_EN) ||
-            s->mac_reg[RDH] != s->mac_reg[RDT]);
+    return (s->mac_reg[RCTL] & E1000_RCTL_EN);
 }
 
 static void

--------------040304030703030905030206--