[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/22] char/grlib_apbuart: Convert sysbus init funct
From: |
Mao Zhongyi |
Subject: |
[Qemu-devel] [PATCH 03/22] char/grlib_apbuart: Convert sysbus init function to realize function |
Date: |
Mon, 19 Nov 2018 20:08:01 +0800 |
Use DeviceClass rather than SysBusDeviceClass in
grlib_apbuart_class_init().
Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Signed-off-by: Mao Zhongyi <address@hidden>
Signed-off-by: Zhang Shengju <address@hidden>
---
hw/char/grlib_apbuart.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/hw/char/grlib_apbuart.c b/hw/char/grlib_apbuart.c
index bac11bec58..e73ecf2ea5 100644
--- a/hw/char/grlib_apbuart.c
+++ b/hw/char/grlib_apbuart.c
@@ -239,7 +239,7 @@ static const MemoryRegionOps grlib_apbuart_ops = {
.endianness = DEVICE_NATIVE_ENDIAN,
};
-static int grlib_apbuart_init(SysBusDevice *dev)
+static void grlib_apbuart_realize(DeviceState *dev, Error **errp)
{
UART *uart = GRLIB_APB_UART(dev);
@@ -249,14 +249,12 @@ static int grlib_apbuart_init(SysBusDevice *dev)
grlib_apbuart_event,
NULL, uart, NULL, true);
- sysbus_init_irq(dev, &uart->irq);
+ sysbus_init_irq(SYS_BUS_DEVICE(dev), &uart->irq);
memory_region_init_io(&uart->iomem, OBJECT(uart), &grlib_apbuart_ops, uart,
"uart", UART_REG_SIZE);
- sysbus_init_mmio(dev, &uart->iomem);
-
- return 0;
+ sysbus_init_mmio(SYS_BUS_DEVICE(dev), &uart->iomem);
}
static void grlib_apbuart_reset(DeviceState *d)
@@ -280,9 +278,8 @@ static Property grlib_apbuart_properties[] = {
static void grlib_apbuart_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
- SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
- k->init = grlib_apbuart_init;
+ dc->realize = grlib_apbuart_realize;
dc->reset = grlib_apbuart_reset;
dc->props = grlib_apbuart_properties;
}
--
2.17.1
- Re: [Qemu-devel] [PATCH 20/22] xen_backend: Convert sysbus init function to realize function, (continued)
- [Qemu-devel] [PATCH 10/22] intc/puv3_intc: Convert sysbus init function to realize function, Mao Zhongyi, 2018/11/19
- [Qemu-devel] [PATCH 01/22] musicpal: Convert sysbus init function to realize function, Mao Zhongyi, 2018/11/19
- [Qemu-devel] [PATCH 03/22] char/grlib_apbuart: Convert sysbus init function to realize function,
Mao Zhongyi <=
- [Qemu-devel] [PATCH 19/22] usb/tusb6010: Convert sysbus init function to realize function, Mao Zhongyi, 2018/11/19
- [Qemu-devel] [PATCH 17/22] timer/grlib_gptimer: Convert sysbus init function to realize function, Mao Zhongyi, 2018/11/19
- [Qemu-devel] [PATCH 16/22] timer/etraxfs_timer: Convert sysbus init function to realize function, Mao Zhongyi, 2018/11/19
- [Qemu-devel] [PATCH 02/22] block/noenand: Convert sysbus init function to realize function, Mao Zhongyi, 2018/11/19
- [Qemu-devel] [PATCH 07/22] gpio/puv3_gpio: Convert sysbus init function to realize function, Mao Zhongyi, 2018/11/19
- [Qemu-devel] [PATCH 13/22] puv3_pm.c: Convert sysbus init function to realize function, Mao Zhongyi, 2018/11/19