From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57206) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1e-0004qZ-8z for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t1S-0002nR-HY for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:34 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53486 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1R-0002nL-Vq for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:22 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:19:42 +0200 Message-Id: <1375125630-24869-126-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 125/173] stellaris_enet: QOM cast cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Paul Brook Signed-off-by: Andreas F=C3=A4rber --- hw/net/stellaris_enet.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/hw/net/stellaris_enet.c b/hw/net/stellaris_enet.c index aac7c76..6194e33 100644 --- a/hw/net/stellaris_enet.c +++ b/hw/net/stellaris_enet.c @@ -42,8 +42,13 @@ do { fprintf(stderr, "stellaris_enet: error: " fmt , #= # __VA_ARGS__);} while (0) #define SE_TCTL_CRC 0x04 #define SE_TCTL_DUPLEX 0x08 =20 +#define TYPE_STELLARIS_ENET "stellaris_enet" +#define STELLARIS_ENET(obj) \ + OBJECT_CHECK(stellaris_enet_state, (obj), TYPE_STELLARIS_ENET) + typedef struct { - SysBusDevice busdev; + SysBusDevice parent_obj; + uint32_t ris; uint32_t im; uint32_t rctl; @@ -386,7 +391,7 @@ static void stellaris_enet_cleanup(NetClientState *nc= ) { stellaris_enet_state *s =3D qemu_get_nic_opaque(nc); =20 - unregister_savevm(&s->busdev.qdev, "stellaris_enet", s); + unregister_savevm(DEVICE(s), "stellaris_enet", s); =20 memory_region_destroy(&s->mmio); =20 @@ -401,22 +406,23 @@ static NetClientInfo net_stellaris_enet_info =3D { .cleanup =3D stellaris_enet_cleanup, }; =20 -static int stellaris_enet_init(SysBusDevice *dev) +static int stellaris_enet_init(SysBusDevice *sbd) { - stellaris_enet_state *s =3D FROM_SYSBUS(stellaris_enet_state, dev); + DeviceState *dev =3D DEVICE(sbd); + stellaris_enet_state *s =3D STELLARIS_ENET(dev); =20 memory_region_init_io(&s->mmio, OBJECT(s), &stellaris_enet_ops, s, "stellaris_enet", 0x1000); - sysbus_init_mmio(dev, &s->mmio); - sysbus_init_irq(dev, &s->irq); + sysbus_init_mmio(sbd, &s->mmio); + sysbus_init_irq(sbd, &s->irq); qemu_macaddr_default_if_unset(&s->conf.macaddr); =20 s->nic =3D qemu_new_nic(&net_stellaris_enet_info, &s->conf, - object_get_typename(OBJECT(dev)), dev->qdev.id= , s); + object_get_typename(OBJECT(dev)), dev->id, s); qemu_format_nic_info_str(qemu_get_queue(s->nic), s->conf.macaddr.a); =20 stellaris_enet_reset(s); - register_savevm(&s->busdev.qdev, "stellaris_enet", -1, 1, + register_savevm(dev, "stellaris_enet", -1, 1, stellaris_enet_save, stellaris_enet_load, s); return 0; } @@ -436,7 +442,7 @@ static void stellaris_enet_class_init(ObjectClass *kl= ass, void *data) } =20 static const TypeInfo stellaris_enet_info =3D { - .name =3D "stellaris_enet", + .name =3D TYPE_STELLARIS_ENET, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(stellaris_enet_state), .class_init =3D stellaris_enet_class_init, --=20 1.8.1.4