From patchwork Thu Aug 5 00:21:36 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hollis Blanchard X-Patchwork-Id: 60909 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 51D53B70A9 for ; Thu, 5 Aug 2010 10:28:30 +1000 (EST) Received: from localhost ([127.0.0.1]:43278 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OgoJv-0000x5-Kf for incoming@patchwork.ozlabs.org; Wed, 04 Aug 2010 20:28:27 -0400 Received: from [140.186.70.92] (port=35718 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OgoEA-0005Pj-2H for qemu-devel@nongnu.org; Wed, 04 Aug 2010 20:22:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OgoE8-0003Zy-Ai for qemu-devel@nongnu.org; Wed, 04 Aug 2010 20:22:29 -0400 Received: from qmta04.emeryville.ca.mail.comcast.net ([76.96.30.40]:47990) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OgoE8-0003Pu-3c for qemu-devel@nongnu.org; Wed, 04 Aug 2010 20:22:28 -0400 Received: from omta04.emeryville.ca.mail.comcast.net ([76.96.30.35]) by qmta04.emeryville.ca.mail.comcast.net with comcast id qHSD1e00C0lTkoCA4QN5uz; Thu, 05 Aug 2010 00:22:05 +0000 Received: from reflectivity.mgc.mentorg.com ([24.20.193.174]) by omta04.emeryville.ca.mail.comcast.net with comcast id qQN31e00M3mDZfc8QQN5Ro; Thu, 05 Aug 2010 00:22:05 +0000 From: Hollis Blanchard To: qemu-devel@nongnu.org Date: Wed, 4 Aug 2010 17:21:36 -0700 Message-Id: <1280967697-1875-4-git-send-email-hollis@penguinppc.org> X-Mailer: git-send-email 1.7.2 In-Reply-To: <1280967697-1875-1-git-send-email-hollis@penguinppc.org> References: <1280967697-1875-1-git-send-email-hollis@penguinppc.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: kvm-ppc@vger.kernel.org Subject: [Qemu-devel] [PATCH 3/4] ppc4xx: don't unregister RAM at reset X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The PowerPC 4xx SDRAM controller emulation unregisters RAM in its reset callback. However, qemu_system_reset() is now called at initialization time, so all RAM is unregistered before starting the guest (!). Signed-off-by: Hollis Blanchard --- hw/ppc4xx_devs.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) This fixes a critical bug in PowerPC 440 Bamboo board emulation. diff --git a/hw/ppc4xx_devs.c b/hw/ppc4xx_devs.c index be130c4..7f698b8 100644 --- a/hw/ppc4xx_devs.c +++ b/hw/ppc4xx_devs.c @@ -619,7 +619,6 @@ static void sdram_reset (void *opaque) /* We pre-initialize RAM banks */ sdram->status = 0x00000000; sdram->cfg = 0x00800000; - sdram_unmap_bcr(sdram); } void ppc4xx_sdram_init (CPUState *env, qemu_irq irq, int nbanks,