From: xiaoqiang.zhao <zxq_yx_007@163.com>
Date: Thu, 18 Feb 2016 14:16:20 +0000 (+0000)
Subject: hw/timer: QOM'ify arm_timer (pass 2)
X-Git-Tag: qemu-xen-4.8.0-rc1~459^2~5
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d712a5a2a473ca545e967d8fb07a9ed4080c98d0;p=qemu-xen.git

hw/timer: QOM'ify arm_timer (pass 2)

assign DeviceClass::vmsd instead of using vmstate_register function

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c
index 5bd2d752d6..f1ede5f53b 100644
--- a/hw/timer/arm_timer.c
+++ b/hw/timer/arm_timer.c
@@ -296,7 +296,6 @@ static void sp804_realize(DeviceState *dev, Error **errp)
     s->timer[1] = arm_timer_init(s->freq1);
     s->timer[0]->irq = qemu_allocate_irq(sp804_set_irq, s, 0);
     s->timer[1]->irq = qemu_allocate_irq(sp804_set_irq, s, 1);
-    vmstate_register(dev, -1, &vmstate_sp804, s);
 }
 
 /* Integrator/CP timer module.  */
@@ -390,6 +389,7 @@ static void sp804_class_init(ObjectClass *klass, void *data)
 
     k->realize = sp804_realize;
     k->props = sp804_properties;
+    k->vmsd = &vmstate_sp804;
 }
 
 static const TypeInfo sp804_info = {