From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60362) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V34gU-00038r-SD for qemu-devel@nongnu.org; Sat, 27 Jul 2013 09:37:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V34gQ-0008Hv-Ko for qemu-devel@nongnu.org; Sat, 27 Jul 2013 09:37:22 -0400 Received: from cantor2.suse.de ([195.135.220.15]:36072 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V34gQ-0008Hf-Co for qemu-devel@nongnu.org; Sat, 27 Jul 2013 09:37:18 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 27 Jul 2013 15:36:59 +0200 Message-Id: <1374932223-7490-17-git-send-email-afaerber@suse.de> In-Reply-To: <1374932223-7490-1-git-send-email-afaerber@suse.de> References: <1374932223-7490-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 16/20] puv3_ost: QOM cast cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Guan Xuetao , =?UTF-8?q?Andreas=20F=C3=A4rber?= Signed-off-by: Andreas F=C3=A4rber --- hw/timer/puv3_ost.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/hw/timer/puv3_ost.c b/hw/timer/puv3_ost.c index 63f2c9f..4bd2b76 100644 --- a/hw/timer/puv3_ost.c +++ b/hw/timer/puv3_ost.c @@ -14,9 +14,13 @@ #undef DEBUG_PUV3 #include "hw/unicore32/puv3.h" =20 +#define TYPE_PUV3_OST "puv3_ost" +#define PUV3_OST(obj) OBJECT_CHECK(PUV3OSTState, (obj), TYPE_PUV3_OST) + /* puv3 ostimer implementation. */ -typedef struct { - SysBusDevice busdev; +typedef struct PUV3OSTState { + SysBusDevice parent_obj; + MemoryRegion iomem; QEMUBH *bh; qemu_irq irq; @@ -109,7 +113,7 @@ static void puv3_ost_tick(void *opaque) =20 static int puv3_ost_init(SysBusDevice *dev) { - PUV3OSTState *s =3D FROM_SYSBUS(PUV3OSTState, dev); + PUV3OSTState *s =3D PUV3_OST(dev); =20 s->reg_OIER =3D 0; s->reg_OSSR =3D 0; @@ -137,7 +141,7 @@ static void puv3_ost_class_init(ObjectClass *klass, v= oid *data) } =20 static const TypeInfo puv3_ost_info =3D { - .name =3D "puv3_ost", + .name =3D TYPE_PUV3_OST, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(PUV3OSTState), .class_init =3D puv3_ost_class_init, --=20 1.8.1.4