From nobody Tue Feb 10 15:32:46 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1486302470601897.9818225287847; Sun, 5 Feb 2017 05:47:50 -0800 (PST) Received: from localhost ([::1]:43323 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1caNAS-0007Ta-M8 for importer@patchew.org; Sun, 05 Feb 2017 08:47:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33669) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1caN1B-0000Am-2Z for qemu-devel@nongnu.org; Sun, 05 Feb 2017 08:38:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1caN17-0003Hc-VJ for qemu-devel@nongnu.org; Sun, 05 Feb 2017 08:38:13 -0500 Received: from m12-14.163.com ([220.181.12.14]:60843) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1caN17-0003Ei-B6 for qemu-devel@nongnu.org; Sun, 05 Feb 2017 08:38:09 -0500 Received: from localhost.localdomain (unknown [117.136.0.125]) by smtp10 (Coremail) with SMTP id DsCowAAHg7WZKpdY30+9Ig--.34490S5; Sun, 05 Feb 2017 21:37:45 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=td9bK1qbER/ekHJ3vb DpB5BP3yUiS+h2MW3+E4uWXDw=; b=ShpsnLv8JPXXe94J+cYrgYQaN/PNP+sVB4 /KV9iWavr/9CF2SX0fYd36N7UKfpaaY5QY17By2qb/3Nwz5xc5cBav/fTFNDoVrN Lx+7Td/pKfi8vaRN/wYvbGreGrtl9YfGKu6JaRzrQeSxz8dX0+S8oNw/Taqir1UU h5UmuhCNk= From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Sun, 5 Feb 2017 21:37:21 +0800 Message-Id: <20170205133727.23424-4-zxq_yx_007@163.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170205133727.23424-1-zxq_yx_007@163.com> References: <20170205133727.23424-1-zxq_yx_007@163.com> X-CM-TRANSID: DsCowAAHg7WZKpdY30+9Ig--.34490S5 X-Coremail-Antispam: 1Uf129KBjvJXoW7tw47CFWDGw1rJF4DXF15CFg_yoW8Wry5pF 93uFn7ZrWUtFs7JFy7JFn2kF10qw1kK3W7GrWfJrsagF17GrW5Wanay34S9rWUJrWvv3Wf Xw1rGF9rJF4Iyw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jPNVkUUUUU= X-Originating-IP: [117.136.0.125] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/1tbiFgl1xlWBUnmo4QAAsa X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 220.181.12.14 Subject: [Qemu-devel] [RESEND PATCH 3/9] 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: pbonzini@redhat.com, mark.cave-ayland@ilande.co.uk, atar4qemu@gmail.com, peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Drop the old SysBus init function and use instance_init Signed-off-by: xiaoqiang zhao Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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] =3D IOMMU_TS_MASK; } =20 -static int iommu_init1(SysBusDevice *dev) +static void iommu_init(Object *obj) { - IOMMUState *s =3D SUN4M_IOMMU(dev); + IOMMUState *s =3D SUN4M_IOMMU(obj); + SysBusDevice *dev =3D SYS_BUS_DEVICE(obj); =20 sysbus_init_irq(dev, &s->irq); =20 - 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; } =20 static Property iommu_properties[] =3D { @@ -370,9 +369,7 @@ static Property iommu_properties[] =3D { static void iommu_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); =20 - k->init =3D iommu_init1; dc->reset =3D iommu_reset; dc->vmsd =3D &vmstate_iommu; dc->props =3D iommu_properties; @@ -382,6 +379,7 @@ static const TypeInfo iommu_info =3D { .name =3D TYPE_SUN4M_IOMMU, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(IOMMUState), + .instance_init =3D iommu_init, .class_init =3D iommu_class_init, }; =20 --=20 2.11.0