[Qemu-devel] [PATCH 0/5] QOM'ify hw/display devices

[Qemu-devel] [PATCH 0/5] QOM'ify hw/display devices

[xiaoqiang zhao]

This patch set trys to QOM'ify hw/display files, see commit messages
for more details

xiaoqiang zhao (5):
  hw/display: QOM'ify exynos4210_fimd.c
  hw/display: QOM'ify jazz_led.c
  hw/display: QOM'ify milkymist-tmu2.c
  hw/display: QOM'ify milkymist-vgafb.c
  hw/display: QOM'ify pl110.c

 hw/display/exynos4210_fimd.c | 19 ++++++++++++-------
 hw/display/jazz_led.c        | 18 +++++++++++-------
 hw/display/milkymist-tmu2.c  | 24 ++++++++++++++----------
 hw/display/milkymist-vgafb.c | 16 ++++++++++------
 hw/display/pl110.c           | 19 +++++++++----------
 5 files changed, 56 insertions(+), 40 deletions(-)

-- 
2.1.4

[Qemu-devel] [PATCH 1/5] hw/display: QOM'ify exynos4210_fimd.c

[xiaoqiang zhao]

* Drop the old SysBus init function and use instance_init
* Move graphic_console_init into realize stage

Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com>
---
 hw/display/exynos4210_fimd.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/hw/display/exynos4210_fimd.c b/hw/display/exynos4210_fimd.c
index 728eb21..e5be713 100644
--- a/hw/display/exynos4210_fimd.c
+++ b/hw/display/exynos4210_fimd.c
@@ -1909,9 +1909,10 @@ static const GraphicHwOps exynos4210_fimd_ops = {
     .gfx_update  = exynos4210_fimd_update,
 };
 
-static int exynos4210_fimd_init(SysBusDevice *dev)
+static void exynos4210_fimd_init(Object *obj)
 {
-    Exynos4210fimdState *s = EXYNOS4210_FIMD(dev);
+    Exynos4210fimdState *s = EXYNOS4210_FIMD(obj);
+    SysBusDevice *dev = SYS_BUS_DEVICE(obj);
 
     s->ifb = NULL;
 
@@ -1919,28 +1920,32 @@ static int exynos4210_fimd_init(SysBusDevice *dev)
     sysbus_init_irq(dev, &s->irq[1]);
     sysbus_init_irq(dev, &s->irq[2]);
 
-    memory_region_init_io(&s->iomem, OBJECT(s), &exynos4210_fimd_mmio_ops, s,
+    memory_region_init_io(&s->iomem, obj, &exynos4210_fimd_mmio_ops, s,
             "exynos4210.fimd", FIMD_REGS_SIZE);
     sysbus_init_mmio(dev, &s->iomem);
-    s->console = graphic_console_init(DEVICE(dev), 0, &exynos4210_fimd_ops, s);
+}
 
-    return 0;
+static void exynos4210_fimd_realize(DeviceState *dev, Error **errp)
+{
+    Exynos4210fimdState *s = EXYNOS4210_FIMD(dev);
+
+    s->console = graphic_console_init(dev, 0, &exynos4210_fimd_ops, s);
 }
 
 static void exynos4210_fimd_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
-    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
 
     dc->vmsd = &exynos4210_fimd_vmstate;
     dc->reset = exynos4210_fimd_reset;
-    k->init = exynos4210_fimd_init;
+    dc->realize = exynos4210_fimd_realize;
 }
 
 static const TypeInfo exynos4210_fimd_info = {
     .name = TYPE_EXYNOS4210_FIMD,
     .parent = TYPE_SYS_BUS_DEVICE,
     .instance_size = sizeof(Exynos4210fimdState),
+    .instance_init = exynos4210_fimd_init,
     .class_init = exynos4210_fimd_class_init,
 };
 
-- 
2.1.4

[Qemu-devel] [PATCH 2/5] hw/display: QOM'ify jazz_led.c

[xiaoqiang zhao]

* Drop the old SysBus init function and use instance_init
* Move graphic_console_init into realize stage

Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com>
---
 hw/display/jazz_led.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/hw/display/jazz_led.c b/hw/display/jazz_led.c
