Received: from [140.186.70.92] (port=57206 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OTc5Q-0002XA-Aw for qemu-devel@nongnu.org; Tue, 29 Jun 2010 10:46:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OTc5L-0000mH-EG for qemu-devel@nongnu.org; Tue, 29 Jun 2010 10:46:56 -0400 Received: from david.siemens.de ([192.35.17.14]:18302) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OTc5K-0000lO-AL for qemu-devel@nongnu.org; Tue, 29 Jun 2010 10:46:51 -0400 Received: from mail2.siemens.de (mail2.siemens.de [139.25.208.11]) by david.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id o5TEkkYf020279 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 29 Jun 2010 16:46:46 +0200 Received: from [139.25.109.167] (mchn012c.mchp.siemens.de [139.25.109.167] (may be forged)) by mail2.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id o5TEkjXT015307 for ; Tue, 29 Jun 2010 16:46:46 +0200 Message-ID: <4C2A0755.9060400@siemens.com> Date: Tue, 29 Jun 2010 16:46:45 +0200 From: Jan Kiszka MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] pcnet: Do not receive external frames in loopback mode List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel While not explicitly stated in the spec, it was observed on real systems that enabling loopback testing on the pcnet controller disables reception of external frames. And some legacy software relies on it, so provide this behavior. Signed-off-by: Jan Kiszka --- hw/pcnet.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/pcnet.c b/hw/pcnet.c index 5e63eb5..5c94dd2 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -1048,9 +1048,10 @@ ssize_t pcnet_receive(VLANClientState *nc, const uint8_t *buf, size_t size_) int crc_err = 0; int size = size_; - if (CSR_DRX(s) || CSR_STOP(s) || CSR_SPND(s) || !size) + if (CSR_DRX(s) || CSR_STOP(s) || CSR_SPND(s) || !size || + (CSR_LOOP(s) && !s->looptest)) { return -1; - + } #ifdef PCNET_DEBUG printf("pcnet_receive size=%d\n", size); #endif -- 1.7.1