From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48618) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V32gc-0003oL-Nr for qemu-devel@nongnu.org; Sat, 27 Jul 2013 07:29:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V32gb-0004jH-8H for qemu-devel@nongnu.org; Sat, 27 Jul 2013 07:29:22 -0400 Received: from cantor2.suse.de ([195.135.220.15]:60553 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V31zu-0003eQ-TD for qemu-devel@nongnu.org; Sat, 27 Jul 2013 06:45:15 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 27 Jul 2013 12:45:02 +0200 Message-Id: <1374921903-13114-12-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 11/11] xilinx_ethlite: QOM cast cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Crosthwaite , "Edgar E. Iglesias" , =?UTF-8?q?Andreas=20F=C3=A4rber?= Signed-off-by: Andreas F=C3=A4rber --- hw/net/xilinx_ethlite.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/hw/net/xilinx_ethlite.c b/hw/net/xilinx_ethlite.c index 2afc91a..3a2a6c2 100644 --- a/hw/net/xilinx_ethlite.c +++ b/hw/net/xilinx_ethlite.c @@ -47,9 +47,14 @@ #define CTRL_P 0x2 #define CTRL_S 0x1 =20 +#define TYPE_XILINX_ETHLITE "xlnx.xps-ethernetlite" +#define XILINX_ETHLITE(obj) \ + OBJECT_CHECK(struct xlx_ethlite, (obj), TYPE_XILINX_ETHLITE) + struct xlx_ethlite { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion mmio; qemu_irq irq; NICState *nic; @@ -214,20 +219,21 @@ static NetClientInfo net_xilinx_ethlite_info =3D { .cleanup =3D eth_cleanup, }; =20 -static int xilinx_ethlite_init(SysBusDevice *dev) +static int xilinx_ethlite_init(SysBusDevice *sbd) { - struct xlx_ethlite *s =3D FROM_SYSBUS(typeof (*s), dev); + DeviceState *dev =3D DEVICE(sbd); + struct xlx_ethlite *s =3D XILINX_ETHLITE(dev); =20 - sysbus_init_irq(dev, &s->irq); + sysbus_init_irq(sbd, &s->irq); s->rxbuf =3D 0; =20 memory_region_init_io(&s->mmio, OBJECT(s), ð_ops, s, "xlnx.xps-ethernetlite", R_MAX * 4); - sysbus_init_mmio(dev, &s->mmio); + sysbus_init_mmio(sbd, &s->mmio); =20 qemu_macaddr_default_if_unset(&s->conf.macaddr); s->nic =3D qemu_new_nic(&net_xilinx_ethlite_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); return 0; } @@ -249,7 +255,7 @@ static void xilinx_ethlite_class_init(ObjectClass *kl= ass, void *data) } =20 static const TypeInfo xilinx_ethlite_info =3D { - .name =3D "xlnx.xps-ethernetlite", + .name =3D TYPE_XILINX_ETHLITE, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(struct xlx_ethlite), .class_init =3D xilinx_ethlite_class_init, --=20 1.8.1.4