From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59413) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3BQT-0001pP-UX for qemu-devel@nongnu.org; Sat, 27 Jul 2013 16:49:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3BG2-0004Bz-7N for qemu-devel@nongnu.org; Sat, 27 Jul 2013 16:38:36 -0400 Received: from cantor2.suse.de ([195.135.220.15]:44100 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3AyG-0008Kd-H5 for qemu-devel@nongnu.org; Sat, 27 Jul 2013 16:20:08 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 27 Jul 2013 22:19:54 +0200 Message-Id: <1374956396-25586-10-git-send-email-afaerber@suse.de> In-Reply-To: <1374956396-25586-1-git-send-email-afaerber@suse.de> References: <1374956396-25586-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 09/11] mips_malta: 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?= , Aurelien Jarno Signed-off-by: Andreas F=C3=A4rber --- hw/mips/mips_malta.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index dad58c0..e932fdc 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -79,8 +79,12 @@ typedef struct { SerialState *uart; } MaltaFPGAState; =20 +#define TYPE_MIPS_MALTA "mips-malta" +#define MIPS_MALTA(obj) OBJECT_CHECK(MaltaState, (obj), TYPE_MIPS_MALTA) + typedef struct { - SysBusDevice busdev; + SysBusDevice parent_obj; + qemu_irq *i8259; } MaltaState; =20 @@ -808,8 +812,8 @@ void mips_malta_init(QEMUMachineInitArgs *args) int fl_sectors =3D bios_size >> 16; int be; =20 - DeviceState *dev =3D qdev_create(NULL, "mips-malta"); - MaltaState *s =3D DO_UPCAST(MaltaState, busdev.qdev, dev); + DeviceState *dev =3D qdev_create(NULL, TYPE_MIPS_MALTA); + MaltaState *s =3D MIPS_MALTA(dev); =20 qdev_init_nofail(dev); =20 @@ -1004,7 +1008,7 @@ static void mips_malta_class_init(ObjectClass *klas= s, void *data) } =20 static const TypeInfo mips_malta_device =3D { - .name =3D "mips-malta", + .name =3D TYPE_MIPS_MALTA, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(MaltaState), .class_init =3D mips_malta_class_init, --=20 1.8.1.4