[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 4/6] hw/display: QOM'ify milkymist-vgafb.c
From: |
Michael Walle |
Subject: |
[Qemu-devel] [PULL 4/6] hw/display: QOM'ify milkymist-vgafb.c |
Date: |
Mon, 20 Jun 2016 18:39:07 +0200 |
From: xiaoqiang zhao <address@hidden>
* Drop the old SysBus init function and use instance_init
* Move graphic_console_init into realize stage
Signed-off-by: xiaoqiang zhao <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Acked-by: Michael Walle <address@hidden>
Tested-by: Michael Walle <address@hidden>
Signed-off-by: Michael Walle <address@hidden>
---
hw/display/milkymist-vgafb.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/hw/display/milkymist-vgafb.c b/hw/display/milkymist-vgafb.c
index 19ca256..39e16d6 100644
--- a/hw/display/milkymist-vgafb.c
+++ b/hw/display/milkymist-vgafb.c
@@ -292,17 +292,21 @@ static const GraphicHwOps vgafb_ops = {
.gfx_update = vgafb_update_display,
};
-static int milkymist_vgafb_init(SysBusDevice *dev)
+static void milkymist_vgafb_init(Object *obj)
{
- MilkymistVgafbState *s = MILKYMIST_VGAFB(dev);
+ MilkymistVgafbState *s = MILKYMIST_VGAFB(obj);
+ SysBusDevice *dev = SYS_BUS_DEVICE(obj);
memory_region_init_io(&s->regs_region, OBJECT(s), &vgafb_mmio_ops, s,
"milkymist-vgafb", R_MAX * 4);
sysbus_init_mmio(dev, &s->regs_region);
+}
- s->con = graphic_console_init(DEVICE(dev), 0, &vgafb_ops, s);
+static void milkymist_vgafb_realize(DeviceState *dev, Error **errp)
+{
+ MilkymistVgafbState *s = MILKYMIST_VGAFB(dev);
- return 0;
+ s->con = graphic_console_init(dev, 0, &vgafb_ops, s);
}
static int vgafb_post_load(void *opaque, int version_id)
@@ -331,18 +335,18 @@ static Property milkymist_vgafb_properties[] = {
static void milkymist_vgafb_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
- SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
- k->init = milkymist_vgafb_init;
dc->reset = milkymist_vgafb_reset;
dc->vmsd = &vmstate_milkymist_vgafb;
dc->props = milkymist_vgafb_properties;
+ dc->realize = milkymist_vgafb_realize;
}
static const TypeInfo milkymist_vgafb_info = {
.name = TYPE_MILKYMIST_VGAFB,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(MilkymistVgafbState),
+ .instance_init = milkymist_vgafb_init,
.class_init = milkymist_vgafb_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 <=
- [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, 2016/06/20
- [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