From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56072) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0T-0002pu-8K for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t0N-0002MK-5p for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:21 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53299 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t0M-0002M6-Pm for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:15 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:18:18 +0200 Message-Id: <1375125630-24869-42-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 041/173] musicpal: QOM cast cleanup for mv88w8618_flashcfg List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Jan Kiszka , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Paul Brook Introduce a type constant, use QOM casts and rename the parent field. Signed-off-by: Andreas F=C3=A4rber --- hw/arm/musicpal.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index b2a28d9..21ec541 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -982,8 +982,15 @@ static const TypeInfo mv88w8618_pit_info =3D { /* Flash config register offsets */ #define MP_FLASHCFG_CFGR0 0x04 =20 +#define TYPE_MV88W8618_FLASHCFG "mv88w8618_flashcfg" +#define MV88W8618_FLASHCFG(obj) \ + OBJECT_CHECK(mv88w8618_flashcfg_state, (obj), TYPE_MV88W8618_FLASHCF= G) + typedef struct mv88w8618_flashcfg_state { - SysBusDevice busdev; + /*< private >*/ + SysBusDevice parent_obj; + /*< public >*/ + MemoryRegion iomem; uint32_t cfgr0; } mv88w8618_flashcfg_state; @@ -1023,7 +1030,7 @@ static const MemoryRegionOps mv88w8618_flashcfg_ops= =3D { =20 static int mv88w8618_flashcfg_init(SysBusDevice *dev) { - mv88w8618_flashcfg_state *s =3D FROM_SYSBUS(mv88w8618_flashcfg_state= , dev); + mv88w8618_flashcfg_state *s =3D MV88W8618_FLASHCFG(dev); =20 s->cfgr0 =3D 0xfffe4285; /* Default as set by U-Boot for 8 MB flash = */ memory_region_init_io(&s->iomem, OBJECT(s), &mv88w8618_flashcfg_ops,= s, @@ -1053,7 +1060,7 @@ static void mv88w8618_flashcfg_class_init(ObjectCla= ss *klass, void *data) } =20 static const TypeInfo mv88w8618_flashcfg_info =3D { - .name =3D "mv88w8618_flashcfg", + .name =3D TYPE_MV88W8618_FLASHCFG, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(mv88w8618_flashcfg_state), .class_init =3D mv88w8618_flashcfg_class_init, @@ -1651,7 +1658,7 @@ static void musicpal_init(QEMUMachineInitArgs *args= ) #endif =20 } - sysbus_create_simple("mv88w8618_flashcfg", MP_FLASHCFG_BASE, NULL); + sysbus_create_simple(TYPE_MV88W8618_FLASHCFG, MP_FLASHCFG_BASE, NULL= ); =20 qemu_check_nic_model(&nd_table[0], "mv88w8618"); dev =3D qdev_create(NULL, TYPE_MV88W8618_ETH); --=20 1.8.1.4