From mboxrd@z Thu Jan 1 00:00:00 1970 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 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sun, 2 Jan 2011 19:44:49 +0100 Message-Id: <1293993889-16276-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH] m48t59: Fix a wrong opaque passed to nvram read and write routines List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= This unregresses Sun4m and PPC prep/ref405ep machines Signed-off-by: Herv=C3=A9 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_ad= dr_t mem_base, DeviceState *dev; SysBusDevice *s; M48t59SysBusState *d; + M48t59State *state; =20 dev =3D 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 =3D sysbus_from_qdev(dev); + d =3D FROM_SYSBUS(M48t59SysBusState, s); + state =3D &d->state; sysbus_connect_irq(s, 0, IRQ); if (io_base !=3D 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 !=3D 0) { sysbus_mmio_map(s, 0, mem_base); } =20 - d =3D FROM_SYSBUS(M48t59SysBusState, s); - - return &d->state; + return state; } =20 M48t59State *m48t59_init_isa(uint32_t io_base, uint16_t size, int type) --=20 1.7.2.3