From patchwork Sun Jan 2 18:44:49 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Herv=C3=A9_Poussineau?= X-Patchwork-Id: 77196 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 48439B70A4 for ; Mon, 3 Jan 2011 05:47:20 +1100 (EST) Received: from localhost ([127.0.0.1]:41162 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PZSx7-0001I4-4K for incoming@patchwork.ozlabs.org; Sun, 02 Jan 2011 13:46:49 -0500 Received: from [140.186.70.92] (port=37356 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PZSwH-00011R-Ig for qemu-devel@nongnu.org; Sun, 02 Jan 2011 13:45:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PZSwG-0003QH-5q for qemu-devel@nongnu.org; Sun, 02 Jan 2011 13:45:57 -0500 Received: from smtp5-g21.free.fr ([212.27.42.5]:36932) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PZSwF-0003Ok-IE for qemu-devel@nongnu.org; Sun, 02 Jan 2011 13:45:56 -0500 Received: from localhost.localdomain (unknown [88.171.126.33]) by smtp5-g21.free.fr (Postfix) with ESMTP id 84694D48096; Sun, 2 Jan 2011 19:45:43 +0100 (CET) From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= To: qemu-devel@nongnu.org Date: Sun, 2 Jan 2011 19:44:49 +0100 Message-Id: <1293993889-16276-1-git-send-email-hpoussin@reactos.org> X-Mailer: git-send-email 1.7.2.3 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Subject: [Qemu-devel] [PATCH] m48t59: Fix a wrong opaque passed to nvram read and write routines 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 This unregresses Sun4m and PPC prep/ref405ep machines Signed-off-by: Hervé Poussineau --- hw/m48t59.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/hw/m48t59.c b/hw/m48t59.c index 6991e2e..2020487 100644 --- a/hw/m48t59.c +++ b/hw/m48t59.c @@ -642,6 +642,7 @@ M48t59State *m48t59_init(qemu_irq IRQ, target_phys_addr_t mem_base, DeviceState *dev; SysBusDevice *s; M48t59SysBusState *d; + M48t59State *state; dev = qdev_create(NULL, "m48t59"); qdev_prop_set_uint32(dev, "type", type); @@ -649,18 +650,18 @@ M48t59State *m48t59_init(qemu_irq IRQ, target_phys_addr_t mem_base, qdev_prop_set_uint32(dev, "io_base", io_base); qdev_init_nofail(dev); s = sysbus_from_qdev(dev); + d = FROM_SYSBUS(M48t59SysBusState, s); + state = &d->state; sysbus_connect_irq(s, 0, IRQ); if (io_base != 0) { - register_ioport_read(io_base, 0x04, 1, NVRAM_readb, s); - register_ioport_write(io_base, 0x04, 1, NVRAM_writeb, s); + register_ioport_read(io_base, 0x04, 1, NVRAM_readb, state); + register_ioport_write(io_base, 0x04, 1, NVRAM_writeb, state); } if (mem_base != 0) { sysbus_mmio_map(s, 0, mem_base); } - d = FROM_SYSBUS(M48t59SysBusState, s); - - return &d->state; + return state; } M48t59State *m48t59_init_isa(uint32_t io_base, uint16_t size, int type)