From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55772) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t07-00028O-UA for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:21:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t01-0002D2-Jd for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:20:59 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53233 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t01-0002Cr-Ci for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:20:53 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:17:55 +0200 Message-Id: <1375125630-24869-19-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 018/173] milkymist-ac97: QOM cast cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Vassili Karpov (malc)" , =?UTF-8?q?Andreas=20F=C3=A4rber?= Introduce a type constant, use QOM casts and rename the parent field. Reviewed-by: Hu Tao Signed-off-by: Andreas F=C3=A4rber --- hw/audio/milkymist-ac97.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/hw/audio/milkymist-ac97.c b/hw/audio/milkymist-ac97.c index 133de4e..9c0f7a0 100644 --- a/hw/audio/milkymist-ac97.c +++ b/hw/audio/milkymist-ac97.c @@ -51,8 +51,13 @@ enum { CTRL_EN =3D (1<<0), }; =20 +#define TYPE_MILKYMIST_AC97 "milkymist-ac97" +#define MILKYMIST_AC97(obj) \ + OBJECT_CHECK(MilkymistAC97State, (obj), TYPE_MILKYMIST_AC97) + struct MilkymistAC97State { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion regs_region; =20 QEMUSoundCard card; @@ -258,7 +263,7 @@ static void ac97_out_cb(void *opaque, int free_b) =20 static void milkymist_ac97_reset(DeviceState *d) { - MilkymistAC97State *s =3D container_of(d, MilkymistAC97State, busdev= .qdev); + MilkymistAC97State *s =3D MILKYMIST_AC97(d); int i; =20 for (i =3D 0; i < R_MAX; i++) { @@ -280,7 +285,7 @@ static int ac97_post_load(void *opaque, int version_i= d) =20 static int milkymist_ac97_init(SysBusDevice *dev) { - MilkymistAC97State *s =3D FROM_SYSBUS(typeof(*s), dev); + MilkymistAC97State *s =3D MILKYMIST_AC97(dev); =20 struct audsettings as; sysbus_init_irq(dev, &s->crrequest_irq); @@ -330,7 +335,7 @@ static void milkymist_ac97_class_init(ObjectClass *kl= ass, void *data) } =20 static const TypeInfo milkymist_ac97_info =3D { - .name =3D "milkymist-ac97", + .name =3D TYPE_MILKYMIST_AC97, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(MilkymistAC97State), .class_init =3D milkymist_ac97_class_init, --=20 1.8.1.4