From patchwork Thu Feb 25 10:30:32 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: 8422041 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 5DE43C0553 for ; Thu, 25 Feb 2016 10:32:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D65C3202E9 for ; Thu, 25 Feb 2016 10:32:55 +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 379EF20266 for ; Thu, 25 Feb 2016 10:32:51 +0000 (UTC) Received: from localhost ([::1]:41941 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYtE2-0006Bk-H8 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 25 Feb 2016 05:32:50 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43536) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYtDp-0006BJ-Nz for qemu-devel@nongnu.org; Thu, 25 Feb 2016 05:32:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aYtDk-0001Nt-LX for qemu-devel@nongnu.org; Thu, 25 Feb 2016 05:32:37 -0500 Received: from m12-14.163.com ([220.181.12.14]:53007) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYtDj-0001Mm-Ts; Thu, 25 Feb 2016 05:32:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=Y8KS/Vlpo+g0Cf+b9H +/P8ei6WJQwrol7mtt4X0ZWoM=; b=WX0pPoPe9dsF/EPKWl2koFeeLJyb5kfCqn 6I58tT9+IIR18OUqStOjuNmf3gcycxg/J7aOdIjqHfIWQK2Zp2tmZ6NY+/sHemMy dddQl81r99yBXDJ00EV+zYTGYtFZ1kuXYWLpEphQtWcfDxeWT9ZP8hYjOdUpWPRZ 4vbYVvSoQ= Received: from localhost.localdomain (unknown [101.254.142.162]) by smtp10 (Coremail) with SMTP id DsCowAB3JtoL2M5WrXOWCA--.37006S6; Thu, 25 Feb 2016 18:31:51 +0800 (CST) From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Thu, 25 Feb 2016 18:30:32 +0800 Message-Id: <1456396236-2759-5-git-send-email-zxq_yx_007@163.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1456396236-2759-1-git-send-email-zxq_yx_007@163.com> References: <1456396236-2759-1-git-send-email-zxq_yx_007@163.com> X-CM-TRANSID: DsCowAB3JtoL2M5WrXOWCA--.37006S6 X-Coremail-Antispam: 1Uf129KBjvJXoW7tw4rtr4xGF1rAFyrWry8Zrb_yoW8uFykpF Z8XF1kWrW8WFsFqw4fGryDXay5Ww1kJr42ya9rGw4xC3WUJrn5tr1qy347Jr4kGr9FvrW3 ZayIvr98Ww43Cr7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jOqXdUUUUU= X-Originating-IP: [101.254.142.162] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/xtbB0hgaxlUL9pVcogAAsV X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 220.181.12.14 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 v5 4/8] 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=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,UNPARSEABLE_RELAY autolearn=no 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 | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/hw/timer/m48t59.c b/hw/timer/m48t59.c index 3c683aa..f5897d8 100644 --- a/hw/timer/m48t59.c +++ b/hw/timer/m48t59.c @@ -637,6 +637,26 @@ static const VMStateDescription vmstate_m48t59 = { } }; +static const VMStateDescription vmstate_m48t59_isa = { + .name = "m48t59", + .version_id = 1, + .minimum_version_id = 1, + .fields = (VMStateField[]) { + VMSTATE_STRUCT(state, M48txxISAState, 0, vmstate_m48t59, M48t59State), + VMSTATE_END_OF_LIST() + } +}; + +static const VMStateDescription vmstate_m48t59_sys_bus = { + .name = "m48t59", + .version_id = 1, + .minimum_version_id = 1, + .fields = (VMStateField[]) { + VMSTATE_STRUCT(state, M48txxSysBusState, 0, vmstate_m48t59, M48t59State), + VMSTATE_END_OF_LIST() + } +}; + static void m48t59_reset_common(M48t59State *NVRAM) { NVRAM->addr = 0; @@ -742,8 +762,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 +840,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_isa; nc->read = m48txx_isa_read; nc->write = m48txx_isa_write; nc->toggle_lock = m48txx_isa_toggle_lock; @@ -866,6 +885,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_sys_bus; nc->read = m48txx_sysbus_read; nc->write = m48txx_sysbus_write; nc->toggle_lock = m48txx_sysbus_toggle_lock;