[Qemu-devel] [PATCH v1 1/1] timer: candence_ttc: Convert to realize()

[Qemu-devel] [PATCH v1 1/1] timer: candence_ttc: Convert to realize()

[Alistair Francis]

SysBusDevice::init is deprecated. Convert to Object::init
as prescribed by QOM conventions.

Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
---

 hw/timer/cadence_ttc.c |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/hw/timer/cadence_ttc.c b/hw/timer/cadence_ttc.c
index 52bbbbc..d46db3c 100644
--- a/hw/timer/cadence_ttc.c
+++ b/hw/timer/cadence_ttc.c
@@ -406,21 +406,19 @@ static void cadence_timer_init(uint32_t freq, CadenceTimerState *s)
     s->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, cadence_timer_tick, s);
 }
 
-static int cadence_ttc_init(SysBusDevice *dev)
+static void cadence_ttc_init(Object *obj)
 {
-    CadenceTTCState *s = CADENCE_TTC(dev);
+    CadenceTTCState *s = CADENCE_TTC(obj);
     int i;
 
     for (i = 0; i < 3; ++i) {
         cadence_timer_init(133000000, &s->timer[i]);
-        sysbus_init_irq(dev, &s->timer[i].irq);
+        sysbus_init_irq(SYS_BUS_DEVICE(obj), &s->timer[i].irq);
     }
 
-    memory_region_init_io(&s->iomem, OBJECT(s), &cadence_ttc_ops, s,
+    memory_region_init_io(&s->iomem, obj, &cadence_ttc_ops, s,
                           "timer", 0x1000);
-    sysbus_init_mmio(dev, &s->iomem);
-
-    return 0;
+    sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->iomem);
 }
 
 static void cadence_timer_pre_save(void *opaque)
@@ -474,9 +472,7 @@ static const VMStateDescription vmstate_cadence_ttc = {
 static void cadence_ttc_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
-    SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass);
 
-    sdc->init = cadence_ttc_init;
     dc->vmsd = &vmstate_cadence_ttc;
 }
 
@@ -484,6 +480,7 @@ static const TypeInfo cadence_ttc_info = {
     .name  = TYPE_CADENCE_TTC,
     .parent = TYPE_SYS_BUS_DEVICE,
     .instance_size  = sizeof(CadenceTTCState),
+    .instance_init = cadence_ttc_init,
     .class_init = cadence_ttc_class_init,
 };
 
-- 
1.7.1

Re: [Qemu-devel] [PATCH v1 1/1] timer: candence_ttc: Convert to realize()

[Alistair Francis]

CC Andreas

On Tue, Jun 24, 2014 at 2:24 PM, Alistair Francis
<alistair.francis@xilinx.com> wrote:
> SysBusDevice::init is deprecated. Convert to Object::init
> as prescribed by QOM conventions.
>
> Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
> ---
>
>  hw/timer/cadence_ttc.c |   15 ++++++---------
>  1 files changed, 6 insertions(+), 9 deletions(-)
>
> diff --git a/hw/timer/cadence_ttc.c b/hw/timer/cadence_ttc.c
> index 52bbbbc..d46db3c 100644
> --- a/hw/timer/cadence_ttc.c
> +++ b/hw/timer/cadence_ttc.c
> @@ -406,21 +406,19 @@ static void cadence_timer_init(uint32_t freq, CadenceTimerState *s)
>      s->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, cadence_timer_tick, s);
>  }
>
> -static int cadence_ttc_init(SysBusDevice *dev)
> +static void cadence_ttc_init(Object *obj)
>  {
> -    CadenceTTCState *s = CADENCE_TTC(dev);
> +    CadenceTTCState *s = CADENCE_TTC(obj);
>      int i;
>
>      for (i = 0; i < 3; ++i) {
>          cadence_timer_init(133000000, &s->timer[i]);
> -        sysbus_init_irq(dev, &s->timer[i].irq);
> +        sysbus_init_irq(SYS_BUS_DEVICE(obj), &s->timer[i].irq);
>      }
>
> -    memory_region_init_io(&s->iomem, OBJECT(s), &cadence_ttc_ops, s,
> +    memory_region_init_io(&s->iomem, obj, &cadence_ttc_ops, s,
>                            "timer", 0x1000);
> -    sysbus_init_mmio(dev, &s->iomem);
> -
> -    return 0;
> +    sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->iomem);
>  }
>
>  static void cadence_timer_pre_save(void *opaque)
> @@ -474,9 +472,7 @@ static const VMStateDescription vmstate_cadence_ttc = {
>  static void cadence_ttc_class_init(ObjectClass *klass, void *data)
>  {
>      DeviceClass *dc = DEVICE_CLASS(klass);
> -    SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass);
>
> -    sdc->init = cadence_ttc_init;
>      dc->vmsd = &vmstate_cadence_ttc;
>  }
>
> @@ -484,6 +480,7 @@ static const TypeInfo cadence_ttc_info = {
>      .name  = TYPE_CADENCE_TTC,
>      .parent = TYPE_SYS_BUS_DEVICE,
>      .instance_size  = sizeof(CadenceTTCState),
> +    .instance_init = cadence_ttc_init,
>      .class_init = cadence_ttc_class_init,
>  };
>
> --
> 1.7.1
>

