From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:49610) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V33Zt-0002JQ-6s for qemu-devel@nongnu.org; Sat, 27 Jul 2013 08:26:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V33Zs-0007Tl-45 for qemu-devel@nongnu.org; Sat, 27 Jul 2013 08:26:29 -0400 Received: from cantor2.suse.de ([195.135.220.15]:60535 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V31zs-0003e0-8l for qemu-devel@nongnu.org; Sat, 27 Jul 2013 06:45:12 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 27 Jul 2013 12:44:53 +0200 Message-Id: <1374921903-13114-3-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 02/11] etraxfs_eth: QOM cast cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Edgar E. Iglesias" , =?UTF-8?q?Andreas=20F=C3=A4rber?= Signed-off-by: Andreas F=C3=A4rber --- hw/net/etraxfs_eth.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/hw/net/etraxfs_eth.c b/hw/net/etraxfs_eth.c index ab9a215..71b4fb8 100644 --- a/hw/net/etraxfs_eth.c +++ b/hw/net/etraxfs_eth.c @@ -322,9 +322,14 @@ static void mdio_cycle(struct qemu_mdio *bus) #define R_STAT 0x0b #define FS_ETH_MAX_REGS 0x17 =20 +#define TYPE_ETRAX_FS_ETH "etraxfs-eth" +#define ETRAX_FS_ETH(obj) \ + OBJECT_CHECK(struct fs_eth, (obj), TYPE_ETRAX_FS_ETH) + struct fs_eth { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion mmio; NICState *nic; NICConf conf; @@ -599,7 +604,7 @@ static NetClientInfo net_etraxfs_info =3D { =20 static int fs_eth_init(SysBusDevice *dev) { - struct fs_eth *s =3D FROM_SYSBUS(typeof(*s), dev); + struct fs_eth *s =3D ETRAX_FS_ETH(dev); =20 if (!s->dma_out || !s->dma_in) { hw_error("Unconnected ETRAX-FS Ethernet MAC.\n"); @@ -643,7 +648,7 @@ static void etraxfs_eth_class_init(ObjectClass *klass= , void *data) } =20 static const TypeInfo etraxfs_eth_info =3D { - .name =3D "etraxfs-eth", + .name =3D TYPE_ETRAX_FS_ETH, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(struct fs_eth), .class_init =3D etraxfs_eth_class_init, --=20 1.8.1.4