From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57075) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1V-0004ol-Q6 for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t1K-0002kJ-8g for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:25 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53468 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1K-0002k8-3d for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:14 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:19:31 +0200 Message-Id: <1375125630-24869-115-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 114/173] puv3_pm: 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/misc/puv3_pm.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/hw/misc/puv3_pm.c b/hw/misc/puv3_pm.c index 5592560..37f2369 100644 --- a/hw/misc/puv3_pm.c +++ b/hw/misc/puv3_pm.c @@ -14,8 +14,12 @@ #undef DEBUG_PUV3 #include "hw/unicore32/puv3.h" =20 -typedef struct { - SysBusDevice busdev; +#define TYPE_PUV3_PM "puv3_pm" +#define PUV3_PM(obj) OBJECT_CHECK(PUV3PMState, (obj), TYPE_PUV3_PM) + +typedef struct PUV3PMState { + SysBusDevice parent_obj; + MemoryRegion iomem; =20 uint32_t reg_PMCR; @@ -116,7 +120,7 @@ static const MemoryRegionOps puv3_pm_ops =3D { =20 static int puv3_pm_init(SysBusDevice *dev) { - PUV3PMState *s =3D FROM_SYSBUS(PUV3PMState, dev); + PUV3PMState *s =3D PUV3_PM(dev); =20 s->reg_PCGR =3D 0x0; =20 @@ -135,7 +139,7 @@ static void puv3_pm_class_init(ObjectClass *klass, vo= id *data) } =20 static const TypeInfo puv3_pm_info =3D { - .name =3D "puv3_pm", + .name =3D TYPE_PUV3_PM, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(PUV3PMState), .class_init =3D puv3_pm_class_init, --=20 1.8.1.4