From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34512) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V33Mx-0006xq-9q for qemu-devel@nongnu.org; Sat, 27 Jul 2013 08:13:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V33Mt-0002K3-SU for qemu-devel@nongnu.org; Sat, 27 Jul 2013 08:13:07 -0400 Received: from cantor2.suse.de ([195.135.220.15]:34318 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V33Mt-0002Ji-Hq for qemu-devel@nongnu.org; Sat, 27 Jul 2013 08:13:03 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 27 Jul 2013 14:12:54 +0200 Message-Id: <1374927175-26267-3-git-send-email-afaerber@suse.de> In-Reply-To: <1374927175-26267-1-git-send-email-afaerber@suse.de> References: <1374927175-26267-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 2/3] pl022: QOM cast cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Crosthwaite , =?UTF-8?q?Andreas=20F=C3=A4rber?= Signed-off-by: Andreas F=C3=A4rber --- hw/ssi/pl022.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/hw/ssi/pl022.c b/hw/ssi/pl022.c index d33534e..fd479ef 100644 --- a/hw/ssi/pl022.c +++ b/hw/ssi/pl022.c @@ -39,8 +39,12 @@ do { fprintf(stderr, "pl022: error: " fmt , ## __VA_AR= GS__);} while (0) #define PL022_INT_RX 0x04 #define PL022_INT_TX 0x08 =20 +#define TYPE_PL022 "pl022" +#define PL022(obj) OBJECT_CHECK(PL022State, (obj), TYPE_PL022) + typedef struct PL022State { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion iomem; uint32_t cr0; uint32_t cr1; @@ -273,16 +277,17 @@ static const VMStateDescription vmstate_pl022 =3D { } }; =20 -static int pl022_init(SysBusDevice *dev) +static int pl022_init(SysBusDevice *sbd) { - PL022State *s =3D FROM_SYSBUS(PL022State, dev); + DeviceState *dev =3D DEVICE(sbd); + PL022State *s =3D PL022(dev); =20 memory_region_init_io(&s->iomem, OBJECT(s), &pl022_ops, s, "pl022", = 0x1000); - sysbus_init_mmio(dev, &s->iomem); - sysbus_init_irq(dev, &s->irq); - s->ssi =3D ssi_create_bus(&dev->qdev, "ssi"); + sysbus_init_mmio(sbd, &s->iomem); + sysbus_init_irq(sbd, &s->irq); + s->ssi =3D ssi_create_bus(dev, "ssi"); pl022_reset(s); - vmstate_register(&dev->qdev, -1, &vmstate_pl022, s); + vmstate_register(dev, -1, &vmstate_pl022, s); return 0; } =20 @@ -294,7 +299,7 @@ static void pl022_class_init(ObjectClass *klass, void= *data) } =20 static const TypeInfo pl022_info =3D { - .name =3D "pl022", + .name =3D TYPE_PL022, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(PL022State), .class_init =3D pl022_class_init, --=20 1.8.1.4