From patchwork Mon Feb 22 09:11:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: zhao xiao qiang X-Patchwork-Id: 8373471 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0EE58C0553 for ; Mon, 22 Feb 2016 09:14:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6CBBB203A1 for ; Mon, 22 Feb 2016 09:14:19 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B3B7B2039E for ; Mon, 22 Feb 2016 09:14:18 +0000 (UTC) Received: from localhost ([::1]:47906 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aXmZO-0007Lj-3b for patchwork-qemu-devel@patchwork.kernel.org; Mon, 22 Feb 2016 04:14:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49265) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aXmZB-0007Hy-Ib for qemu-devel@nongnu.org; Mon, 22 Feb 2016 04:14:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aXmZ8-0005Rs-DN for qemu-devel@nongnu.org; Mon, 22 Feb 2016 04:14:05 -0500 Received: from m12-11.163.com ([220.181.12.11]:36601) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aXmZ7-0005RZ-If; Mon, 22 Feb 2016 04:14:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=qa+T9PcvPWR9Yw3Cj1 r1r3wWv2HNUaeoHoG5tL+uJfA=; b=M1lIT9XhQ+qjnvtA5GbjBeFrCDAKZSCfEV 1I6/IsutmWt/ViUFcCvwinimm46nvJQPC5cLIuTSC8m17qVOUoEX2GqQi4l2/oq8 QhYxhn/zsStMxITWxvmV5EPdBYeIo6fqzKrydch2DznHoRQ3GJdMWhWU/Jdouwx9 mMiLbkuWE= Received: from localhost.localdomain (unknown [118.187.28.42]) by smtp7 (Coremail) with SMTP id C8CowADnJh8X0cpW9b++Bw--.36068S2; Mon, 22 Feb 2016 17:13:16 +0800 (CST) From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Mon, 22 Feb 2016 17:11:50 +0800 Message-Id: <1456132310-4826-1-git-send-email-zxq_yx_007@163.com> X-Mailer: git-send-email 2.1.4 X-CM-TRANSID: C8CowADnJh8X0cpW9b++Bw--.36068S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7tw4rtr1DAF4UJF1rZF4UCFg_yoW8GF4UpF Z3WF4kurZrXF4qqwsxGFyqq398X3WDJr47AanrGw4xC3WUJrn5XFn0v34avr4DGFZIvrWr ZayIywn8Ww4fCr7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jo_M-UUUUU= X-Originating-IP: [118.187.28.42] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/1tbiOw0XxlXlR8FzqwAAsJ X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 220.181.12.11 Cc: peter.maydell@linaro.org, i.mitsyanko@gmail.com, mark.cave-ayland@ilande.co.uk, michael@walle.cc, qemu-arm@nongnu.org, edgar.iglesias@gmail.com, gxt@mprc.pku.edu.cn, afaerber@suse.de Subject: [Qemu-devel] [PATCH v4 5/9] hw/timer: QOM'ify m48txx_sysbus (pass 2) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP assign DeviceClass::vmsd instead of using vmstate_register function Signed-off-by: xiaoqiang zhao --- hw/timer/m48t59.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/timer/m48t59.c b/hw/timer/m48t59.c index 3c683aa..b0cf79d 100644 --- a/hw/timer/m48t59.c +++ b/hw/timer/m48t59.c @@ -742,8 +742,6 @@ static void m48t59_realize_common(M48t59State *s, Error **errp) s->wd_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, &watchdog_cb, s); } qemu_get_timedate(&s->alarm, 0); - - vmstate_register(NULL, -1, &vmstate_m48t59, s); } static void m48t59_isa_realize(DeviceState *dev, Error **errp) @@ -822,6 +820,7 @@ static void m48txx_isa_class_init(ObjectClass *klass, void *data) dc->realize = m48t59_isa_realize; dc->reset = m48t59_reset_isa; dc->props = m48t59_isa_properties; + dc->vmsd = &vmstate_m48t59; nc->read = m48txx_isa_read; nc->write = m48txx_isa_write; nc->toggle_lock = m48txx_isa_toggle_lock; @@ -866,6 +865,7 @@ static void m48txx_sysbus_class_init(ObjectClass *klass, void *data) dc->realize = m48t59_realize; dc->reset = m48t59_reset_sysbus; dc->props = m48t59_sysbus_properties; + dc->vmsd = &vmstate_m48t59; nc->read = m48txx_sysbus_read; nc->write = m48txx_sysbus_write; nc->toggle_lock = m48txx_sysbus_toggle_lock;