From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57621) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t25-0005Hk-66 for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:23:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t1s-0002wM-4D for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:23:01 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53542 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1r-0002w5-PP for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:47 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 54350A52BF for ; Mon, 29 Jul 2013 21:22:47 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:20:12 +0200 Message-Id: <1375125630-24869-156-git-send-email-afaerber@suse.de> In-Reply-To: <1375125630-24869-1-git-send-email-afaerber@suse.de> References: <1375125630-24869-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 155/173] m48t59: QOM cast cleanup for M48t59SysBusState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= Signed-off-by: Andreas F=C3=A4rber --- hw/timer/m48t59.c | 16 ++++++++++------ include/hw/timer/m48t59.h | 3 +++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/hw/timer/m48t59.c b/hw/timer/m48t59.c index be3490b..0cc9e5b 100644 --- a/hw/timer/m48t59.c +++ b/hw/timer/m48t59.c @@ -83,8 +83,12 @@ typedef struct M48t59ISAState { MemoryRegion io; } M48t59ISAState; =20 +#define SYSBUS_M48T59(obj) \ + OBJECT_CHECK(M48t59SysBusState, (obj), TYPE_SYSBUS_M48T59) + typedef struct M48t59SysBusState { - SysBusDevice busdev; + SysBusDevice parent_obj; + M48t59State state; MemoryRegion io; } M48t59SysBusState; @@ -621,7 +625,7 @@ static void m48t59_reset_isa(DeviceState *d) =20 static void m48t59_reset_sysbus(DeviceState *d) { - M48t59SysBusState *sys =3D container_of(d, M48t59SysBusState, busdev= .qdev); + M48t59SysBusState *sys =3D SYSBUS_M48T59(d); M48t59State *NVRAM =3D &sys->state; =20 m48t59_reset_common(NVRAM); @@ -646,13 +650,13 @@ M48t59State *m48t59_init(qemu_irq IRQ, hwaddr mem_b= ase, M48t59SysBusState *d; M48t59State *state; =20 - dev =3D qdev_create(NULL, "m48t59"); + dev =3D qdev_create(NULL, TYPE_SYSBUS_M48T59); qdev_prop_set_uint32(dev, "model", model); qdev_prop_set_uint32(dev, "size", size); qdev_prop_set_uint32(dev, "io_base", io_base); qdev_init_nofail(dev); s =3D SYS_BUS_DEVICE(dev); - d =3D FROM_SYSBUS(M48t59SysBusState, s); + d =3D SYSBUS_M48T59(dev); state =3D &d->state; sysbus_connect_irq(s, 0, IRQ); memory_region_init_io(&d->io, OBJECT(d), &m48t59_io_ops, state, @@ -716,7 +720,7 @@ static void m48t59_isa_realize(DeviceState *dev, Erro= r **errp) =20 static int m48t59_init1(SysBusDevice *dev) { - M48t59SysBusState *d =3D FROM_SYSBUS(M48t59SysBusState, dev); + M48t59SysBusState *d =3D SYSBUS_M48T59(dev); M48t59State *s =3D &d->state; Error *err =3D NULL; =20 @@ -776,7 +780,7 @@ static void m48t59_class_init(ObjectClass *klass, voi= d *data) } =20 static const TypeInfo m48t59_info =3D { - .name =3D "m48t59", + .name =3D TYPE_SYSBUS_M48T59, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(M48t59SysBusState), .class_init =3D m48t59_class_init, diff --git a/include/hw/timer/m48t59.h b/include/hw/timer/m48t59.h index 59337fa..8217522 100644 --- a/include/hw/timer/m48t59.h +++ b/include/hw/timer/m48t59.h @@ -21,6 +21,9 @@ int PPC_NVRAM_set_params (nvram_t *nvram, uint16_t NVRA= M_size, uint32_t initrd_image, uint32_t initrd_size, uint32_t NVRAM_image, int width, int height, int depth); + +#define TYPE_SYSBUS_M48T59 "m48t59" + typedef struct M48t59State M48t59State; =20 void m48t59_write (void *private, uint32_t addr, uint32_t val); --=20 1.8.1.4