Re: [Qemu-devel] [PATCH v1 1/1] timer: candence_ttc: Convert to realize()

[Peter Crosthwaite]

Subject should read:

"convert to Object::init()"

On Tue, Jun 24, 2014 at 2:24 PM, Alistair Francis
<alistair.francis@xilinx.com> wrote:
> SysBusDevice::init is deprecated. Convert to Object::init
> as prescribed by QOM conventions.
>
> Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>

Otherwise:

Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>

Peter has been taking misc Zynq devs patches via the ARM queue, so
perhaps this can go via target-arm?

Regards,
Peter

> ---
>
>  hw/timer/cadence_ttc.c |   15 ++++++---------
>  1 files changed, 6 insertions(+), 9 deletions(-)
>
> diff --git a/hw/timer/cadence_ttc.c b/hw/timer/cadence_ttc.c
> index 52bbbbc..d46db3c 100644
> --- a/hw/timer/cadence_ttc.c
> +++ b/hw/timer/cadence_ttc.c
> @@ -406,21 +406,19 @@ static void cadence_timer_init(uint32_t freq, CadenceTimerState *s)
>      s->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, cadence_timer_tick, s);
>  }
>
> -static int cadence_ttc_init(SysBusDevice *dev)
> +static void cadence_ttc_init(Object *obj)
>  {
> -    CadenceTTCState *s = CADENCE_TTC(dev);
> +    CadenceTTCState *s = CADENCE_TTC(obj);
>      int i;
>
>      for (i = 0; i < 3; ++i) {
>          cadence_timer_init(133000000, &s->timer[i]);
> -        sysbus_init_irq(dev, &s->timer[i].irq);
> +        sysbus_init_irq(SYS_BUS_DEVICE(obj), &s->timer[i].irq);
>      }
>
> -    memory_region_init_io(&s->iomem, OBJECT(s), &cadence_ttc_ops, s,
> +    memory_region_init_io(&s->iomem, obj, &cadence_ttc_ops, s,
>                            "timer", 0x1000);
> -    sysbus_init_mmio(dev, &s->iomem);
> -
> -    return 0;
> +    sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->iomem);
>  }
>
>  static void cadence_timer_pre_save(void *opaque)
> @@ -474,9 +472,7 @@ static const VMStateDescription vmstate_cadence_ttc = {
>  static void cadence_ttc_class_init(ObjectClass *klass, void *data)
>  {
>      DeviceClass *dc = DEVICE_CLASS(klass);
> -    SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass);
>
> -    sdc->init = cadence_ttc_init;
>      dc->vmsd = &vmstate_cadence_ttc;
>  }
>
> @@ -484,6 +480,7 @@ static const TypeInfo cadence_ttc_info = {
>      .name  = TYPE_CADENCE_TTC,
>      .parent = TYPE_SYS_BUS_DEVICE,
>      .instance_size  = sizeof(CadenceTTCState),
> +    .instance_init = cadence_ttc_init,
>      .class_init = cadence_ttc_class_init,
>  };
>
> --
> 1.7.1
>
>

Re: [Qemu-devel] [PATCH v1 1/1] timer: candence_ttc: Convert to realize()

[Peter Maydell]

On 24 June 2014 05:41, Peter Crosthwaite <peter.crosthwaite@xilinx.com> wrote:
> Subject should read:
>
> "convert to Object::init()"
>
> On Tue, Jun 24, 2014 at 2:24 PM, Alistair Francis
> <alistair.francis@xilinx.com> wrote:
>> SysBusDevice::init is deprecated. Convert to Object::init
>> as prescribed by QOM conventions.
>>
>> Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
>
> Otherwise:
>
> Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
>
> Peter has been taking misc Zynq devs patches via the ARM queue, so
> perhaps this can go via target-arm?

Applied to target-arm.next (fixing up the subject as you suggest
and also the typo "candence"...)

thanks
-- PMM

Re: [Qemu-devel] [PATCH v1 1/1] timer: candence_ttc: Convert to realize()

[Alistair Francis]

On Thu, Jun 26, 2014 at 11:29 PM, Peter Maydell
<peter.maydell@linaro.org> wrote:
> On 24 June 2014 05:41, Peter Crosthwaite <peter.crosthwaite@xilinx.com> wrote:
>> Subject should read:
>>
>> "convert to Object::init()"
>>
>> On Tue, Jun 24, 2014 at 2:24 PM, Alistair Francis
>> <alistair.francis@xilinx.com> wrote:
>>> SysBusDevice::init is deprecated. Convert to Object::init
>>> as prescribed by QOM conventions.
>>>
>>> Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
>>
>> Otherwise:
>>
>> Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
>>
>> Peter has been taking misc Zynq devs patches via the ARM queue, so
>> perhaps this can go via target-arm?
>
> Applied to target-arm.next (fixing up the subject as you suggest
> and also the typo "candence"...)

Thanks for that, I completely missed that typo

>
> thanks
> -- PMM
>