From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57300) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1k-0004wW-1G 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-0002pK-Hj for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:39 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53499 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1X-0002pC-Bs for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:27 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id E7D27A531D for ; Mon, 29 Jul 2013 21:22:26 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:19:49 +0200 Message-Id: <1375125630-24869-133-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 132/173] milkymist-memcard: QOM cast cleanup 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/sd/milkymist-memcard.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c index f69775c..42613b3 100644 --- a/hw/sd/milkymist-memcard.c +++ b/hw/sd/milkymist-memcard.c @@ -58,8 +58,13 @@ enum { R_MAX }; =20 +#define TYPE_MILKYMIST_MEMCARD "milkymist-memcard" +#define MILKYMIST_MEMCARD(obj) \ + OBJECT_CHECK(MilkymistMemcardState, (obj), TYPE_MILKYMIST_MEMCARD) + struct MilkymistMemcardState { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion regs_region; SDState *card; =20 @@ -231,8 +236,7 @@ static const MemoryRegionOps memcard_mmio_ops =3D { =20 static void milkymist_memcard_reset(DeviceState *d) { - MilkymistMemcardState *s =3D - container_of(d, MilkymistMemcardState, busdev.qdev); + MilkymistMemcardState *s =3D MILKYMIST_MEMCARD(d); int i; =20 s->command_write_ptr =3D 0; @@ -246,7 +250,7 @@ static void milkymist_memcard_reset(DeviceState *d) =20 static int milkymist_memcard_init(SysBusDevice *dev) { - MilkymistMemcardState *s =3D FROM_SYSBUS(typeof(*s), dev); + MilkymistMemcardState *s =3D MILKYMIST_MEMCARD(dev); DriveInfo *dinfo; =20 dinfo =3D drive_get_next(IF_SD); @@ -289,7 +293,7 @@ static void milkymist_memcard_class_init(ObjectClass = *klass, void *data) } =20 static const TypeInfo milkymist_memcard_info =3D { - .name =3D "milkymist-memcard", + .name =3D TYPE_MILKYMIST_MEMCARD, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(MilkymistMemcardState), .class_init =3D milkymist_memcard_class_init, --=20 1.8.1.4