From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55959) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0K-0002XG-Ep for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t0D-0002IK-8e for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:12 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53261 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0D-0002I4-1V for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:05 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:18:09 +0200 Message-Id: <1375125630-24869-33-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 032/173] armv7m: QOM cast cleanup for BitBandState 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 TYPE_* constant and use QOM cast. Signed-off-by: Andreas F=C3=A4rber --- hw/arm/armv7m.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c index 5b22e84..82d36fb 100644 --- a/hw/arm/armv7m.c +++ b/hw/arm/armv7m.c @@ -114,15 +114,21 @@ static const MemoryRegionOps bitband_ops =3D { .endianness =3D DEVICE_NATIVE_ENDIAN, }; =20 +#define TYPE_BITBAND "ARM,bitband-memory" +#define BITBAND(obj) OBJECT_CHECK(BitBandState, (obj), TYPE_BITBAND) + typedef struct { - SysBusDevice busdev; + /*< private >*/ + SysBusDevice parent_obj; + /*< public >*/ + MemoryRegion iomem; uint32_t base; } BitBandState; =20 static int bitband_init(SysBusDevice *dev) { - BitBandState *s =3D FROM_SYSBUS(BitBandState, dev); + BitBandState *s =3D BITBAND(dev); =20 memory_region_init_io(&s->iomem, OBJECT(s), &bitband_ops, &s->base, "bitband", 0x02000000); @@ -134,12 +140,12 @@ static void armv7m_bitband_init(void) { DeviceState *dev; =20 - dev =3D qdev_create(NULL, "ARM,bitband-memory"); + dev =3D qdev_create(NULL, TYPE_BITBAND); qdev_prop_set_uint32(dev, "base", 0x20000000); qdev_init_nofail(dev); sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0x22000000); =20 - dev =3D qdev_create(NULL, "ARM,bitband-memory"); + dev =3D qdev_create(NULL, TYPE_BITBAND); qdev_prop_set_uint32(dev, "base", 0x40000000); qdev_init_nofail(dev); sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0x42000000); @@ -270,7 +276,7 @@ static void bitband_class_init(ObjectClass *klass, vo= id *data) } =20 static const TypeInfo bitband_info =3D { - .name =3D "ARM,bitband-memory", + .name =3D TYPE_BITBAND, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(BitBandState), .class_init =3D bitband_class_init, --=20 1.8.1.4