index 09dcdb4..b72fdb1 100644
--- a/hw/display/jazz_led.c
+++ b/hw/display/jazz_led.c
@@ -267,16 +267,20 @@ static const GraphicHwOps jazz_led_ops = {
     .text_update = jazz_led_text_update,
 };
 
-static int jazz_led_init(SysBusDevice *dev)
+static void jazz_led_init(Object *obj)
 {
-    LedState *s = JAZZ_LED(dev);
+    LedState *s = JAZZ_LED(obj);
+    SysBusDevice *dev = SYS_BUS_DEVICE(obj);
 
-    memory_region_init_io(&s->iomem, OBJECT(s), &led_ops, s, "led", 1);
+    memory_region_init_io(&s->iomem, obj, &led_ops, s, "led", 1);
     sysbus_init_mmio(dev, &s->iomem);
+}
 
-    s->con = graphic_console_init(DEVICE(dev), 0, &jazz_led_ops, s);
+static void jazz_led_realize(DeviceState *dev, Error **errp)
+{
+    LedState *s = JAZZ_LED(dev);
 
-    return 0;
+    s->con = graphic_console_init(dev, 0, &jazz_led_ops, s);
 }
 
 static void jazz_led_reset(DeviceState *d)
@@ -291,18 +295,18 @@ static void jazz_led_reset(DeviceState *d)
 static void jazz_led_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
-    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
 
-    k->init = jazz_led_init;
     dc->desc = "Jazz LED display",
     dc->vmsd = &vmstate_jazz_led;
     dc->reset = jazz_led_reset;
+    dc->realize = jazz_led_realize;
 }
 
 static const TypeInfo jazz_led_info = {
     .name          = TYPE_JAZZ_LED,
     .parent        = TYPE_SYS_BUS_DEVICE,
     .instance_size = sizeof(LedState),
+    .instance_init = jazz_led_init,
     .class_init    = jazz_led_class_init,
 };
 
-- 
2.1.4

[Qemu-devel] [PATCH 3/6] hw/display/jazz_led.c

[xiaoqiang zhao]

---
 hw/display/jazz_led.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/hw/display/jazz_led.c b/hw/display/jazz_led.c
index 09dcdb4..e0a079a 100644
--- a/hw/display/jazz_led.c
+++ b/hw/display/jazz_led.c
@@ -267,16 +267,15 @@ static const GraphicHwOps jazz_led_ops = {
     .text_update = jazz_led_text_update,
 };
 
-static int jazz_led_init(SysBusDevice *dev)
+static void jazz_led_init(Object *obj)
 {
-    LedState *s = JAZZ_LED(dev);
+    LedState *s = JAZZ_LED(obj);
+    SysBusDevice *dev = SYS_BUS_DEVICE(obj);
 
-    memory_region_init_io(&s->iomem, OBJECT(s), &led_ops, s, "led", 1);
+    memory_region_init_io(&s->iomem, obj, &led_ops, s, "led", 1);
     sysbus_init_mmio(dev, &s->iomem);
 
     s->con = graphic_console_init(DEVICE(dev), 0, &jazz_led_ops, s);
-
-    return 0;
 }
 
 static void jazz_led_reset(DeviceState *d)
@@ -291,9 +290,7 @@ static void jazz_led_reset(DeviceState *d)
 static void jazz_led_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
-    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
 
-    k->init = jazz_led_init;
     dc->desc = "Jazz LED display",
     dc->vmsd = &vmstate_jazz_led;
     dc->reset = jazz_led_reset;
@@ -303,6 +300,7 @@ static const TypeInfo jazz_led_info = {
     .name          = TYPE_JAZZ_LED,
     .parent        = TYPE_SYS_BUS_DEVICE,
     .instance_size = sizeof(LedState),
+    .instance_init = jazz_led_init,
     .class_init    = jazz_led_class_init,
 };
 
-- 
2.1.4

[Qemu-devel] [PATCH 4/5] hw/display: QOM'ify milkymist-vgafb.c

[xiaoqiang zhao]

* Drop the old SysBus init function and use instance_init
* Move graphic_console_init into realize stage

Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com>
---
 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] [PATCH 5/6] hw/display/milkymist-vgafb.c

[xiaoqiang zhao]

---
 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 5/5] hw/display: QOM'ify pl110.c

[xiaoqiang zhao]

