From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53707) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V32y6-00088K-6v for qemu-devel@nongnu.org; Sat, 27 Jul 2013 07:47:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V32y5-0001jE-7I for qemu-devel@nongnu.org; Sat, 27 Jul 2013 07:47:26 -0400 Received: from cantor2.suse.de ([195.135.220.15]:60537 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V31zs-0003e2-8x for qemu-devel@nongnu.org; Sat, 27 Jul 2013 06:45:12 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 9FC50A5211 for ; Sat, 27 Jul 2013 12:45:10 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 27 Jul 2013 12:44:55 +0200 Message-Id: <1374921903-13114-5-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 04/11] lan9118: QOM cast cleanup 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/net/lan9118.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c index 3323f48..2c838f6 100644 --- a/hw/net/lan9118.c +++ b/hw/net/lan9118.c @@ -170,8 +170,12 @@ static const VMStateDescription vmstate_lan9118_pack= et =3D { } }; =20 +#define TYPE_LAN9118 "lan9118" +#define LAN9118(obj) OBJECT_CHECK(lan9118_state, (obj), TYPE_LAN9118) + typedef struct { - SysBusDevice busdev; + SysBusDevice parent_obj; + NICState *nic; NICConf conf; qemu_irq irq; @@ -401,7 +405,8 @@ static void phy_reset(lan9118_state *s) =20 static void lan9118_reset(DeviceState *d) { - lan9118_state *s =3D FROM_SYSBUS(lan9118_state, SYS_BUS_DEVICE(d)); + lan9118_state *s =3D LAN9118(d); + s->irq_cfg &=3D (IRQ_TYPE | IRQ_POL); s->int_sts =3D 0; s->int_en =3D 0; @@ -1053,7 +1058,7 @@ static void lan9118_writel(void *opaque, hwaddr off= set, case CSR_HW_CFG: if (val & 1) { /* SRST */ - lan9118_reset(&s->busdev.qdev); + lan9118_reset(DEVICE(s)); } else { s->hw_cfg =3D (val & 0x003f300) | (s->hw_cfg & 0x4); } @@ -1320,9 +1325,10 @@ static NetClientInfo net_lan9118_info =3D { .link_status_changed =3D lan9118_set_link, }; =20 -static int lan9118_init1(SysBusDevice *dev) +static int lan9118_init1(SysBusDevice *sbd) { - lan9118_state *s =3D FROM_SYSBUS(lan9118_state, dev); + DeviceState *dev =3D DEVICE(sbd); + lan9118_state *s =3D LAN9118(dev); QEMUBH *bh; int i; const MemoryRegionOps *mem_ops =3D @@ -1330,12 +1336,12 @@ static int lan9118_init1(SysBusDevice *dev) =20 memory_region_init_io(&s->mmio, OBJECT(dev), mem_ops, s, "lan9118-mmio", 0x100); - 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_lan9118_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); s->eeprom[0] =3D 0xa5; for (i =3D 0; i < 6; i++) { @@ -1370,7 +1376,7 @@ static void lan9118_class_init(ObjectClass *klass, = void *data) } =20 static const TypeInfo lan9118_info =3D { - .name =3D "lan9118", + .name =3D TYPE_LAN9118, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(lan9118_state), .class_init =3D lan9118_class_init, @@ -1389,7 +1395,7 @@ void lan9118_init(NICInfo *nd, uint32_t base, qemu_= irq irq) SysBusDevice *s; =20 qemu_check_nic_model(nd, "lan9118"); - dev =3D qdev_create(NULL, "lan9118"); + dev =3D qdev_create(NULL, TYPE_LAN9118); qdev_set_nic_properties(dev, nd); qdev_init_nofail(dev); s =3D SYS_BUS_DEVICE(dev); --=20 1.8.1.4