From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57092) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1W-0004on-Pa for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t1L-0002km-IR for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:26 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53470 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1L-0002ke-BD for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:15 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id DF3C4A5396 for ; Mon, 29 Jul 2013 21:22:14 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:19:33 +0200 Message-Id: <1375125630-24869-117-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 116/173] slavio_misc: QOM cast cleanup for APCState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= Signed-off-by: Andreas F=C3=A4rber --- hw/misc/slavio_misc.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/hw/misc/slavio_misc.c b/hw/misc/slavio_misc.c index 1b93a01..767544e 100644 --- a/hw/misc/slavio_misc.c +++ b/hw/misc/slavio_misc.c @@ -57,8 +57,12 @@ typedef struct MiscState { uint16_t leds; } MiscState; =20 +#define TYPE_APC "apc" +#define APC(obj) OBJECT_CHECK(APCState, (obj), TYPE_APC) + typedef struct APCState { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion iomem; qemu_irq cpu_halt; } APCState; @@ -411,7 +415,7 @@ static const VMStateDescription vmstate_misc =3D { =20 static int apc_init1(SysBusDevice *dev) { - APCState *s =3D FROM_SYSBUS(APCState, dev); + APCState *s =3D APC(dev); =20 sysbus_init_irq(dev, &s->cpu_halt); =20 @@ -498,7 +502,7 @@ static void apc_class_init(ObjectClass *klass, void *= data) } =20 static const TypeInfo apc_info =3D { - .name =3D "apc", + .name =3D TYPE_APC, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(MiscState), .class_init =3D apc_class_init, --=20 1.8.1.4