diff mbox

[v3,12/16] hw/timer: QOM'ify pl031

Message ID 1455621027-13927-3-git-send-email-zxq_yx_007@163.com
State New
Headers show

Commit Message

zhao xiao qiang Feb. 16, 2016, 11:10 a.m. UTC
assign pl031_init to pl031_info.instance_init and drop the
SysBusDeviceClass::init

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com>
---
 hw/timer/pl031.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

Comments

Peter Maydell Feb. 18, 2016, 1:02 p.m. UTC | #1
On 16 February 2016 at 11:10, xiaoqiang zhao <zxq_yx_007@163.com> wrote:
> assign pl031_init to pl031_info.instance_init and drop the
> SysBusDeviceClass::init
>
> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
> Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com>

I didn't review this patch! Please be more careful
about only applying reviewed-by: tags to the correct
patches when you're sending out new versions. (You seem
to have got this wrong for some of the others in this
series too.)

thanks
-- PMM
zhao xiao qiang Feb. 18, 2016, 2:26 p.m. UTC | #2
Thanks Peter!
Sorry for that!I will correct this in next version. I also have one question:Why the patch I have sent to this list does not have a title begin with "[Qemu-devel]" ?



2016年2月18日 星期四 +0800 21:02 发件人 peter.maydell@linaro.org  <peter.maydell@linaro.org>:
>On 16 February 2016 at 11:10, xiaoqiang zhao < zxq_yx_007@163.com > wrote:
>> assign pl031_init to pl031_info.instance_init and drop the
>> SysBusDeviceClass::init
>>
>> Reviewed-by: Peter Maydell < peter.maydell@linaro.org >
>> Signed-off-by: xiaoqiang zhao < zxq_yx_007@163.com >
>
>I didn't review this patch! Please be more careful
>about only applying reviewed-by: tags to the correct
>patches when you're sending out new versions. (You seem
>to have got this wrong for some of the others in this
>series too.)
>
>thanks
>-- PMM
Peter Maydell Feb. 18, 2016, 2:31 p.m. UTC | #3
On 18 February 2016 at 14:26,  <zxq_yx_007@163.com> wrote:
> Thanks Peter!
> Sorry for that!I will correct this in next version. I also have one
> question:Why the patch I have sent to this list does not have a title begin
> with "[Qemu-devel]" ?

It depends entirely which copy you see. For example the list
archive's copy does:
https://lists.nongnu.org/archive/html/qemu-devel/2016-02/msg03400.html

If your mail client sees the copy that went via the mailing list
server first, that's the subject you'll see. If it sees some other
copy first (perhaps you were personally cc'd on the mail, or if
you sent the mail yourself there's the copy you actually sent)
then it won't have the subject tag. If it was sent to several
mailing lists then you might first see the copy from one of the
other lists with that list's tag.

(PS: please don't top-post list email.)

thanks
-- PMM
zhao xiao qiang Feb. 18, 2016, 2:44 p.m. UTC | #4
What "top-post" mean?
在2016年02月18日 22:31,Peter Maydell 写道:
On 18 February 2016 at 14:26,  <zxq_yx_007@163.com> wrote:
> Thanks Peter!
> Sorry for that!I will correct this in next version. I also have one
> question:Why the patch I have sent to this list does not have a title begin
> with "[Qemu-devel]" ?

It depends entirely which copy you see. For example the list
archive's copy does:
https://lists.nongnu.org/archive/html/qemu-devel/2016-02/msg03400.html

If your mail client sees the copy that went via the mailing list
server first, that's the subject you'll see. If it sees some other
copy first (perhaps you were personally cc'd on the mail, or if
you sent the mail yourself there's the copy you actually sent)
then it won't have the subject tag. If it was sent to several
mailing lists then you might first see the copy from one of the
other lists with that list's tag.

(PS: please don't top-post list email.)

thanks
-- PMM
diff mbox

Patch

diff --git a/hw/timer/pl031.c b/hw/timer/pl031.c
index d99d18c..3ccb2cb 100644
--- a/hw/timer/pl031.c
+++ b/hw/timer/pl031.c
@@ -192,12 +192,13 @@  static const MemoryRegionOps pl031_ops = {
     .endianness = DEVICE_NATIVE_ENDIAN,
 };
 
-static int pl031_init(SysBusDevice *dev)
+static void pl031_init(Object *obj)
 {
-    PL031State *s = PL031(dev);
+    PL031State *s = PL031(obj);
+    SysBusDevice *dev = SYS_BUS_DEVICE(obj);
     struct tm tm;
 
-    memory_region_init_io(&s->iomem, OBJECT(s), &pl031_ops, s, "pl031", 0x1000);
+    memory_region_init_io(&s->iomem, obj, &pl031_ops, s, "pl031", 0x1000);
     sysbus_init_mmio(dev, &s->iomem);
 
     sysbus_init_irq(dev, &s->irq);
@@ -206,7 +207,6 @@  static int pl031_init(SysBusDevice *dev)
         qemu_clock_get_ns(rtc_clock) / get_ticks_per_sec();
 
     s->timer = timer_new_ns(rtc_clock, pl031_interrupt, s);
-    return 0;
 }
 
 static void pl031_pre_save(void *opaque)
@@ -249,9 +249,7 @@  static const VMStateDescription vmstate_pl031 = {
 static void pl031_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
-    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
 
-    k->init = pl031_init;
     dc->vmsd = &vmstate_pl031;
 }
 
@@ -259,6 +257,7 @@  static const TypeInfo pl031_info = {
     .name          = TYPE_PL031,
     .parent        = TYPE_SYS_BUS_DEVICE,
     .instance_size = sizeof(PL031State),
+    .instance_init = pl031_init,
     .class_init    = pl031_class_init,
 };