From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:56992) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V363n-0001BE-KM for qemu-devel@nongnu.org; Sat, 27 Jul 2013 11:05:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V360f-0006OW-Bn for qemu-devel@nongnu.org; Sat, 27 Jul 2013 11:02:19 -0400 Received: from cantor2.suse.de ([195.135.220.15]:36977 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V359t-0008Om-SH for qemu-devel@nongnu.org; Sat, 27 Jul 2013 10:07:45 -0400 Message-ID: <51F3D42E.8020407@suse.de> Date: Sat, 27 Jul 2013 16:07:42 +0200 From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= MIME-Version: 1.0 References: <1374652104-26756-1-git-send-email-afaerber@suse.de> <1374652104-26756-6-git-send-email-afaerber@suse.de> In-Reply-To: <1374652104-26756-6-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 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 , Paul Brook Am 24.07.2013 09:48, schrieb Andreas F=C3=A4rber: > Introduce type constant and use QOM casts. >=20 > Signed-off-by: Andreas F=C3=A4rber > --- > hw/arm/musicpal.c | 13 ++++++++++--- > 1 file changed, 10 insertions(+), 3 deletions(-) >=20 > 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, [snip] Needs the following addition. Andreas diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index 6e8eb5d..6065051 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -389,16 +389,17 @@ static NetClientInfo net_mv88w8618_info =3D { .cleanup =3D eth_cleanup, }; -static int mv88w8618_eth_init(SysBusDevice *dev) +static int mv88w8618_eth_init(SysBusDevice *sbd) { + DeviceState *dev =3D DEVICE(sbd); mv88w8618_eth_state *s =3D MV88W8618_ETH(dev); - 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 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