From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32833) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1toK-0001nj-UE for qemu-devel@nongnu.org; Wed, 24 Jul 2013 03:48:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V1toI-0005aF-5u for qemu-devel@nongnu.org; Wed, 24 Jul 2013 03:48:36 -0400 Received: from cantor2.suse.de ([195.135.220.15]:43980 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1toH-0005a4-Tn for qemu-devel@nongnu.org; Wed, 24 Jul 2013 03:48:34 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 24 Jul 2013 09:48:00 +0200 Message-Id: <1374652104-26756-6-git-send-email-afaerber@suse.de> In-Reply-To: <1374652104-26756-1-git-send-email-afaerber@suse.de> References: <1374652104-26756-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 05/29] musicpal: QOM'ify 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 | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index b06d442..293ab26 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; @@ -384,7 +391,7 @@ static NetClientInfo net_mv88w8618_info =3D { =20 static int mv88w8618_eth_init(SysBusDevice *dev) { - mv88w8618_eth_state *s =3D FROM_SYSBUS(mv88w8618_eth_state, dev); + mv88w8618_eth_state *s =3D MV88W8618_ETH(dev); =20 sysbus_init_irq(dev, &s->irq); s->nic =3D qemu_new_nic(&net_mv88w8618_info, &s->conf, @@ -429,7 +436,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, --=20 1.8.1.4