From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:38358) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUIse-0006c4-Ir for qemu-devel@nongnu.org; Mon, 22 Apr 2013 11:42:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UUIsc-0007CP-8x for qemu-devel@nongnu.org; Mon, 22 Apr 2013 11:42:12 -0400 Received: from cantor2.suse.de ([195.135.220.15]:36154 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUIsb-0007Bs-L7 for qemu-devel@nongnu.org; Mon, 22 Apr 2013 11:42:09 -0400 Message-ID: <51755A50.8090403@suse.de> Date: Mon, 22 Apr 2013 17:42:08 +0200 From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= MIME-Version: 1.0 References: <1353888766-6951-1-git-send-email-afaerber@suse.de> <1353888766-6951-16-git-send-email-afaerber@suse.de> In-Reply-To: <1353888766-6951-16-git-send-email-afaerber@suse.de> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [RFC 15/34] mc146818rtc: QOM'ify List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Igor Mammedov , anthony@codemonkey.ws Am 26.11.2012 01:12, schrieb Andreas F=C3=A4rber: > Introduce type constant and cast macro to obsolete DO_UPCAST(). >=20 > Prepares for ISA realizefn. >=20 > Signed-off-by: Andreas F=C3=A4rber > --- > hw/mc146818rtc.c | 38 +++++++++++++++++++++----------------- > hw/mc146818rtc.h | 2 ++ > 2 Dateien ge=C3=A4ndert, 23 Zeilen hinzugef=C3=BCgt(+), 17 Zeilen entf= ernt(-) Applied rebased version to qom-cpu-next (static const was applied throughout the tree, file locations changed; no new conversions): https://github.com/afaerber/qemu-cpu/commits/qom-cpu-next Andreas >=20 > diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c > index 7d84ce3..c87b7f6 100644 > --- a/hw/mc146818rtc.c > +++ b/hw/mc146818rtc.c > @@ -57,8 +57,11 @@ > #define RTC_CLOCK_RATE 32768 > #define UIP_HOLD_LENGTH (8 * NSEC_PER_SEC / 32768) > =20 > +#define MC146818_RTC(obj) OBJECT_CHECK(RTCState, (obj), TYPE_MC146818_= RTC) > + > typedef struct RTCState { > - ISADevice dev; > + ISADevice parent_obj; > + > MemoryRegion io; > uint8_t cmos_data[128]; > uint8_t cmos_index; > @@ -668,14 +671,14 @@ static uint64_t cmos_ioport_read(void *opaque, hw= addr addr, > =20 > void rtc_set_memory(ISADevice *dev, int addr, int val) > { > - RTCState *s =3D DO_UPCAST(RTCState, dev, dev); > + RTCState *s =3D MC146818_RTC(dev); > if (addr >=3D 0 && addr <=3D 127) > s->cmos_data[addr] =3D val; > } > =20 > static void rtc_set_date_from_host(ISADevice *dev) > { > - RTCState *s =3D DO_UPCAST(RTCState, dev, dev); > + RTCState *s =3D MC146818_RTC(dev); > struct tm tm; > =20 > qemu_get_timedate(&tm, 0); > @@ -737,7 +740,7 @@ static void rtc_notify_clock_reset(Notifier *notifi= er, void *data) > RTCState *s =3D container_of(notifier, RTCState, clock_reset_notif= ier); > int64_t now =3D *(int64_t *)data; > =20 > - rtc_set_date_from_host(&s->dev); > + rtc_set_date_from_host(ISA_DEVICE(s)); > periodic_timer_update(s, now); > check_update_timer(s); > #ifdef TARGET_I386 > @@ -752,7 +755,7 @@ static void rtc_notify_clock_reset(Notifier *notifi= er, void *data) > static void rtc_notify_suspend(Notifier *notifier, void *data) > { > RTCState *s =3D container_of(notifier, RTCState, suspend_notifier)= ; > - rtc_set_memory(&s->dev, 0xF, 0xFE); > + rtc_set_memory(ISA_DEVICE(s), 0xF, 0xFE); > } > =20 > static void rtc_reset(void *opaque) > @@ -785,8 +788,7 @@ static const MemoryRegionOps cmos_ops =3D { > static void rtc_get_date(Object *obj, Visitor *v, void *opaque, > const char *name, Error **errp) > { > - ISADevice *isa =3D ISA_DEVICE(obj); > - RTCState *s =3D DO_UPCAST(RTCState, dev, isa); > + RTCState *s =3D MC146818_RTC(obj); > struct tm current_tm; > =20 > rtc_update_time(s); > @@ -803,7 +805,7 @@ static void rtc_get_date(Object *obj, Visitor *v, v= oid *opaque, > =20 > static int rtc_initfn(ISADevice *dev) > { > - RTCState *s =3D DO_UPCAST(RTCState, dev, dev); > + RTCState *s =3D MC146818_RTC(dev); > int base =3D 0x70; > =20 > s->cmos_data[RTC_REG_A] =3D 0x26; > @@ -862,19 +864,21 @@ static int rtc_initfn(ISADevice *dev) > =20 > ISADevice *rtc_init(ISABus *bus, int base_year, qemu_irq intercept_irq= ) > { > - ISADevice *dev; > + DeviceState *dev; > + ISADevice *isadev; > RTCState *s; > =20 > - dev =3D isa_create(bus, "mc146818rtc"); > - s =3D DO_UPCAST(RTCState, dev, dev); > - qdev_prop_set_int32(&dev->qdev, "base_year", base_year); > - qdev_init_nofail(&dev->qdev); > + isadev =3D isa_create(bus, TYPE_MC146818_RTC); > + dev =3D DEVICE(isadev); > + s =3D MC146818_RTC(isadev); > + qdev_prop_set_int32(dev, "base_year", base_year); > + qdev_init_nofail(dev); > if (intercept_irq) { > s->irq =3D intercept_irq; > } else { > - isa_init_irq(dev, &s->irq, RTC_ISA_IRQ); > + isa_init_irq(isadev, &s->irq, RTC_ISA_IRQ); > } > - return dev; > + return isadev; > } > =20 > static Property mc146818rtc_properties[] =3D { > @@ -894,8 +898,8 @@ static void rtc_class_initfn(ObjectClass *klass, vo= id *data) > dc->props =3D mc146818rtc_properties; > } > =20 > -static TypeInfo mc146818rtc_info =3D { > - .name =3D "mc146818rtc", > +static const TypeInfo mc146818rtc_info =3D { > + .name =3D TYPE_MC146818_RTC, > .parent =3D TYPE_ISA_DEVICE, > .instance_size =3D sizeof(RTCState), > .class_init =3D rtc_class_initfn, > diff --git a/hw/mc146818rtc.h b/hw/mc146818rtc.h > index f286b6a..b00c794 100644 > --- a/hw/mc146818rtc.h > +++ b/hw/mc146818rtc.h > @@ -4,6 +4,8 @@ > #include "isa.h" > #include "mc146818rtc_regs.h" > =20 > +#define TYPE_MC146818_RTC "mc146818rtc" > + > ISADevice *rtc_init(ISABus *bus, int base_year, qemu_irq intercept_irq= ); > void rtc_set_memory(ISADevice *dev, int addr, int val); > void rtc_set_date(ISADevice *dev, const struct tm *tm); >=20 --=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