From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48639) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V32gh-0003tI-93 for qemu-devel@nongnu.org; Sat, 27 Jul 2013 07:29:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V32gf-0004jq-22 for qemu-devel@nongnu.org; Sat, 27 Jul 2013 07:29:27 -0400 Received: from cantor2.suse.de ([195.135.220.15]:60541 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V31zs-0003eA-QU for qemu-devel@nongnu.org; Sat, 27 Jul 2013 06:45:12 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 7CEF9A52C6 for ; Sat, 27 Jul 2013 12:45:11 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 27 Jul 2013 12:44:57 +0200 Message-Id: <1374921903-13114-7-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 06/11] milkymist-minimac2: 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/milkymist-minimac2.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/hw/net/milkymist-minimac2.c b/hw/net/milkymist-minimac2.c index becd26c..1e92379 100644 --- a/hw/net/milkymist-minimac2.c +++ b/hw/net/milkymist-minimac2.c @@ -90,8 +90,13 @@ struct MilkymistMinimac2MdioState { }; typedef struct MilkymistMinimac2MdioState MilkymistMinimac2MdioState; =20 +#define TYPE_MILKYMIST_MINIMAC2 "milkymist-minimac2" +#define MILKYMIST_MINIMAC2(obj) \ + OBJECT_CHECK(MilkymistMinimac2State, (obj), TYPE_MILKYMIST_MINIMAC2) + struct MilkymistMinimac2State { - SysBusDevice busdev; + SysBusDevice parent_obj; + NICState *nic; NICConf conf; char *phy_model; @@ -429,8 +434,7 @@ static void minimac2_cleanup(NetClientState *nc) =20 static void milkymist_minimac2_reset(DeviceState *d) { - MilkymistMinimac2State *s =3D - container_of(d, MilkymistMinimac2State, busdev.qdev); + MilkymistMinimac2State *s =3D MILKYMIST_MINIMAC2(d); int i; =20 for (i =3D 0; i < R_MAX; i++) { @@ -453,17 +457,18 @@ static NetClientInfo net_milkymist_minimac2_info =3D= { .cleanup =3D minimac2_cleanup, }; =20 -static int milkymist_minimac2_init(SysBusDevice *dev) +static int milkymist_minimac2_init(SysBusDevice *sbd) { - MilkymistMinimac2State *s =3D FROM_SYSBUS(typeof(*s), dev); + DeviceState *dev =3D DEVICE(sbd); + MilkymistMinimac2State *s =3D MILKYMIST_MINIMAC2(dev); size_t buffers_size =3D TARGET_PAGE_ALIGN(3 * MINIMAC2_BUFFER_SIZE); =20 - sysbus_init_irq(dev, &s->rx_irq); - sysbus_init_irq(dev, &s->tx_irq); + sysbus_init_irq(sbd, &s->rx_irq); + sysbus_init_irq(sbd, &s->tx_irq); =20 memory_region_init_io(&s->regs_region, OBJECT(dev), &minimac2_ops, s= , "milkymist-minimac2", R_MAX * 4); - sysbus_init_mmio(dev, &s->regs_region); + sysbus_init_mmio(sbd, &s->regs_region); =20 /* register buffers memory */ memory_region_init_ram(&s->buffers, OBJECT(dev), "milkymist-minimac2= .buffers", @@ -473,11 +478,11 @@ static int milkymist_minimac2_init(SysBusDevice *de= v) s->rx1_buf =3D s->rx0_buf + MINIMAC2_BUFFER_SIZE; s->tx_buf =3D s->rx1_buf + MINIMAC2_BUFFER_SIZE; =20 - sysbus_init_mmio(dev, &s->buffers); + sysbus_init_mmio(sbd, &s->buffers); =20 qemu_macaddr_default_if_unset(&s->conf.macaddr); s->nic =3D qemu_new_nic(&net_milkymist_minimac2_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 return 0; @@ -532,7 +537,7 @@ static void milkymist_minimac2_class_init(ObjectClass= *klass, void *data) } =20 static const TypeInfo milkymist_minimac2_info =3D { - .name =3D "milkymist-minimac2", + .name =3D TYPE_MILKYMIST_MINIMAC2, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(MilkymistMinimac2State), .class_init =3D milkymist_minimac2_class_init, --=20 1.8.1.4