From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57011) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2n9n-0000zY-Dz for qemu-devel@nongnu.org; Fri, 26 Jul 2013 14:54:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V2n9l-0001ji-Qf for qemu-devel@nongnu.org; Fri, 26 Jul 2013 14:54:27 -0400 Received: from cantor2.suse.de ([195.135.220.15]:41738 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2n9l-0001jS-HF for qemu-devel@nongnu.org; Fri, 26 Jul 2013 14:54:25 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 26 Jul 2013 20:54:06 +0200 Message-Id: <1374864854-32454-8-git-send-email-afaerber@suse.de> In-Reply-To: <1374864854-32454-1-git-send-email-afaerber@suse.de> References: <1374864854-32454-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 07/15] imx_avic: QOM cast cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Chubb , =?UTF-8?q?Andreas=20F=C3=A4rber?= Signed-off-by: Andreas F=C3=A4rber --- hw/intc/imx_avic.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/hw/intc/imx_avic.c b/hw/intc/imx_avic.c index 75c8ffd..fb00e91 100644 --- a/hw/intc/imx_avic.c +++ b/hw/intc/imx_avic.c @@ -55,8 +55,13 @@ do { printf("imx_avic: " fmt , ##args); } while (0) #define PRIO_PER_WORD (sizeof(uint32_t) * 8 / 4) #define PRIO_WORDS (IMX_AVIC_NUM_IRQS/PRIO_PER_WORD) =20 -typedef struct { - SysBusDevice busdev; +#define TYPE_IMX_AVIC "imx_avic" +#define IMX_AVIC(obj) \ + OBJECT_CHECK(IMXAVICState, (obj), TYPE_IMX_AVIC) + +typedef struct IMXAVICState { + SysBusDevice parent_obj; + MemoryRegion iomem; uint64_t pending; uint64_t enabled; @@ -359,7 +364,8 @@ static const MemoryRegionOps imx_avic_ops =3D { =20 static void imx_avic_reset(DeviceState *dev) { - IMXAVICState *s =3D container_of(dev, IMXAVICState, busdev.qdev); + IMXAVICState *s =3D IMX_AVIC(dev); + s->pending =3D 0; s->enabled =3D 0; s->is_fiq =3D 0; @@ -368,17 +374,18 @@ static void imx_avic_reset(DeviceState *dev) memset(s->prio, 0, sizeof s->prio); } =20 -static int imx_avic_init(SysBusDevice *dev) +static int imx_avic_init(SysBusDevice *sbd) { - IMXAVICState *s =3D FROM_SYSBUS(IMXAVICState, dev); + DeviceState *dev =3D DEVICE(sbd); + IMXAVICState *s =3D IMX_AVIC(dev); =20 memory_region_init_io(&s->iomem, OBJECT(s), &imx_avic_ops, s, "imx_avic", 0x1000); - sysbus_init_mmio(dev, &s->iomem); + sysbus_init_mmio(sbd, &s->iomem); =20 - qdev_init_gpio_in(&dev->qdev, imx_avic_set_irq, IMX_AVIC_NUM_IRQS); - sysbus_init_irq(dev, &s->irq); - sysbus_init_irq(dev, &s->fiq); + qdev_init_gpio_in(dev, imx_avic_set_irq, IMX_AVIC_NUM_IRQS); + sysbus_init_irq(sbd, &s->irq); + sysbus_init_irq(sbd, &s->fiq); =20 return 0; } @@ -395,7 +402,7 @@ static void imx_avic_class_init(ObjectClass *klass, v= oid *data) } =20 static const TypeInfo imx_avic_info =3D { - .name =3D "imx_avic", + .name =3D TYPE_IMX_AVIC, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(IMXAVICState), .class_init =3D imx_avic_class_init, --=20 1.8.1.4