[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 20/58] milkymist-uart: Use Device::realize instead of
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 20/58] milkymist-uart: Use Device::realize instead of SysBusDevice::init |
Date: |
Tue, 8 Oct 2013 19:44:18 +0200 |
From: Antony Pavlov <address@hidden>
Use of SysBusDevice::init is deprecated. Use Device::realize instead.
Also introduce TypeInfo::instance_init milkymist_uart_init().
Reported-by: Peter Crosthwaite <address@hidden>
Signed-off-by: Antony Pavlov <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
hw/char/milkymist-uart.c | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/hw/char/milkymist-uart.c b/hw/char/milkymist-uart.c
index 2e4b5c5..2c52a0f 100644
--- a/hw/char/milkymist-uart.c
+++ b/hw/char/milkymist-uart.c
@@ -195,22 +195,26 @@ static void milkymist_uart_reset(DeviceState *d)
s->regs[R_STAT] = STAT_THRE;
}
-static int milkymist_uart_init(SysBusDevice *dev)
+static void milkymist_uart_realize(DeviceState *dev, Error **errp)
{
MilkymistUartState *s = MILKYMIST_UART(dev);
- sysbus_init_irq(dev, &s->irq);
-
- memory_region_init_io(&s->regs_region, OBJECT(s), &uart_mmio_ops, s,
- "milkymist-uart", R_MAX * 4);
- sysbus_init_mmio(dev, &s->regs_region);
-
s->chr = qemu_char_get_next_serial();
if (s->chr) {
qemu_chr_add_handlers(s->chr, uart_can_rx, uart_rx, uart_event, s);
}
+}
- return 0;
+static void milkymist_uart_init(Object *obj)
+{
+ SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
+ MilkymistUartState *s = MILKYMIST_UART(obj);
+
+ sysbus_init_irq(sbd, &s->irq);
+
+ memory_region_init_io(&s->regs_region, OBJECT(s), &uart_mmio_ops, s,
+ "milkymist-uart", R_MAX * 4);
+ sysbus_init_mmio(sbd, &s->regs_region);
}
static const VMStateDescription vmstate_milkymist_uart = {
@@ -227,9 +231,8 @@ static const VMStateDescription vmstate_milkymist_uart = {
static void milkymist_uart_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
- SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
- k->init = milkymist_uart_init;
+ dc->realize = milkymist_uart_realize;
dc->reset = milkymist_uart_reset;
dc->vmsd = &vmstate_milkymist_uart;
}
@@ -238,6 +241,7 @@ static const TypeInfo milkymist_uart_info = {
.name = TYPE_MILKYMIST_UART,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(MilkymistUartState),
+ .instance_init = milkymist_uart_init,
.class_init = milkymist_uart_class_init,
};
--
1.8.1.4
- [Qemu-devel] [PULL 00/58] QOM devices patch queue 2013-10-08, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 12/58] axis_dev88: Don't enforce use of kernel for qtest, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 20/58] milkymist-uart: Use Device::realize instead of SysBusDevice::init,
Andreas Färber <=
- [Qemu-devel] [PULL 38/58] arm11mpcore: Split off SCU device, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 47/58] qdev-monitor: Unref device when device_add fails, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 21/58] a9mpcore: Split off instance_init, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 03/58] mips_mipssim: Silence BIOS loading warning for qtest, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 13/58] mcf5208: Don't enforce use of kernel for qtest, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 14/58] an5206: Don't enforce use of kernel for qtest, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 22/58] arm_gic: Extract headers hw/intc/arm_gic{, _common}.h, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 53/58] qom: Add pointer to int property helpers, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 52/58] qom: Clean up struct Error references, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 01/58] hw/arm/boot: Make user not specifying a kernel not an error, Andreas Färber, 2013/10/08