* Drop the old SysBus init function and use instance_init
* Move graphic_console_init into realize stage

Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com>
---
 hw/display/pl110.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/hw/display/pl110.c b/hw/display/pl110.c
index d589959..61418da 100644
--- a/hw/display/pl110.c
+++ b/hw/display/pl110.c
@@ -465,24 +465,24 @@ static const GraphicHwOps pl110_gfx_ops = {
     .gfx_update  = pl110_update_display,
 };
 
-static int pl110_initfn(SysBusDevice *sbd)
+static void pl110_init(Object *obj)
 {
-    DeviceState *dev = DEVICE(sbd);
-    PL110State *s = PL110(dev);
+    DeviceState *dev = DEVICE(obj);
+    PL110State *s = PL110(obj);
+    SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
 
-    memory_region_init_io(&s->iomem, OBJECT(s), &pl110_ops, s, "pl110", 0x1000);
+    memory_region_init_io(&s->iomem, obj, &pl110_ops, s, "pl110", 0x1000);
     sysbus_init_mmio(sbd, &s->iomem);
     sysbus_init_irq(sbd, &s->irq);
     qdev_init_gpio_in(dev, pl110_mux_ctrl_set, 1);
-    s->con = graphic_console_init(dev, 0, &pl110_gfx_ops, s);
-    return 0;
 }
 
-static void pl110_init(Object *obj)
+static void pl110_realize(DeviceState *dev, Error **errp)
 {
-    PL110State *s = PL110(obj);
+    PL110State *s = PL110(dev);
 
     s->version = PL110;
+    s->con = graphic_console_init(dev, 0, &pl110_gfx_ops, s);
 }
 
 static void pl110_versatile_init(Object *obj)
@@ -502,11 +502,10 @@ static void pl111_init(Object *obj)
 static void pl110_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
-    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
 
-    k->init = pl110_initfn;
     set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);
     dc->vmsd = &vmstate_pl110;
+    dc->realize = pl110_realize;
 }
 
 static const TypeInfo pl110_info = {
-- 
2.1.4

[Qemu-devel] [PATCH 6/6] QOM hw/display/pl110.c

[xiaoqiang zhao]

---
 hw/display/pl110.c | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/hw/display/pl110.c b/hw/display/pl110.c
index d589959..342e7ed 100644
--- a/hw/display/pl110.c
+++ b/hw/display/pl110.c
@@ -465,23 +465,17 @@ static const GraphicHwOps pl110_gfx_ops = {
     .gfx_update  = pl110_update_display,
 };
 
-static int pl110_initfn(SysBusDevice *sbd)
+static void pl110_init(Object *obj)
 {
-    DeviceState *dev = DEVICE(sbd);
-    PL110State *s = PL110(dev);
+    DeviceState *dev = DEVICE(obj);
+    PL110State *s = PL110(obj);
+    SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
 
-    memory_region_init_io(&s->iomem, OBJECT(s), &pl110_ops, s, "pl110", 0x1000);
+    memory_region_init_io(&s->iomem, obj, &pl110_ops, s, "pl110", 0x1000);
     sysbus_init_mmio(sbd, &s->iomem);
     sysbus_init_irq(sbd, &s->irq);
     qdev_init_gpio_in(dev, pl110_mux_ctrl_set, 1);
     s->con = graphic_console_init(dev, 0, &pl110_gfx_ops, s);
-    return 0;
-}
-
-static void pl110_init(Object *obj)
-{
-    PL110State *s = PL110(obj);
-
     s->version = PL110;
 }
 
@@ -502,9 +496,7 @@ static void pl111_init(Object *obj)
 static void pl110_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
-    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
 
-    k->init = pl110_initfn;
     set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);
     dc->vmsd = &vmstate_pl110;
 }
-- 
2.1.4

Re: [Qemu-devel] [PATCH 0/5] QOM'ify hw/display devices

[Peter Maydell]

On 24 March 2016 at 10:29, xiaoqiang zhao <zxq_yx_007@163.com> wrote:
> This patch set trys to QOM'ify hw/display files, see commit messages
> for more details
>
> xiaoqiang zhao (5):
>   hw/display: QOM'ify exynos4210_fimd.c
>   hw/display: QOM'ify jazz_led.c
>   hw/display: QOM'ify milkymist-tmu2.c
>   hw/display: QOM'ify milkymist-vgafb.c
>   hw/display: QOM'ify pl110.c

