From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56173) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0b-00037J-Kf for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t0V-0002Ol-Kx for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:29 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53326 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0V-0002Oc-FI for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:23 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:18:25 +0200 Message-Id: <1375125630-24869-49-git-send-email-afaerber@suse.de> In-Reply-To: <1375125630-24869-1-git-send-email-afaerber@suse.de> References: <1375125630-24869-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] [PULL 048/173] pxa2xx_pic: QOM cast cleanup for PXA2xxPICState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Paul Brook Introduce a type constant, use QOM casts, rename the parent field and prepare for QOM realize. Signed-off-by: Andreas F=C3=A4rber --- hw/arm/pxa2xx_pic.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/hw/arm/pxa2xx_pic.c b/hw/arm/pxa2xx_pic.c index 8929b6d..46d337c 100644 --- a/hw/arm/pxa2xx_pic.c +++ b/hw/arm/pxa2xx_pic.c @@ -31,8 +31,15 @@ =20 #define PXA2XX_PIC_SRCS 40 =20 +#define TYPE_PXA2XX_PIC "pxa2xx_pic" +#define PXA2XX_PIC(obj) \ + OBJECT_CHECK(PXA2xxPICState, (obj), TYPE_PXA2XX_PIC) + typedef struct { - SysBusDevice busdev; + /*< private >*/ + SysBusDevice parent_obj; + /*< public >*/ + MemoryRegion iomem; ARMCPU *cpu; uint32_t int_enabled[2]; @@ -260,9 +267,8 @@ static int pxa2xx_pic_post_load(void *opaque, int ver= sion_id) =20 DeviceState *pxa2xx_pic_init(hwaddr base, ARMCPU *cpu) { - CPUARMState *env =3D &cpu->env; - DeviceState *dev =3D qdev_create(NULL, "pxa2xx_pic"); - PXA2xxPICState *s =3D FROM_SYSBUS(PXA2xxPICState, SYS_BUS_DEVICE(dev= )); + DeviceState *dev =3D qdev_create(NULL, TYPE_PXA2XX_PIC); + PXA2xxPICState *s =3D PXA2XX_PIC(dev); =20 s->cpu =3D cpu; =20 @@ -284,7 +290,7 @@ DeviceState *pxa2xx_pic_init(hwaddr base, ARMCPU *cpu= ) sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base); =20 /* Enable IC coprocessor access. */ - define_arm_cp_regs_with_opaque(arm_env_get_cpu(env), pxa_pic_cp_regi= nfo, s); + define_arm_cp_regs_with_opaque(cpu, pxa_pic_cp_reginfo, s); =20 return dev; } @@ -321,7 +327,7 @@ static void pxa2xx_pic_class_init(ObjectClass *klass,= void *data) } =20 static const TypeInfo pxa2xx_pic_info =3D { - .name =3D "pxa2xx_pic", + .name =3D TYPE_PXA2XX_PIC, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(PXA2xxPICState), .class_init =3D pxa2xx_pic_class_init, --=20 1.8.1.4