[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/6] hw/display/milkymist-vgafb.c
From: |
xiaoqiang zhao |
Subject: |
[Qemu-devel] [PATCH 5/6] hw/display/milkymist-vgafb.c |
Date: |
Thu, 24 Mar 2016 18:29:32 +0800 |
---
hw/display/milkymist-vgafb.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/hw/display/milkymist-vgafb.c b/hw/display/milkymist-vgafb.c
index 19ca256..cc1245e 100644
--- a/hw/display/milkymist-vgafb.c
+++ b/hw/display/milkymist-vgafb.c
@@ -292,17 +292,16 @@ 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);
-
- return 0;
}
static int vgafb_post_load(void *opaque, int version_id)
@@ -331,9 +330,7 @@ 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;
@@ -343,6 +340,7 @@ 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] [PATCH 0/5] QOM'ify hw/display devices, xiaoqiang zhao, 2016/03/24
- [Qemu-devel] [PATCH 3/6] hw/display/jazz_led.c, xiaoqiang zhao, 2016/03/24
- [Qemu-devel] [PATCH 4/5] hw/display: QOM'ify milkymist-vgafb.c, xiaoqiang zhao, 2016/03/24
- [Qemu-devel] [PATCH 2/5] hw/display: QOM'ify jazz_led.c, xiaoqiang zhao, 2016/03/24
- [Qemu-devel] [PATCH 6/6] QOM hw/display/pl110.c, xiaoqiang zhao, 2016/03/24
- [Qemu-devel] [PATCH 1/5] hw/display: QOM'ify exynos4210_fimd.c, xiaoqiang zhao, 2016/03/24
- [Qemu-devel] [PATCH 5/5] hw/display: QOM'ify pl110.c, xiaoqiang zhao, 2016/03/24
- [Qemu-devel] [PATCH 5/6] hw/display/milkymist-vgafb.c,
xiaoqiang zhao <=