From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48534) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2jW9-0007xA-1K for qemu-devel@nongnu.org; Fri, 26 Jul 2013 11:01:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V2jW2-00010r-2G for qemu-devel@nongnu.org; Fri, 26 Jul 2013 11:01:16 -0400 Received: from cantor2.suse.de ([195.135.220.15]:33416 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2jW1-00010S-Ss for qemu-devel@nongnu.org; Fri, 26 Jul 2013 11:01:10 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 546EFA52BF for ; Fri, 26 Jul 2013 17:01:09 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 26 Jul 2013 17:01:03 +0200 Message-Id: <1374850864-7331-7-git-send-email-afaerber@suse.de> In-Reply-To: <1374850864-7331-1-git-send-email-afaerber@suse.de> References: <1374850864-7331-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 6/6] sun4m_iommu: QOM cast cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= Signed-off-by: Andreas F=C3=A4rber --- hw/dma/sun4m_iommu.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/hw/dma/sun4m_iommu.c b/hw/dma/sun4m_iommu.c index edb93f3..a04409a 100644 --- a/hw/dma/sun4m_iommu.c +++ b/hw/dma/sun4m_iommu.c @@ -126,8 +126,12 @@ #define IOMMU_PAGE_SIZE (1 << IOMMU_PAGE_SHIFT) #define IOMMU_PAGE_MASK ~(IOMMU_PAGE_SIZE - 1) =20 +#define TYPE_SUN4M_IOMMU "iommu" +#define SUN4M_IOMMU(obj) OBJECT_CHECK(IOMMUState, (obj), TYPE_SUN4M_IOMM= U) + typedef struct IOMMUState { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion iomem; uint32_t regs[IOMMU_NREGS]; hwaddr iostart; @@ -332,7 +336,7 @@ static const VMStateDescription vmstate_iommu =3D { =20 static void iommu_reset(DeviceState *d) { - IOMMUState *s =3D container_of(d, IOMMUState, busdev.qdev); + IOMMUState *s =3D SUN4M_IOMMU(d); =20 memset(s->regs, 0, IOMMU_NREGS * 4); s->iostart =3D 0; @@ -345,7 +349,7 @@ static void iommu_reset(DeviceState *d) =20 static int iommu_init1(SysBusDevice *dev) { - IOMMUState *s =3D FROM_SYSBUS(IOMMUState, dev); + IOMMUState *s =3D SUN4M_IOMMU(dev); =20 sysbus_init_irq(dev, &s->irq); =20 @@ -373,7 +377,7 @@ static void iommu_class_init(ObjectClass *klass, void= *data) } =20 static const TypeInfo iommu_info =3D { - .name =3D "iommu", + .name =3D TYPE_SUN4M_IOMMU, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(IOMMUState), .class_init =3D iommu_class_init, --=20 1.8.1.4