From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52519) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2lI6-0001AN-5Y for qemu-devel@nongnu.org; Fri, 26 Jul 2013 12:54:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V2lI3-0000Ex-Hr for qemu-devel@nongnu.org; Fri, 26 Jul 2013 12:54:54 -0400 Received: from cantor2.suse.de ([195.135.220.15]:38294 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2lI3-0000Cf-Bj for qemu-devel@nongnu.org; Fri, 26 Jul 2013 12:54:51 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 5293BA51FE for ; Fri, 26 Jul 2013 18:54:50 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 26 Jul 2013 18:54:45 +0200 Message-Id: <1374857687-20332-2-git-send-email-afaerber@suse.de> In-Reply-To: <1374857687-20332-1-git-send-email-afaerber@suse.de> References: <1374857687-20332-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 1/3] milkymist-softusb: 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/input/milkymist-softusb.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/hw/input/milkymist-softusb.c b/hw/input/milkymist-softusb.c index 942cb79..ecde33c 100644 --- a/hw/input/milkymist-softusb.c +++ b/hw/input/milkymist-softusb.c @@ -44,8 +44,13 @@ enum { #define COMLOC_KEVT_PRODUCE 0x1142 #define COMLOC_KEVT_BASE 0x1143 =20 +#define TYPE_MILKYMIST_SOFTUSB "milkymist-softusb" +#define MILKYMIST_SOFTUSB(obj) \ + OBJECT_CHECK(MilkymistSoftUsbState, (obj), TYPE_MILKYMIST_SOFTUSB) + struct MilkymistSoftUsbState { - SysBusDevice busdev; + SysBusDevice parent_obj; + HIDState hid_kbd; HIDState hid_mouse; =20 @@ -242,8 +247,7 @@ static void softusb_mouse_hid_datain(HIDState *hs) =20 static void milkymist_softusb_reset(DeviceState *d) { - MilkymistSoftUsbState *s =3D - container_of(d, MilkymistSoftUsbState, busdev.qdev); + MilkymistSoftUsbState *s =3D MILKYMIST_SOFTUSB(d); int i; =20 for (i =3D 0; i < R_MAX; i++) { @@ -261,7 +265,7 @@ static void milkymist_softusb_reset(DeviceState *d) =20 static int milkymist_softusb_init(SysBusDevice *dev) { - MilkymistSoftUsbState *s =3D FROM_SYSBUS(typeof(*s), dev); + MilkymistSoftUsbState *s =3D MILKYMIST_SOFTUSB(dev); =20 sysbus_init_irq(dev, &s->irq); =20 @@ -320,7 +324,7 @@ static void milkymist_softusb_class_init(ObjectClass = *klass, void *data) } =20 static const TypeInfo milkymist_softusb_info =3D { - .name =3D "milkymist-softusb", + .name =3D TYPE_MILKYMIST_SOFTUSB, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(MilkymistSoftUsbState), .class_init =3D milkymist_softusb_class_init, --=20 1.8.1.4