Received: from eggs.gnu.org ([2001:4830:134:3::10]:34029) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ut6hd-0003cq-Tm for qemu-devel@nongnu.org; Sat, 29 Jun 2013 21:45:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ut6hY-0007dV-Cx for qemu-devel@nongnu.org; Sat, 29 Jun 2013 21:45:21 -0400 From: Alexander Graf Date: Sun, 30 Jun 2013 03:44:50 +0200 Message-Id: <1372556709-23868-14-git-send-email-agraf@suse.de> In-Reply-To: <1372556709-23868-1-git-send-email-agraf@suse.de> References: <1372556709-23868-1-git-send-email-agraf@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 13/32] mpc8544_guts: QOM'ify List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-ppc@nongnu.org Cc: Blue Swirl , qemu-devel@nongnu.org, Aurelien Jarno , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Andreas F=C3=A4rber Introduce type constant, cast macro and rename parent field. Signed-off-by: Andreas F=C3=A4rber Signed-off-by: Alexander Graf --- hw/ppc/mpc8544_guts.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/hw/ppc/mpc8544_guts.c b/hw/ppc/mpc8544_guts.c index 98540a4..f623b04 100644 --- a/hw/ppc/mpc8544_guts.c +++ b/hw/ppc/mpc8544_guts.c @@ -51,8 +51,14 @@ #define MPC8544_GUTS_ADDR_SRDS2CR1 0xF10 #define MPC8544_GUTS_ADDR_SRDS2CR3 0xF18 =20 +#define TYPE_MPC8544_GUTS "mpc8544-guts" +#define MPC8544_GUTS(obj) OBJECT_CHECK(GutsState, (obj), TYPE_MPC8544_GU= TS) + struct GutsState { - SysBusDevice busdev; + /*< private >*/ + SysBusDevice parent_obj; + /*< public >*/ + MemoryRegion iomem; }; =20 @@ -110,9 +116,7 @@ static const MemoryRegionOps mpc8544_guts_ops =3D { =20 static int mpc8544_guts_initfn(SysBusDevice *dev) { - GutsState *s; - - s =3D FROM_SYSBUS(GutsState, SYS_BUS_DEVICE(dev)); + GutsState *s =3D MPC8544_GUTS(dev); =20 memory_region_init_io(&s->iomem, &mpc8544_guts_ops, s, "mpc8544.guts", MPC8544_GUTS_MMIO_SIZE); @@ -129,7 +133,7 @@ static void mpc8544_guts_class_init(ObjectClass *klas= s, void *data) } =20 static const TypeInfo mpc8544_guts_info =3D { - .name =3D "mpc8544-guts", + .name =3D TYPE_MPC8544_GUTS, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(GutsState), .class_init =3D mpc8544_guts_class_init, --=20 1.8.1.4