From patchwork Thu May 25 13:34:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: zhao xiao qiang X-Patchwork-Id: 9748399 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 55C9F60246 for ; Thu, 25 May 2017 13:39:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4552A223B2 for ; Thu, 25 May 2017 13:39:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3A3B92624B; Thu, 25 May 2017 13:39:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id E7650223B2 for ; Thu, 25 May 2017 13:39:21 +0000 (UTC) Received: from localhost ([::1]:60126 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDsz3-0007Pu-6K for patchwork-qemu-devel@patchwork.kernel.org; Thu, 25 May 2017 09:39:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34512) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDsvO-0004EU-MY for qemu-devel@nongnu.org; Thu, 25 May 2017 09:35:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dDsvJ-0005Q4-LY for qemu-devel@nongnu.org; Thu, 25 May 2017 09:35:34 -0400 Received: from m12-15.163.com ([220.181.12.15]:35519) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDsvI-0005Ox-0t for qemu-devel@nongnu.org; Thu, 25 May 2017 09:35:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=Yj8/R HfYdbgsQmBzsx/lr4MxegFgm42DvZS5Fm4tXIw=; b=OkMoz7zXLwHTLnZ0XjXou BmmVGh0vXDG5UgzSlpBXIQwhdCAF2NY+VHL8hCz2p0mtV4R8oAhYhD0XE0powEF3 WD0Qo6J4qMJ4VW0hkDLDfgxYlkB973or/INyeEPh+LbagR8viYowXxCiLBu1wqqW BwaHvhp5R4MSrJUDYPoOF4= Received: from localhost.localdomain (unknown [1.203.183.150]) by smtp11 (Coremail) with SMTP id D8CowADnZC6B3SZZ9rivHA--.14274S5; Thu, 25 May 2017 21:34:58 +0800 (CST) From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Thu, 25 May 2017 21:34:46 +0800 Message-Id: <20170525133451.22459-4-zxq_yx_007@163.com> X-Mailer: git-send-email 2.13.0.rc2.115.g10c78a162 In-Reply-To: <20170525133451.22459-1-zxq_yx_007@163.com> References: <20170525133451.22459-1-zxq_yx_007@163.com> MIME-Version: 1.0 X-CM-TRANSID: D8CowADnZC6B3SZZ9rivHA--.14274S5 X-Coremail-Antispam: 1Uf129KBjvJXoW7tw45Xw4fJr45ZryUJw1rXrb_yoW8Ww45pF 93uFn7XrWUtFs7JF17JFn29F10qwn7K3W7GrW3trsagF17GryUGanay34S9rWDJrWvv3W3 Xw1rGF9rJF4xtw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jQwIDUUUUU= X-Originating-IP: [1.203.183.150] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/1tbiqALixlc69B6NagAAsu X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 220.181.12.15 Subject: [Qemu-devel] [PATCH v3 3/8] hw/dma: QOM'ify sun4m_iommu.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: edgar.iglesias@xilinx.com, peter.maydell@linaro.org, mark.cave-ayland@ilande.co.uk, f4bug@amsat.org, pbonzini@redhat.com, atar4qemu@gmail.com, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Drop the old SysBus init function and use instance_init Signed-off-by: xiaoqiang zhao Reviewed-by: Philippe Mathieu-Daudé --- hw/dma/sun4m_iommu.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/hw/dma/sun4m_iommu.c b/hw/dma/sun4m_iommu.c index b3cbc54c23..335ef63cbc 100644 --- a/hw/dma/sun4m_iommu.c +++ b/hw/dma/sun4m_iommu.c @@ -349,17 +349,16 @@ static void iommu_reset(DeviceState *d) s->regs[IOMMU_MASK_ID] = IOMMU_TS_MASK; } -static int iommu_init1(SysBusDevice *dev) +static void iommu_init(Object *obj) { - IOMMUState *s = SUN4M_IOMMU(dev); + IOMMUState *s = SUN4M_IOMMU(obj); + SysBusDevice *dev = SYS_BUS_DEVICE(obj); sysbus_init_irq(dev, &s->irq); - memory_region_init_io(&s->iomem, OBJECT(s), &iommu_mem_ops, s, "iommu", + memory_region_init_io(&s->iomem, obj, &iommu_mem_ops, s, "iommu", IOMMU_NREGS * sizeof(uint32_t)); sysbus_init_mmio(dev, &s->iomem); - - return 0; } static Property iommu_properties[] = { @@ -370,9 +369,7 @@ static Property iommu_properties[] = { static void iommu_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - k->init = iommu_init1; dc->reset = iommu_reset; dc->vmsd = &vmstate_iommu; dc->props = iommu_properties; @@ -382,6 +379,7 @@ static const TypeInfo iommu_info = { .name = TYPE_SUN4M_IOMMU, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(IOMMUState), + .instance_init = iommu_init, .class_init = iommu_class_init, };