From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47232) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V32YW-0006Vn-7i for qemu-devel@nongnu.org; Sat, 27 Jul 2013 07:21:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V32Cm-00063E-4f for qemu-devel@nongnu.org; Sat, 27 Jul 2013 07:01:42 -0400 Received: from cantor2.suse.de ([195.135.220.15]:60731 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V326O-0004oV-3n for qemu-devel@nongnu.org; Sat, 27 Jul 2013 06:51:56 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 87DECA51FF for ; Sat, 27 Jul 2013 12:51:55 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 27 Jul 2013 12:51:49 +0200 Message-Id: <1374922309-14483-3-git-send-email-afaerber@suse.de> In-Reply-To: <1374922309-14483-1-git-send-email-afaerber@suse.de> References: <1374922309-14483-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] [PATCH qom-next for-1.6 2/2] ds1225y: 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/nvram/ds1225y.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/hw/nvram/ds1225y.c b/hw/nvram/ds1225y.c index cca6f43..f9a700b 100644 --- a/hw/nvram/ds1225y.c +++ b/hw/nvram/ds1225y.c @@ -104,14 +104,19 @@ static const VMStateDescription vmstate_nvram =3D { } }; =20 +#define TYPE_DS1225Y "ds1225y" +#define DS1225Y(obj) OBJECT_CHECK(SysBusNvRamState, (obj), TYPE_DS1225Y) + typedef struct { - SysBusDevice busdev; + SysBusDevice parent_obj; + NvRamState nvram; } SysBusNvRamState; =20 static int nvram_sysbus_initfn(SysBusDevice *dev) { - NvRamState *s =3D &FROM_SYSBUS(SysBusNvRamState, dev)->nvram; + SysBusNvRamState *sys =3D DS1225Y(dev); + NvRamState *s =3D &sys->nvram; FILE *file; =20 s->contents =3D g_malloc0(s->chip_size); @@ -151,7 +156,7 @@ static void nvram_sysbus_class_init(ObjectClass *klas= s, void *data) } =20 static const TypeInfo nvram_sysbus_info =3D { - .name =3D "ds1225y", + .name =3D TYPE_DS1225Y, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(SysBusNvRamState), .class_init =3D nvram_sysbus_class_init, --=20 1.8.1.4