On Tue, Jun 24, 2014 at 4:06 PM, Alistair Francis <alistair.fran...@xilinx.com> wrote: > SysBusDevice::init is deprecated. Convert to Object::init and > Device::realize as prescribed by QOM conventions. > > Signed-off-by: Alistair Francis <alistair.fran...@xilinx.com>
Reviewed-by: Peter Crosthwaite <peter.crosthwa...@xilinx.com> CC Peter for target-arm. Regards, Peter > --- > > hw/char/cadence_uart.c | 29 ++++++++++++++++------------- > 1 files changed, 16 insertions(+), 13 deletions(-) > > diff --git a/hw/char/cadence_uart.c b/hw/char/cadence_uart.c > index bf0c853..5a22a72 100644 > --- a/hw/char/cadence_uart.c > +++ b/hw/char/cadence_uart.c > @@ -468,27 +468,30 @@ static void cadence_uart_reset(DeviceState *dev) > uart_update_status(s); > } > > -static int cadence_uart_init(SysBusDevice *dev) > +static void candence_uart_realize(DeviceState *dev, Error **errp) > { > UartState *s = CADENCE_UART(dev); > > - memory_region_init_io(&s->iomem, OBJECT(s), &uart_ops, s, "uart", > 0x1000); > - sysbus_init_mmio(dev, &s->iomem); > - sysbus_init_irq(dev, &s->irq); > - > - s->fifo_trigger_handle = timer_new_ns(QEMU_CLOCK_VIRTUAL, > - (QEMUTimerCB *)fifo_trigger_update, s); > - > - s->char_tx_time = (get_ticks_per_sec() / 9600) * 10; > - > s->chr = qemu_char_get_next_serial(); > > if (s->chr) { > qemu_chr_add_handlers(s->chr, uart_can_receive, uart_receive, > uart_event, s); > } > +} > > - return 0; > +static void cadence_uart_init(Object *obj) > +{ > + UartState *s = CADENCE_UART(obj); > + > + memory_region_init_io(&s->iomem, obj, &uart_ops, s, "uart", 0x1000); > + sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->iomem); > + sysbus_init_irq(SYS_BUS_DEVICE(obj), &s->irq); > + > + s->fifo_trigger_handle = timer_new_ns(QEMU_CLOCK_VIRTUAL, > + (QEMUTimerCB *)fifo_trigger_update, s); > + > + s->char_tx_time = (get_ticks_per_sec() / 9600) * 10; > } > > static int cadence_uart_post_load(void *opaque, int version_id) > @@ -520,9 +523,8 @@ static const VMStateDescription vmstate_cadence_uart = { > static void cadence_uart_class_init(ObjectClass *klass, void *data) > { > DeviceClass *dc = DEVICE_CLASS(klass); > - SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass); > > - sdc->init = cadence_uart_init; > + dc->realize = candence_uart_realize; > dc->vmsd = &vmstate_cadence_uart; > dc->reset = cadence_uart_reset; > } > @@ -531,6 +533,7 @@ static const TypeInfo cadence_uart_info = { > .name = TYPE_CADENCE_UART, > .parent = TYPE_SYS_BUS_DEVICE, > .instance_size = sizeof(UartState), > + .instance_init = cadence_uart_init, > .class_init = cadence_uart_class_init, > }; > > -- > 1.7.1 > >