Am 26.11.2012 01:12, schrieb Andreas Färber: > Introduce type constant and cast macro to obsolete DO_UPCAST(). > > Prepares for ISA realizefn. > > Signed-off-by: Andreas Färber <afaer...@suse.de> > --- > hw/mc146818rtc.c | 38 +++++++++++++++++++++----------------- > hw/mc146818rtc.h | 2 ++ > 2 Dateien geändert, 23 Zeilen hinzugefügt(+), 17 Zeilen entfernt(-)
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 > > 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) > > +#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, hwaddr > addr, > > void rtc_set_memory(ISADevice *dev, int addr, int val) > { > - RTCState *s = DO_UPCAST(RTCState, dev, dev); > + RTCState *s = MC146818_RTC(dev); > if (addr >= 0 && addr <= 127) > s->cmos_data[addr] = val; > } > > static void rtc_set_date_from_host(ISADevice *dev) > { > - RTCState *s = DO_UPCAST(RTCState, dev, dev); > + RTCState *s = MC146818_RTC(dev); > struct tm tm; > > qemu_get_timedate(&tm, 0); > @@ -737,7 +740,7 @@ static void rtc_notify_clock_reset(Notifier *notifier, > void *data) > RTCState *s = container_of(notifier, RTCState, clock_reset_notifier); > int64_t now = *(int64_t *)data; > > - 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 *notifier, > void *data) > static void rtc_notify_suspend(Notifier *notifier, void *data) > { > RTCState *s = container_of(notifier, RTCState, suspend_notifier); > - rtc_set_memory(&s->dev, 0xF, 0xFE); > + rtc_set_memory(ISA_DEVICE(s), 0xF, 0xFE); > } > > static void rtc_reset(void *opaque) > @@ -785,8 +788,7 @@ static const MemoryRegionOps cmos_ops = { > static void rtc_get_date(Object *obj, Visitor *v, void *opaque, > const char *name, Error **errp) > { > - ISADevice *isa = ISA_DEVICE(obj); > - RTCState *s = DO_UPCAST(RTCState, dev, isa); > + RTCState *s = MC146818_RTC(obj); > struct tm current_tm; > > rtc_update_time(s); > @@ -803,7 +805,7 @@ static void rtc_get_date(Object *obj, Visitor *v, void > *opaque, > > static int rtc_initfn(ISADevice *dev) > { > - RTCState *s = DO_UPCAST(RTCState, dev, dev); > + RTCState *s = MC146818_RTC(dev); > int base = 0x70; > > s->cmos_data[RTC_REG_A] = 0x26; > @@ -862,19 +864,21 @@ static int rtc_initfn(ISADevice *dev) > > ISADevice *rtc_init(ISABus *bus, int base_year, qemu_irq intercept_irq) > { > - ISADevice *dev; > + DeviceState *dev; > + ISADevice *isadev; > RTCState *s; > > - dev = isa_create(bus, "mc146818rtc"); > - s = DO_UPCAST(RTCState, dev, dev); > - qdev_prop_set_int32(&dev->qdev, "base_year", base_year); > - qdev_init_nofail(&dev->qdev); > + isadev = isa_create(bus, TYPE_MC146818_RTC); > + dev = DEVICE(isadev); > + s = MC146818_RTC(isadev); > + qdev_prop_set_int32(dev, "base_year", base_year); > + qdev_init_nofail(dev); > if (intercept_irq) { > s->irq = 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; > } > > static Property mc146818rtc_properties[] = { > @@ -894,8 +898,8 @@ static void rtc_class_initfn(ObjectClass *klass, void > *data) > dc->props = mc146818rtc_properties; > } > > -static TypeInfo mc146818rtc_info = { > - .name = "mc146818rtc", > +static const TypeInfo mc146818rtc_info = { > + .name = TYPE_MC146818_RTC, > .parent = TYPE_ISA_DEVICE, > .instance_size = sizeof(RTCState), > .class_init = 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" > > +#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); > -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
