From patchwork Mon Feb 22 03:15:33 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: 8371221 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 BFC70C0553 for ; Mon, 22 Feb 2016 03:17:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 116E02035D for ; Mon, 22 Feb 2016 03:17:36 +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 4F30D20306 for ; Mon, 22 Feb 2016 03:17:34 +0000 (UTC) Received: from localhost ([::1]:46465 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aXh09-0000pI-H9 for patchwork-qemu-devel@patchwork.kernel.org; Sun, 21 Feb 2016 22:17:33 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41189) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aXgzu-0000mT-R1 for qemu-devel@nongnu.org; Sun, 21 Feb 2016 22:17:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aXgzr-0007VW-J4 for qemu-devel@nongnu.org; Sun, 21 Feb 2016 22:17:18 -0500 Received: from m12-16.163.com ([220.181.12.16]:54227) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aXgzp-0007Re-KT; 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=eRTRGllFQNVen4F5+b 836GfaEGcLTNG06MZ2YuO7kAI=; b=UDdNkYx2Q25ZaEXgl7z1EApUw1DEHC/E8v pRaQusk5xTUGpWEZ9+plCitjgeja3HL0mramfRqUnZPgCPFFpNc2jk79gPa6l+Kv cdBz/v1qJcviHN9viqIZULbCecVnn9HyWV0lLmGjqVhEn18iewqvr3v+QVIiVtcz nD+hli5fk= Received: from localhost.localdomain (unknown [118.187.28.42]) by smtp12 (Coremail) with SMTP id EMCowEB5zUeWfcpW0G6hAA--.38100S11; Mon, 22 Feb 2016 11:16:45 +0800 (CST) From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Mon, 22 Feb 2016 11:15:33 +0800 Message-Id: <1456110933-5457-10-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--.38100S11 X-Coremail-Antispam: 1Uf129KBjvJXoW7KF45JrWkGw4kGFW3ZrW7twb_yoW8tw47pF yxZ3ZrAw48tFZrJw4fJrnFgF15Cwn7Ka4rtrnxXrnavw1xCa9xGF1kAFs8JrZ0qayF9F13 JFW8JFy7CF45Zw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jkOzsUUUUU= X-Originating-IP: [118.187.28.42] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/1tbiEB4XxlWBTyTM-AAAsQ 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 9/9] hw/timer: QOM'ify tusb6010 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 Move majority of old SysBus init's work the into instance_init. Note: musb_init must be called in SysBus's init, otherwise it will break "make check" with error message as follows: qom/object.c:1576:object_get_canonical_path_component: assertion failed: (obj->parent != NULL) Signed-off-by: xiaoqiang zhao --- hw/timer/tusb6010.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/hw/timer/tusb6010.c b/hw/timer/tusb6010.c index 9f6af90..2d6bdd3 100644 --- a/hw/timer/tusb6010.c +++ b/hw/timer/tusb6010.c @@ -776,21 +776,29 @@ static void tusb6010_reset(DeviceState *dev) musb_reset(s->musb); } -static int tusb6010_init(SysBusDevice *sbd) +static void tusb6010_init(Object *obj) { - DeviceState *dev = DEVICE(sbd); - TUSBState *s = TUSB(dev); + DeviceState *dev = DEVICE(obj); + TUSBState *s = TUSB(obj); + SysBusDevice *sbd = SYS_BUS_DEVICE(obj); s->otg_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, tusb_otg_tick, s); s->pwr_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, tusb_power_tick, s); - memory_region_init_io(&s->iomem[1], OBJECT(s), &tusb_async_ops, s, + memory_region_init_io(&s->iomem[1], obj, &tusb_async_ops, s, "tusb-async", UINT32_MAX); sysbus_init_mmio(sbd, &s->iomem[0]); sysbus_init_mmio(sbd, &s->iomem[1]); sysbus_init_irq(sbd, &s->irq); qdev_init_gpio_in(dev, tusb6010_irq, musb_irq_max + 1); - s->musb = musb_init(dev, 1); - return 0; +} + +static int tusb6010_bus_init(SysBusDevice *sbd) +{ + TUSBState *s = TUSB(sbd); + DeviceState *dev = DEVICE(sbd); + + s->musb = musb_init(dev, 1); + return 0; } static void tusb6010_class_init(ObjectClass *klass, void *data) @@ -798,7 +806,7 @@ static void tusb6010_class_init(ObjectClass *klass, void *data) DeviceClass *dc = DEVICE_CLASS(klass); SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - k->init = tusb6010_init; + k->init = tusb6010_bus_init; dc->reset = tusb6010_reset; } @@ -806,6 +814,7 @@ static const TypeInfo tusb6010_info = { .name = TYPE_TUSB6010, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(TUSBState), + .instance_init = tusb6010_init, .class_init = tusb6010_class_init, };