From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57298) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1j-0004wV-TN for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t1X-0002p8-3U for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:39 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:19:48 +0200 Message-Id: <1375125630-24869-132-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 131/173] ppce500_spin: QOM cast cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "open list:PowerPC" , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Alexander Graf Introduce type constant and use QOM cast. Signed-off-by: Andreas F=C3=A4rber --- hw/ppc/ppce500_spin.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/hw/ppc/ppce500_spin.c b/hw/ppc/ppce500_spin.c index 11b7de2..78b23fa 100644 --- a/hw/ppc/ppce500_spin.c +++ b/hw/ppc/ppce500_spin.c @@ -42,8 +42,12 @@ typedef struct spin_info { uint64_t reserved; } QEMU_PACKED SpinInfo; =20 -typedef struct spin_state { - SysBusDevice busdev; +#define TYPE_E500_SPIN "e500-spin" +#define E500_SPIN(obj) OBJECT_CHECK(SpinState, (obj), TYPE_E500_SPIN) + +typedef struct SpinState { + SysBusDevice parent_obj; + MemoryRegion iomem; SpinInfo spin[MAX_CPUS]; } SpinState; @@ -187,9 +191,7 @@ static const MemoryRegionOps spin_rw_ops =3D { =20 static int ppce500_spin_initfn(SysBusDevice *dev) { - SpinState *s; - - s =3D FROM_SYSBUS(SpinState, SYS_BUS_DEVICE(dev)); + SpinState *s =3D E500_SPIN(dev); =20 memory_region_init_io(&s->iomem, OBJECT(s), &spin_rw_ops, s, "e500 spin pv device", sizeof(SpinInfo) * MAX_= CPUS); @@ -208,7 +210,7 @@ static void ppce500_spin_class_init(ObjectClass *klas= s, void *data) } =20 static const TypeInfo ppce500_spin_info =3D { - .name =3D "e500-spin", + .name =3D TYPE_E500_SPIN, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(SpinState), .class_init =3D ppce500_spin_class_init, --=20 1.8.1.4