From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49238) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3eTX-00086h-Tb for qemu-devel@nongnu.org; Sun, 28 Jul 2013 23:50:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3eTR-0004EY-TF for qemu-devel@nongnu.org; Sun, 28 Jul 2013 23:50:23 -0400 Received: from cantor2.suse.de ([195.135.220.15]:48009 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3eTR-0004ET-Jh for qemu-devel@nongnu.org; Sun, 28 Jul 2013 23:50:17 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id D0F92A4EB7 for ; Mon, 29 Jul 2013 05:50:16 +0200 (CEST) Message-ID: <51F5E673.4080405@suse.de> Date: Mon, 29 Jul 2013 05:50:11 +0200 From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= MIME-Version: 1.0 References: <1374932223-7490-1-git-send-email-afaerber@suse.de> <1374932223-7490-18-git-send-email-afaerber@suse.de> In-Reply-To: <1374932223-7490-18-git-send-email-afaerber@suse.de> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH qom-next for-1.6 17/20] pxa2xx_timer: QOM cast cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Am 27.07.2013 15:37, schrieb Andreas F=C3=A4rber: > Signed-off-by: Andreas F=C3=A4rber > --- > hw/timer/pxa2xx_timer.c | 38 +++++++++++++++++++++++++++----------- > 1 file changed, 27 insertions(+), 11 deletions(-) >=20 > diff --git a/hw/timer/pxa2xx_timer.c b/hw/timer/pxa2xx_timer.c > index 4d28719..ff63fa6 100644 > --- a/hw/timer/pxa2xx_timer.c > +++ b/hw/timer/pxa2xx_timer.c > @@ -60,6 +60,10 @@ static int pxa2xx_timer4_freq[8] =3D { > [5 ... 7] =3D 0, > }; > =20 > +#define TYPE_PXA2XX_TIMER "pxa2xx-timer" > +#define PXA2XX_TIMER(obj) \ > + OBJECT_CHECK(PXA2xxTimerInfo, (obj), TYPE_PXA2XX_TIMER) > + > typedef struct PXA2xxTimerInfo PXA2xxTimerInfo; > =20 > typedef struct { > @@ -80,7 +84,8 @@ typedef struct { > } PXA2xxTimer4; > =20 > struct PXA2xxTimerInfo { > - SysBusDevice busdev; > + SysBusDevice parent_obj; > + > MemoryRegion iomem; > uint32_t flags; > =20 > @@ -429,10 +434,9 @@ static int pxa25x_timer_post_load(void *opaque, in= t version_id) > =20 > static int pxa2xx_timer_init(SysBusDevice *dev) > { > + PXA2xxTimerInfo *s =3D PXA2XX_TIMER(dev); > int i; > - PXA2xxTimerInfo *s; > =20 > - s =3D FROM_SYSBUS(PXA2xxTimerInfo, dev); > s->irq_enabled =3D 0; > s->oldclock =3D 0; > s->clock =3D 0; > @@ -527,18 +531,15 @@ static const VMStateDescription vmstate_pxa2xx_ti= mer_regs =3D { > static Property pxa25x_timer_dev_properties[] =3D { > DEFINE_PROP_UINT32("freq", PXA2xxTimerInfo, freq, PXA25X_FREQ), > DEFINE_PROP_BIT("tm4", PXA2xxTimerInfo, flags, > - PXA2XX_TIMER_HAVE_TM4, false), > + PXA2XX_TIMER_HAVE_TM4, false), > DEFINE_PROP_END_OF_LIST(), > }; > =20 > static void pxa25x_timer_dev_class_init(ObjectClass *klass, void *data= ) > { > DeviceClass *dc =3D DEVICE_CLASS(klass); > - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); > =20 > - k->init =3D pxa2xx_timer_init; > dc->desc =3D "PXA25x timer"; > - dc->vmsd =3D &vmstate_pxa2xx_timer_regs; > dc->props =3D pxa25x_timer_dev_properties; > } > =20 > @@ -552,18 +553,15 @@ static const TypeInfo pxa25x_timer_dev_info =3D { > static Property pxa27x_timer_dev_properties[] =3D { > DEFINE_PROP_UINT32("freq", PXA2xxTimerInfo, freq, PXA27X_FREQ), > DEFINE_PROP_BIT("tm4", PXA2xxTimerInfo, flags, > - PXA2XX_TIMER_HAVE_TM4, true), > + PXA2XX_TIMER_HAVE_TM4, true), > DEFINE_PROP_END_OF_LIST(), > }; > =20 > static void pxa27x_timer_dev_class_init(ObjectClass *klass, void *data= ) > { > DeviceClass *dc =3D DEVICE_CLASS(klass); > - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); > =20 > - k->init =3D pxa2xx_timer_init; > dc->desc =3D "PXA27x timer"; > - dc->vmsd =3D &vmstate_pxa2xx_timer_regs; > dc->props =3D pxa27x_timer_dev_properties; > } > =20 > @@ -574,8 +572,26 @@ static const TypeInfo pxa27x_timer_dev_info =3D { > .class_init =3D pxa27x_timer_dev_class_init, > }; > =20 > +static void pxa2xx_timer_class_init(ObjectClass *oc, void *data) > +{ > + DeviceClass *dc =3D DEVICE_CLASS(oc); > + SysBusDeviceClass *sdc =3D SYS_BUS_DEVICE_CLASS(oc); > + > + sdc->init =3D pxa2xx_timer_init; > + dc->vmsd =3D &vmstate_pxa2xx_timer_regs; > +} > + > +static const TypeInfo pxa2xx_timer_type_info =3D { > + .name =3D TYPE_PXA2XX_TIMER, > + .parent =3D TYPE_SYS_BUS_DEVICE, > + .instance_size =3D sizeof(PXA2xxTimerInfo), > + .abstract =3D true, > + .class_init =3D pxa2xx_timer_class_init, > +}; > + > static void pxa2xx_timer_register_types(void) > { > + type_register_static(&pxa2xx_timer_type_info); > type_register_static(&pxa25x_timer_dev_info); > type_register_static(&pxa27x_timer_dev_info); > } Needs the following addition (and subject fix), found by qtests: diff --git a/hw/timer/pxa2xx_timer.c b/hw/timer/pxa2xx_timer.c index ff63fa6..cdabccd 100644 --- a/hw/timer/pxa2xx_timer.c +++ b/hw/timer/pxa2xx_timer.c @@ -545,7 +545,7 @@ static void pxa25x_timer_dev_class_init(ObjectClass *klass, void *data) static const TypeInfo pxa25x_timer_dev_info =3D { .name =3D "pxa25x-timer", - .parent =3D TYPE_SYS_BUS_DEVICE, + .parent =3D TYPE_PXA2XX_TIMER, .instance_size =3D sizeof(PXA2xxTimerInfo), .class_init =3D pxa25x_timer_dev_class_init, }; @@ -567,7 +567,7 @@ static void pxa27x_timer_dev_class_init(ObjectClass *klass, void *data) static const TypeInfo pxa27x_timer_dev_info =3D { .name =3D "pxa27x-timer", - .parent =3D TYPE_SYS_BUS_DEVICE, + .parent =3D TYPE_PXA2XX_TIMER, .instance_size =3D sizeof(PXA2xxTimerInfo), .class_init =3D pxa27x_timer_dev_class_init, Andreas --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=C3=BCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=C3=B6rffer; HRB 16746 AG N=C3=BC= rnberg