From patchwork Mon Apr 16 15:36:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 152900 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id AF831B700B for ; Tue, 17 Apr 2012 01:37:01 +1000 (EST) Received: from localhost ([::1]:52741 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SJnz9-00017S-E8 for incoming@patchwork.ozlabs.org; Mon, 16 Apr 2012 11:36:59 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42982) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SJnyv-0000wW-0B for qemu-devel@nongnu.org; Mon, 16 Apr 2012 11:36:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SJnyn-0004WJ-KE for qemu-devel@nongnu.org; Mon, 16 Apr 2012 11:36:44 -0400 Received: from thoth.sbs.de ([192.35.17.2]:19487) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SJnyn-0004Um-9G for qemu-devel@nongnu.org; Mon, 16 Apr 2012 11:36:37 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by thoth.sbs.de (8.13.6/8.13.6) with ESMTP id q3GFaYHL004219; Mon, 16 Apr 2012 17:36:34 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id q3GFaXCg029283; Mon, 16 Apr 2012 17:36:34 +0200 From: Jan Kiszka To: Anthony Liguori , qemu-devel@nongnu.org Date: Mon, 16 Apr 2012 17:36:30 +0200 Message-Id: <6655124ddd6442b19a4b43b27e7d5a3846c4e6a8.1334590578.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 192.35.17.2 Subject: [Qemu-devel] [PULL][PATCH 2/5] pcnet: Clear ERR in CSR0 on stop X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org pcnet_stop already clears any reason (BABL, CERR, MISS, MERR) why ERR (bit 15) should be set in CRS0. So we have to clear that bit as well. Signed-off-by: Jan Kiszka --- hw/pcnet.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/pcnet.c b/hw/pcnet.c index c53f06e..7413409 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -884,7 +884,7 @@ static void pcnet_stop(PCNetState *s) #ifdef PCNET_DEBUG printf("pcnet_stop\n"); #endif - s->csr[0] &= ~0x7feb; + s->csr[0] &= ~0xffeb; s->csr[0] |= 0x0014; s->csr[4] &= ~0x02c2; s->csr[5] &= ~0x0011;