From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:56961) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3636-00018b-JE for qemu-devel@nongnu.org; Sat, 27 Jul 2013 11:04:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3628-0006mH-Cu for qemu-devel@nongnu.org; Sat, 27 Jul 2013 11:03:50 -0400 Received: from cantor2.suse.de ([195.135.220.15]:36924 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V356z-0007T2-IW for qemu-devel@nongnu.org; Sat, 27 Jul 2013 10:04:45 -0400 Message-ID: <51F3D378.5000609@suse.de> Date: Sat, 27 Jul 2013 16:04:40 +0200 From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= MIME-Version: 1.0 References: <1374652104-26756-1-git-send-email-afaerber@suse.de> <1374652104-26756-5-git-send-email-afaerber@suse.de> In-Reply-To: <1374652104-26756-5-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 04/29] integratorcp: QOM'ify icp_pic_state List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Paul Brook Am 24.07.2013 09:47, schrieb Andreas F=C3=A4rber: > diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c > index 58f4ed7..af31007 100644 > --- a/hw/arm/integratorcp.c > +++ b/hw/arm/integratorcp.c [...] > @@ -376,7 +382,7 @@ static const MemoryRegionOps icp_pic_ops =3D { > =20 > static int icp_pic_init(SysBusDevice *dev) > { > - icp_pic_state *s =3D FROM_SYSBUS(icp_pic_state, dev); > + icp_pic_state *s =3D INTEGRATOR_PIC(dev); > =20 > qdev_init_gpio_in(&dev->qdev, icp_pic_set_irq, 32); > sysbus_init_irq(dev, &s->parent_irq); [snip] Needs the following addition for ->qdev. Andreas diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index af31007..d518188 100644 --- a/hw/arm/integratorcp.c +++ b/hw/arm/integratorcp.c @@ -380,16 +380,17 @@ static const MemoryRegionOps icp_pic_ops =3D { .endianness =3D DEVICE_NATIVE_ENDIAN, }; -static int icp_pic_init(SysBusDevice *dev) +static int icp_pic_init(SysBusDevice *sbd) { + DeviceState *dev =3D DEVICE(sbd); icp_pic_state *s =3D INTEGRATOR_PIC(dev); - qdev_init_gpio_in(&dev->qdev, icp_pic_set_irq, 32); - sysbus_init_irq(dev, &s->parent_irq); - sysbus_init_irq(dev, &s->parent_fiq); + qdev_init_gpio_in(dev, icp_pic_set_irq, 32); + sysbus_init_irq(sbd, &s->parent_irq); + sysbus_init_irq(sbd, &s->parent_fiq); memory_region_init_io(&s->iomem, OBJECT(s), &icp_pic_ops, s, "icp-pic", 0x00800000); - 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