[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/7] cadence_uart: Convert to QOM realize()
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 1/7] cadence_uart: Convert to QOM realize() |
Date: |
Tue, 17 Mar 2015 16:08:06 +0100 |
From: Alistair Francis <address@hidden>
Use DeviceClass::realize() and TypeInfo::instance_init() instead of
the deprecated SysBusDevice::init().
Signed-off-by: Alistair Francis <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
hw/char/cadence_uart.c | 26 +++++++++++++++-----------
1 file changed, 15 insertions(+), 11 deletions(-)
diff --git a/hw/char/cadence_uart.c b/hw/char/cadence_uart.c
index 7044b35..a5dc2a4 100644
--- a/hw/char/cadence_uart.c
+++ b/hw/char/cadence_uart.c
@@ -476,18 +476,12 @@ static void cadence_uart_reset(DeviceState *dev)
uart_update_status(s);
}
-static int cadence_uart_init(SysBusDevice *dev)
+static void cadence_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;
+ fifo_trigger_update, s);
s->chr = qemu_char_get_next_serial();
@@ -495,8 +489,18 @@ static int cadence_uart_init(SysBusDevice *dev)
qemu_chr_add_handlers(s->chr, uart_can_receive, uart_receive,
uart_event, s);
}
+}
- return 0;
+static void cadence_uart_init(Object *obj)
+{
+ SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
+ UartState *s = CADENCE_UART(obj);
+
+ memory_region_init_io(&s->iomem, obj, &uart_ops, s, "uart", 0x1000);
+ sysbus_init_mmio(sbd, &s->iomem);
+ sysbus_init_irq(sbd, &s->irq);
+
+ s->char_tx_time = (get_ticks_per_sec() / 9600) * 10;
}
static int cadence_uart_post_load(void *opaque, int version_id)
@@ -528,9 +532,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 = cadence_uart_realize;
dc->vmsd = &vmstate_cadence_uart;
dc->reset = cadence_uart_reset;
}
@@ -539,6 +542,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,
};
--
2.1.4
- [Qemu-devel] [PULL 0/7] QOM devices patch queue 2015-03-17, Andreas Färber, 2015/03/17
- [Qemu-devel] [PULL 5/7] qom: Implement info qom-tree HMP command, Andreas Färber, 2015/03/17
- [Qemu-devel] [PULL 3/7] qom: Implement qom-list HMP command, Andreas Färber, 2015/03/17
- [Qemu-devel] [PULL 2/7] scripts: Add qom-tree script, Andreas Färber, 2015/03/17
- [Qemu-devel] [PULL 4/7] qom: Implement qom-set HMP command, Andreas Färber, 2015/03/17
- [Qemu-devel] [PULL 7/7] qdev: Move owner-less IRQs to /machine/unattached, Andreas Färber, 2015/03/17
- [Qemu-devel] [PULL 1/7] cadence_uart: Convert to QOM realize(),
Andreas Färber <=
- [Qemu-devel] [PULL 6/7] memory: Move owner-less MemoryRegions to /machine/unattached, Andreas Färber, 2015/03/17
- Re: [Qemu-devel] [PULL 0/7] QOM devices patch queue 2015-03-17, Peter Maydell, 2015/03/17