Hi; I was going to review this series (apologies for taking so
long!), but looking at my email archive and the patchwork server
the patches in it seem a bit confused. I see seven patches, not five,
with rather odd patch number indications:
 1/5
 2/5
 3/6
 4/5
 5/6
 5/5
 6/6

(and 5/5 and 6/6 seem to be the same). Could you resend the
series with the correct patches in it, please?

thanks
-- PMM

Re: [Qemu-devel] [PATCH 0/5] QOM'ify hw/display devices

[michael]

Am 2016-05-04 16:26, schrieb Peter Maydell:
> On 24 March 2016 at 10:29, xiaoqiang zhao <zxq_yx_007@163.com> wrote:
>> This patch set trys to QOM'ify hw/display files, see commit messages
>> for more details
>> 
>> xiaoqiang zhao (5):
>>   hw/display: QOM'ify exynos4210_fimd.c
>>   hw/display: QOM'ify jazz_led.c
>>   hw/display: QOM'ify milkymist-tmu2.c
>>   hw/display: QOM'ify milkymist-vgafb.c
>>   hw/display: QOM'ify pl110.c
> 
> Hi; I was going to review this series (apologies for taking so
> long!)
> but looking at my email archive and the patchwork server
> the patches in it seem a bit confused. I see seven patches, not five,
> with rather odd patch number indications:
>  1/5
>  2/5
>  3/6
>  4/5
>  5/6
>  5/5
>  6/6
> 
> (and 5/5 and 6/6 seem to be the same). Could you resend the
> series with the correct patches in it, please?


Oh my. I wanted to test the milkymist stuff last week, but didn't find 
time to complete it. I'll try it this week(end).

If 5/5 and 6/6 is the milkymist-vgafb.c, then I noticed the duplication, 
too.

-michael

Re: [Qemu-devel] [PATCH 0/5] QOM'ify hw/display devices

[xiaoqiang zhao]

在 2016年05月04日 22:26, Peter Maydell 写道:
> On 24 March 2016 at 10:29, xiaoqiang zhao <zxq_yx_007@163.com> wrote:
>> This patch set trys to QOM'ify hw/display files, see commit messages
>> for more details
>>
>> xiaoqiang zhao (5):
>>    hw/display: QOM'ify exynos4210_fimd.c
>>    hw/display: QOM'ify jazz_led.c
>>    hw/display: QOM'ify milkymist-tmu2.c
>>    hw/display: QOM'ify milkymist-vgafb.c
>>    hw/display: QOM'ify pl110.c
> Hi; I was going to review this series (apologies for taking so
> long!), but looking at my email archive and the patchwork server
> the patches in it seem a bit confused. I see seven patches, not five,
> with rather odd patch number indications:
>   1/5
>   2/5
>   3/6
>   4/5
>   5/6
>   5/5
>   6/6
>
> (and 5/5 and 6/6 seem to be the same). Could you resend the
> series with the correct patches in it, please?
>
> thanks
> -- PMM
Yes, there is a mistake, i will resend soon.

Re: [Qemu-devel] [PATCH 0/5] QOM'ify hw/display devices

[xiaoqiang zhao]

在 2016年05月04日 22:26, Peter Maydell 写道:
> On 24 March 2016 at 10:29, xiaoqiang zhao <zxq_yx_007@163.com> wrote:
>> This patch set trys to QOM'ify hw/display files, see commit messages
>> for more details
>>
>> xiaoqiang zhao (5):
>>    hw/display: QOM'ify exynos4210_fimd.c
>>    hw/display: QOM'ify jazz_led.c
>>    hw/display: QOM'ify milkymist-tmu2.c
>>    hw/display: QOM'ify milkymist-vgafb.c
>>    hw/display: QOM'ify pl110.c
> Hi; I was going to review this series (apologies for taking so
> long!), but looking at my email archive and the patchwork server
> the patches in it seem a bit confused. I see seven patches, not five,
> with rather odd patch number indications:
>   1/5
>   2/5
>   3/6
>   4/5
>   5/6
>   5/5
>   6/6
>
> (and 5/5 and 6/6 seem to be the same). Could you resend the
> series with the correct patches in it, please?
>
> thanks
> -- PMM
I have resend patches, buf forget to cc to you, so I send you a separate 
copy.