From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34419) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V33Mn-0006i4-6K for qemu-devel@nongnu.org; Sat, 27 Jul 2013 08:12:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V33Ml-0002HE-P6 for qemu-devel@nongnu.org; Sat, 27 Jul 2013 08:12:57 -0400 Received: from cantor2.suse.de ([195.135.220.15]:60533 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V31zs-0003dv-8j for qemu-devel@nongnu.org; Sat, 27 Jul 2013 06:45:12 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 27 Jul 2013 12:44:52 +0200 Message-Id: <1374921903-13114-2-git-send-email-afaerber@suse.de> In-Reply-To: <1374921903-13114-1-git-send-email-afaerber@suse.de> References: <1374921903-13114-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] [PATCH qom-next for-1.6 01/11] cadence_gem: QOM cast cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Crosthwaite , =?UTF-8?q?Andreas=20F=C3=A4rber?= Signed-off-by: Andreas F=C3=A4rber --- hw/net/cadence_gem.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c index ac929cb..4a355bb 100644 --- a/hw/net/cadence_gem.c +++ b/hw/net/cadence_gem.c @@ -315,8 +315,12 @@ static inline void rx_desc_set_length(unsigned *desc= , unsigned len) desc[1] |=3D len; } =20 -typedef struct { - SysBusDevice busdev; +#define TYPE_CADENCE_GEM "cadence_gem" +#define GEM(obj) OBJECT_CHECK(GemState, (obj), TYPE_CADENCE_GEM) + +typedef struct GemState { + SysBusDevice parent_obj; + MemoryRegion iomem; NICState *nic; NICConf conf; @@ -945,7 +949,7 @@ static void gem_phy_reset(GemState *s) =20 static void gem_reset(DeviceState *d) { - GemState *s =3D FROM_SYSBUS(GemState, SYS_BUS_DEVICE(d)); + GemState *s =3D GEM(d); =20 DB_PRINT("\n"); =20 @@ -1155,22 +1159,22 @@ static NetClientInfo net_gem_info =3D { .link_status_changed =3D gem_set_link, }; =20 -static int gem_init(SysBusDevice *dev) +static int gem_init(SysBusDevice *sbd) { - GemState *s; + DeviceState *dev =3D DEVICE(sbd); + GemState *s =3D GEM(dev); =20 DB_PRINT("\n"); =20 - s =3D FROM_SYSBUS(GemState, dev); gem_init_register_masks(s); memory_region_init_io(&s->iomem, OBJECT(s), &gem_ops, s, "enet", sizeof(s->regs)); - sysbus_init_mmio(dev, &s->iomem); - sysbus_init_irq(dev, &s->irq); + sysbus_init_mmio(sbd, &s->iomem); + sysbus_init_irq(sbd, &s->irq); qemu_macaddr_default_if_unset(&s->conf.macaddr); =20 s->nic =3D qemu_new_nic(&net_gem_info, &s->conf, - object_get_typename(OBJECT(dev)), dev->qdev.id, s); + object_get_typename(OBJECT(dev)), dev->id, s); =20 return 0; } @@ -1206,10 +1210,10 @@ static void gem_class_init(ObjectClass *klass, vo= id *data) } =20 static const TypeInfo gem_info =3D { - .class_init =3D gem_class_init, - .name =3D "cadence_gem", + .name =3D TYPE_CADENCE_GEM, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(GemState), + .class_init =3D gem_class_init, }; =20 static void gem_register_types(void) --=20 1.8.1.4