[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 5/6] hw/intc: QOM'ify lm32_pic.c
From: |
Michael Walle |
Subject: |
[Qemu-devel] [PULL 5/6] hw/intc: QOM'ify lm32_pic.c |
Date: |
Mon, 20 Jun 2016 18:39:08 +0200 |
From: xiaoqiang zhao <address@hidden>
Drop the old SysBus init function and use instance_init
Signed-off-by: xiaoqiang zhao <address@hidden>
Acked-by: Michael Walle <address@hidden>
Tested-by: Michael Walle <address@hidden>
Signed-off-by: Michael Walle <address@hidden>
---
hw/intc/lm32_pic.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/hw/intc/lm32_pic.c b/hw/intc/lm32_pic.c
index edc08f1..3dad01c 100644
--- a/hw/intc/lm32_pic.c
+++ b/hw/intc/lm32_pic.c
@@ -152,17 +152,16 @@ static void pic_reset(DeviceState *d)
}
}
-static int lm32_pic_init(SysBusDevice *sbd)
+static void lm32_pic_init(Object *obj)
{
- DeviceState *dev = DEVICE(sbd);
- LM32PicState *s = LM32_PIC(dev);
+ DeviceState *dev = DEVICE(obj);
+ LM32PicState *s = LM32_PIC(obj);
+ SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
qdev_init_gpio_in(dev, irq_handler, 32);
sysbus_init_irq(sbd, &s->parent_irq);
pic = s;
-
- return 0;
}
static const VMStateDescription vmstate_lm32_pic = {
@@ -181,9 +180,7 @@ static const VMStateDescription vmstate_lm32_pic = {
static void lm32_pic_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
- SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
- k->init = lm32_pic_init;
dc->reset = pic_reset;
dc->vmsd = &vmstate_lm32_pic;
}
@@ -192,6 +189,7 @@ static const TypeInfo lm32_pic_info = {
.name = TYPE_LM32_PIC,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(LM32PicState),
+ .instance_init = lm32_pic_init,
.class_init = lm32_pic_class_init,
};
--
2.1.4
- [Qemu-devel] [PULL 0/6] lm32/milkymist: some qomifying and a small doc fix, Michael Walle, 2016/06/20
- [Qemu-devel] [PULL 1/6] hw/timer: QOM'ify lm32_timer, Michael Walle, 2016/06/20
- [Qemu-devel] [PULL 2/6] hw/timer: QOM'ify milkymist_sysctl, Michael Walle, 2016/06/20
- [Qemu-devel] [PULL 4/6] hw/display: QOM'ify milkymist-vgafb.c, Michael Walle, 2016/06/20
- [Qemu-devel] [PULL 3/6] hw/display: QOM'ify milkymist-tmu2.c, Michael Walle, 2016/06/20
- [Qemu-devel] [PULL 5/6] hw/intc: QOM'ify lm32_pic.c,
Michael Walle <=
- [Qemu-devel] [PULL 6/6] milkymist: update specification URLs, Michael Walle, 2016/06/20
- Re: [Qemu-devel] [PULL 0/6] lm32/milkymist: some qomifying and a small doc fix, Peter Maydell, 2016/06/20