From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39795) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V35Uk-0005X1-PG for qemu-devel@nongnu.org; Sat, 27 Jul 2013 10:29:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V35Ui-0004dd-T2 for qemu-devel@nongnu.org; Sat, 27 Jul 2013 10:29:18 -0400 Received: from cantor2.suse.de ([195.135.220.15]:37248 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V35Qf-0003xF-58 for qemu-devel@nongnu.org; Sat, 27 Jul 2013 10:25:05 -0400 Message-ID: <51F3D839.20305@suse.de> Date: Sat, 27 Jul 2013 16:24:57 +0200 From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= MIME-Version: 1.0 References: <1374921903-13114-1-git-send-email-afaerber@suse.de> <1374921903-13114-3-git-send-email-afaerber@suse.de> In-Reply-To: <1374921903-13114-3-git-send-email-afaerber@suse.de> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [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" Am 27.07.2013 12:44, schrieb Andreas F=C3=A4rber: > Signed-off-by: Andreas F=C3=A4rber > --- > hw/net/etraxfs_eth.c | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) >=20 > 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"); [snip] Needs the following addition. Andreas diff --git a/hw/net/etraxfs_eth.c b/hw/net/etraxfs_eth.c index b1febec..78ebbbc 100644 --- a/hw/net/etraxfs_eth.c +++ b/hw/net/etraxfs_eth.c @@ -602,8 +602,9 @@ static NetClientInfo net_etraxfs_info =3D { .link_status_changed =3D eth_set_link, }; -static int fs_eth_init(SysBusDevice *dev) +static int fs_eth_init(SysBusDevice *sbd) { + DeviceState *dev =3D DEVICE(sbd); ETRAXFSEthState *s =3D ETRAX_FS_ETH(dev); if (!s->dma_out || !s->dma_in) { @@ -617,11 +618,11 @@ static int fs_eth_init(SysBusDevice *dev) memory_region_init_io(&s->mmio, OBJECT(dev), ð_ops, s, "etraxfs-eth", 0x5c); - sysbus_init_mmio(dev, &s->mmio); + sysbus_init_mmio(sbd, &s->mmio); qemu_macaddr_default_if_unset(&s->conf.macaddr); s->nic =3D qemu_new_nic(&net_etraxfs_info, &s->conf, - object_get_typename(OBJECT(s)), dev->qdev.id, = s); + object_get_typename(OBJECT(s)), dev->id, s); qemu_format_nic_info_str(qemu_get_queue(s->nic), s->conf.macaddr.a); --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=C3=BCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=C3=B6rffer; HRB 16746 AG N=C3=BC= rnberg