From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56336) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0m-0003SH-3N for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t0g-0002SE-0q for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:39 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53365 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0f-0002S5-OS for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:33 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:18:37 +0200 Message-Id: <1375125630-24869-61-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 060/173] versatilepb: QOM cast cleanup for vpb_sic_state 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/versatilepb.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c index 725f60f..b48d84c 100644 --- a/hw/arm/versatilepb.c +++ b/hw/arm/versatilepb.c @@ -25,15 +25,19 @@ =20 /* Primary interrupt controller. */ =20 -typedef struct vpb_sic_state -{ - SysBusDevice busdev; - MemoryRegion iomem; - uint32_t level; - uint32_t mask; - uint32_t pic_enable; - qemu_irq parent[32]; - int irq; +#define TYPE_VERSATILE_PB_SIC "versatilepb_sic" +#define VERSATILE_PB_SIC(obj) \ + OBJECT_CHECK(vpb_sic_state, (obj), TYPE_VERSATILE_PB_SIC) + +typedef struct vpb_sic_state { + SysBusDevice parent_obj; + + MemoryRegion iomem; + uint32_t level; + uint32_t mask; + uint32_t pic_enable; + qemu_irq parent[32]; + int irq; } vpb_sic_state; =20 static const VMStateDescription vmstate_vpb_sic =3D { @@ -144,19 +148,20 @@ static const MemoryRegionOps vpb_sic_ops =3D { .endianness =3D DEVICE_NATIVE_ENDIAN, }; =20 -static int vpb_sic_init(SysBusDevice *dev) +static int vpb_sic_init(SysBusDevice *sbd) { - vpb_sic_state *s =3D FROM_SYSBUS(vpb_sic_state, dev); + DeviceState *dev =3D DEVICE(sbd); + vpb_sic_state *s =3D VERSATILE_PB_SIC(dev); int i; =20 - qdev_init_gpio_in(&dev->qdev, vpb_sic_set_irq, 32); + qdev_init_gpio_in(dev, vpb_sic_set_irq, 32); for (i =3D 0; i < 32; i++) { - sysbus_init_irq(dev, &s->parent[i]); + sysbus_init_irq(sbd, &s->parent[i]); } s->irq =3D 31; memory_region_init_io(&s->iomem, OBJECT(s), &vpb_sic_ops, s, "vpb-sic", 0x1000); - sysbus_init_mmio(dev, &s->iomem); + sysbus_init_mmio(sbd, &s->iomem); return 0; } =20 @@ -213,7 +218,7 @@ static void versatile_init(QEMUMachineInitArgs *args,= int board_id) for (n =3D 0; n < 32; n++) { pic[n] =3D qdev_get_gpio_in(dev, n); } - dev =3D sysbus_create_simple("versatilepb_sic", 0x10003000, NULL); + dev =3D sysbus_create_simple(TYPE_VERSATILE_PB_SIC, 0x10003000, NULL= ); for (n =3D 0; n < 32; n++) { sysbus_connect_irq(SYS_BUS_DEVICE(dev), n, pic[n]); sic[n] =3D qdev_get_gpio_in(dev, n); @@ -393,7 +398,7 @@ static void vpb_sic_class_init(ObjectClass *klass, vo= id *data) } =20 static const TypeInfo vpb_sic_info =3D { - .name =3D "versatilepb_sic", + .name =3D TYPE_VERSATILE_PB_SIC, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(vpb_sic_state), .class_init =3D vpb_sic_class_init, --=20 1.8.1.4