From patchwork Mon Feb 22 03:15:30 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: 8371251 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D3F3C9F52D for ; Mon, 22 Feb 2016 03:17:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2E97120361 for ; Mon, 22 Feb 2016 03:17:41 +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 79FEE2035D for ; Mon, 22 Feb 2016 03:17:40 +0000 (UTC) Received: from localhost ([::1]:46470 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aXh0F-0000zq-Pq for patchwork-qemu-devel@patchwork.kernel.org; Sun, 21 Feb 2016 22:17:39 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41187) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aXgzu-0000mQ-Qf for qemu-devel@nongnu.org; Sun, 21 Feb 2016 22:17:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aXgzr-0007Vc-L5 for qemu-devel@nongnu.org; Sun, 21 Feb 2016 22:17:18 -0500 Received: from m12-16.163.com ([220.181.12.16]:54222) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aXgzo-0007Rf-E2; Sun, 21 Feb 2016 22:17:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=gdYLpz3nDJRx7DI7XU gbPW0InXSRI3FWNn8rUDRc2dg=; b=N+uZ/tppahF60q6wjEdsYJD12NAVhM8Et6 PtQOVp05+FEwZwO2HR7dc6OxvRacAMZPE1UZTbF2M02sVVP9iNHJJnvufqvQ0kRw NQ68auR4HYTHQqqo27S77Rv+hKEakbeNxnPuEqHlikmo9GkIIPLD4rt1FzyTcfrU xraWbu48c= Received: from localhost.localdomain (unknown [118.187.28.42]) by smtp12 (Coremail) with SMTP id EMCowEB5zUeWfcpW0G6hAA--.38100S8; Mon, 22 Feb 2016 11:16:45 +0800 (CST) From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Mon, 22 Feb 2016 11:15:30 +0800 Message-Id: <1456110933-5457-7-git-send-email-zxq_yx_007@163.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1456110933-5457-1-git-send-email-zxq_yx_007@163.com> References: <1456110933-5457-1-git-send-email-zxq_yx_007@163.com> X-CM-TRANSID: EMCowEB5zUeWfcpW0G6hAA--.38100S8 X-Coremail-Antispam: 1Uf129KBjvJXoWxWF1UAF1fuw4fuw48KF1Dtrb_yoW5Xr15pF WxZFnxtw4xGrsrXrWfJr1qqF1Ykws7t348Krn7tr4Syr17Jry5JF1kX3y8Jay7tFZ29FWf XaykXry5ta15taUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jkOzsUUUUU= X-Originating-IP: [118.187.28.42] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/1tbiTB0XxlSINffcugAAs4 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 220.181.12.16 Cc: peter.maydell@linaro.org, gxt@mprc.pku.edu.cn, i.mitsyanko@gmail.com, mark.cave-ayland@ilande.co.uk, michael@walle.cc, qemu-arm@nongnu.org, edgar.iglesias@gmail.com, m.kozlov@samsung.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH v4 6/9] hw/timer: QOM'ify milkymist_sysctl 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 * split the old SysBus init function into an instance_init and a Device realize function * use DeviceClass::realize instead of SysBusDeviceClass::init Reviewed-by: Peter Maydell Signed-off-by: xiaoqiang zhao Signed-off-by: Michael Walle Acked-by: Michael Walle Tested-by: Michael Walle --- hw/timer/milkymist-sysctl.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/hw/timer/milkymist-sysctl.c b/hw/timer/milkymist-sysctl.c index 5f29480..30a4bc4 100644 --- a/hw/timer/milkymist-sysctl.c +++ b/hw/timer/milkymist-sysctl.c @@ -270,9 +270,10 @@ static void milkymist_sysctl_reset(DeviceState *d) s->regs[R_GPIO_IN] = s->strappings; } -static int milkymist_sysctl_init(SysBusDevice *dev) +static void milkymist_sysctl_init(Object *obj) { - MilkymistSysctlState *s = MILKYMIST_SYSCTL(dev); + MilkymistSysctlState *s = MILKYMIST_SYSCTL(obj); + SysBusDevice *dev = SYS_BUS_DEVICE(obj); sysbus_init_irq(dev, &s->gpio_irq); sysbus_init_irq(dev, &s->timer0_irq); @@ -282,14 +283,18 @@ static int milkymist_sysctl_init(SysBusDevice *dev) s->bh1 = qemu_bh_new(timer1_hit, s); s->ptimer0 = ptimer_init(s->bh0); s->ptimer1 = ptimer_init(s->bh1); - ptimer_set_freq(s->ptimer0, s->freq_hz); - ptimer_set_freq(s->ptimer1, s->freq_hz); - memory_region_init_io(&s->regs_region, OBJECT(s), &sysctl_mmio_ops, s, + memory_region_init_io(&s->regs_region, obj, &sysctl_mmio_ops, s, "milkymist-sysctl", R_MAX * 4); sysbus_init_mmio(dev, &s->regs_region); +} - return 0; +static void milkymist_sysctl_realize(DeviceState *dev, Error **errp) +{ + MilkymistSysctlState *s = MILKYMIST_SYSCTL(dev); + + ptimer_set_freq(s->ptimer0, s->freq_hz); + ptimer_set_freq(s->ptimer1, s->freq_hz); } static const VMStateDescription vmstate_milkymist_sysctl = { @@ -319,9 +324,8 @@ static Property milkymist_sysctl_properties[] = { static void milkymist_sysctl_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - k->init = milkymist_sysctl_init; + dc->realize = milkymist_sysctl_realize; dc->reset = milkymist_sysctl_reset; dc->vmsd = &vmstate_milkymist_sysctl; dc->props = milkymist_sysctl_properties; @@ -331,6 +335,7 @@ static const TypeInfo milkymist_sysctl_info = { .name = TYPE_MILKYMIST_SYSCTL, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(MilkymistSysctlState), + .instance_init = milkymist_sysctl_init, .class_init = milkymist_sysctl_class_init, };