From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56015) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0O-0002fI-EW for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t0I-0002Kq-Eo for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:16 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53281 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0I-0002Kl-5a for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:10 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:18:14 +0200 Message-Id: <1375125630-24869-38-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 037/173] musicpal: QOM cast cleanup for mv88w8618_eth_state List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Jan Kiszka , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Paul Brook Introduce type constant and use QOM casts. Signed-off-by: Andreas F=C3=A4rber --- hw/arm/musicpal.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index ddddd27..760630b 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -146,8 +146,15 @@ typedef struct mv88w8618_rx_desc { uint32_t next; } mv88w8618_rx_desc; =20 +#define TYPE_MV88W8618_ETH "mv88w8618_eth" +#define MV88W8618_ETH(obj) \ + OBJECT_CHECK(mv88w8618_eth_state, (obj), TYPE_MV88W8618_ETH) + typedef struct mv88w8618_eth_state { - SysBusDevice busdev; + /*< private >*/ + SysBusDevice parent_obj; + /*< public >*/ + MemoryRegion iomem; qemu_irq irq; uint32_t smir; @@ -382,16 +389,17 @@ static NetClientInfo net_mv88w8618_info =3D { .cleanup =3D eth_cleanup, }; =20 -static int mv88w8618_eth_init(SysBusDevice *dev) +static int mv88w8618_eth_init(SysBusDevice *sbd) { - mv88w8618_eth_state *s =3D FROM_SYSBUS(mv88w8618_eth_state, dev); + DeviceState *dev =3D DEVICE(sbd); + mv88w8618_eth_state *s =3D MV88W8618_ETH(dev); =20 - sysbus_init_irq(dev, &s->irq); + sysbus_init_irq(sbd, &s->irq); s->nic =3D qemu_new_nic(&net_mv88w8618_info, &s->conf, - object_get_typename(OBJECT(dev)), dev->qdev.id= , s); + object_get_typename(OBJECT(dev)), dev->id, s); memory_region_init_io(&s->iomem, OBJECT(s), &mv88w8618_eth_ops, s, "mv88w8618-eth", MP_ETH_SIZE); - sysbus_init_mmio(dev, &s->iomem); + sysbus_init_mmio(sbd, &s->iomem); return 0; } =20 @@ -429,7 +437,7 @@ static void mv88w8618_eth_class_init(ObjectClass *kla= ss, void *data) } =20 static const TypeInfo mv88w8618_eth_info =3D { - .name =3D "mv88w8618_eth", + .name =3D TYPE_MV88W8618_ETH, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(mv88w8618_eth_state), .class_init =3D mv88w8618_eth_class_init, @@ -1627,7 +1635,7 @@ static void musicpal_init(QEMUMachineInitArgs *args= ) sysbus_create_simple("mv88w8618_flashcfg", MP_FLASHCFG_BASE, NULL); =20 qemu_check_nic_model(&nd_table[0], "mv88w8618"); - dev =3D qdev_create(NULL, "mv88w8618_eth"); + dev =3D qdev_create(NULL, TYPE_MV88W8618_ETH); qdev_set_nic_properties(dev, &nd_table[0]); qdev_init_nofail(dev); sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, MP_ETH_BASE); --=20 1.8.1.4