From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60312) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWPfs-0005FX-CX for qemu-devel@nongnu.org; Thu, 18 Feb 2016 09:35:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aWPfr-0007wI-J5 for qemu-devel@nongnu.org; Thu, 18 Feb 2016 09:35:20 -0500 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:38427) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWPfr-0007rP-Au for qemu-devel@nongnu.org; Thu, 18 Feb 2016 09:35:19 -0500 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.84) (envelope-from ) id 1aWPfi-0001rF-Hh for qemu-devel@nongnu.org; Thu, 18 Feb 2016 14:35:10 +0000 From: Peter Maydell Date: Thu, 18 Feb 2016 14:35:03 +0000 Message-Id: <1455806108-6961-32-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1455806108-6961-1-git-send-email-peter.maydell@linaro.org> References: <1455806108-6961-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PULL 31/36] hw/timer: QOM'ify arm_timer (pass 2) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org From: "xiaoqiang.zhao" assign DeviceClass::vmsd instead of using vmstate_register function Reviewed-by: Peter Maydell Signed-off-by: xiaoqiang zhao Signed-off-by: Peter Maydell --- hw/timer/arm_timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c index 5bd2d75..f1ede5f 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 = { -- 1.9.1