[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/21] hw/char: QOM'ify exynos4210_uart.c
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 02/21] hw/char: QOM'ify exynos4210_uart.c |
Date: |
Mon, 9 Jan 2017 11:53:25 +0000 |
From: xiaoqiang zhao <address@hidden>
Drop the old Sysbus init and use instance_init and
DeviceClass::realize instead
Signed-off-by: xiaoqiang zhao <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
---
hw/char/exynos4210_uart.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/hw/char/exynos4210_uart.c b/hw/char/exynos4210_uart.c
index 571c324..820d1ab 100644
--- a/hw/char/exynos4210_uart.c
+++ b/hw/char/exynos4210_uart.c
@@ -629,22 +629,26 @@ DeviceState *exynos4210_uart_create(hwaddr addr,
return dev;
}
-static int exynos4210_uart_init(SysBusDevice *dev)
+static void exynos4210_uart_init(Object *obj)
{
+ SysBusDevice *dev = SYS_BUS_DEVICE(obj);
Exynos4210UartState *s = EXYNOS4210_UART(dev);
/* memory mapping */
- memory_region_init_io(&s->iomem, OBJECT(s), &exynos4210_uart_ops, s,
+ memory_region_init_io(&s->iomem, obj, &exynos4210_uart_ops, s,
"exynos4210.uart", EXYNOS4210_UART_REGS_MEM_SIZE);
sysbus_init_mmio(dev, &s->iomem);
sysbus_init_irq(dev, &s->irq);
+}
+
+static void exynos4210_uart_realize(DeviceState *dev, Error **errp)
+{
+ Exynos4210UartState *s = EXYNOS4210_UART(dev);
qemu_chr_fe_set_handlers(&s->chr, exynos4210_uart_can_receive,
exynos4210_uart_receive, exynos4210_uart_event,
s, NULL, true);
-
- return 0;
}
static Property exynos4210_uart_properties[] = {
@@ -658,9 +662,8 @@ static Property exynos4210_uart_properties[] = {
static void exynos4210_uart_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
- SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
- k->init = exynos4210_uart_init;
+ dc->realize = exynos4210_uart_realize;
dc->reset = exynos4210_uart_reset;
dc->props = exynos4210_uart_properties;
dc->vmsd = &vmstate_exynos4210_uart;
@@ -670,6 +673,7 @@ static const TypeInfo exynos4210_uart_info = {
.name = TYPE_EXYNOS4210_UART,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(Exynos4210UartState),
+ .instance_init = exynos4210_uart_init,
.class_init = exynos4210_uart_class_init,
};
--
2.7.4
- [Qemu-devel] [PULL 15/21] hw/arm/virt: pass VirtMachineState instead of VirtGuestInfo, (continued)
- [Qemu-devel] [PULL 15/21] hw/arm/virt: pass VirtMachineState instead of VirtGuestInfo, Peter Maydell, 2017/01/09
- [Qemu-devel] [PULL 05/21] hw/arm/virt: Don't incorrectly claim architectural timer to be edge-triggered, Peter Maydell, 2017/01/09
- [Qemu-devel] [PULL 16/21] hw/arm/virt-acpi-build: remove redundant members from VirtGuestInfo, Peter Maydell, 2017/01/09
- [Qemu-devel] [PULL 10/21] hw/arm/virt: parameter passing cleanups, Peter Maydell, 2017/01/09
- [Qemu-devel] [PULL 13/21] hw/arm/virt: remove include/hw/arm/virt-acpi-build.h, Peter Maydell, 2017/01/09
- [Qemu-devel] [PULL 08/21] hw/arm/virt-acpi-build: gtdt: improve flag naming, Peter Maydell, 2017/01/09
- [Qemu-devel] [PULL 03/21] hw/arm/virt: Merge VirtBoardInfo and VirtMachineState, Peter Maydell, 2017/01/09
- [Qemu-devel] [PULL 04/21] hw/arm/virt: Rename 'vbi' variables to 'vms', Peter Maydell, 2017/01/09
- [Qemu-devel] [PULL 06/21] hw/arm/virt-acpi-build: add all missing cpu_to_le's, Peter Maydell, 2017/01/09
- [Qemu-devel] [PULL 01/21] i2c: Allow I2C devices to NAK start events, Peter Maydell, 2017/01/09
- [Qemu-devel] [PULL 02/21] hw/char: QOM'ify exynos4210_uart.c,
Peter Maydell <=
- Re: [Qemu-devel] [PULL 00/21] target-arm queue, Peter Maydell, 2017/01/09