From nobody Thu Mar 28 20:08:34 2024 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; dkim=fail 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 1495719590567445.3903634307927; Thu, 25 May 2017 06:39:50 -0700 (PDT) Received: from localhost ([::1]:60129 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDszV-0008KT-03 for importer@patchew.org; Thu, 25 May 2017 09:39:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34514) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDsvO-0004EW-Ms 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-0005Q3-Li for qemu-devel@nongnu.org; Thu, 25 May 2017 09:35:34 -0400 Received: from m12-15.163.com ([220.181.12.15]:35521) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDsvI-0005Ow-0N for qemu-devel@nongnu.org; Thu, 25 May 2017 09:35:29 -0400 Received: from localhost.localdomain (unknown [1.203.183.150]) by smtp11 (Coremail) with SMTP id D8CowADnZC6B3SZZ9rivHA--.14274S3; Thu, 25 May 2017 21:34:58 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=w737+ yl86KZoj6zgILnFwNmZ2V3LF5IQDHAfFKIzYSg=; b=pvx3PknLapHotwCQUXJ78 efZwBxU7wn8GJ1O85dbGNaqa+fVopBmlA2RAroVYd4f+1tCEmBIcX5tRnvfVkHqW u4bLoaJNULGIsRgYvabJDdboLvJ9HokhamgIq9RhmVtFLxx4j+hFX36dj3fAJTY3 b0alKK5IHKbJG6IGoASfzs= From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Thu, 25 May 2017 21:34:44 +0800 Message-Id: <20170525133451.22459-2-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: D8CowADnZC6B3SZZ9rivHA--.14274S3 X-Coremail-Antispam: 1Uf129KBjvJXoW7tw45Xw4DurW3JFyDCF13CFg_yoW8tr45pF Z7WFs5Xrs5KFZ7JrWftF1DC3WkA397G34xKr1xJr1Skw43Grs8tFWDuayay34DtrZ2v3WY qayrK3W7Aa17Kw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jPTmfUUUUU= X-Originating-IP: [1.203.183.150] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/1tbiqALixlc69B6NZQAAsh 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 1/8] hw/misc: QOM'ify eccmemctl.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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 * Split the old SysBus init into an instance_init and a DeviceClass::realize function * Drop the old SysBus init function and use instance_init Signed-off-by: xiaoqiang zhao Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/misc/eccmemctl.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/hw/misc/eccmemctl.c b/hw/misc/eccmemctl.c index a0071f3eae..bb7cc52b5e 100644 --- a/hw/misc/eccmemctl.c +++ b/hw/misc/eccmemctl.c @@ -295,22 +295,29 @@ static void ecc_reset(DeviceState *d) s->regs[ECC_ECR1] =3D 0; } =20 -static int ecc_init1(SysBusDevice *dev) +static void ecc_init(Object *obj) { - ECCState *s =3D ECC_MEMCTL(dev); + ECCState *s =3D ECC_MEMCTL(obj); + SysBusDevice *dev =3D SYS_BUS_DEVICE(obj); =20 sysbus_init_irq(dev, &s->irq); - s->regs[0] =3D s->version; - memory_region_init_io(&s->iomem, OBJECT(dev), &ecc_mem_ops, s, "ecc", = ECC_SIZE); + + memory_region_init_io(&s->iomem, obj, &ecc_mem_ops, s, "ecc", ECC_SIZE= ); sysbus_init_mmio(dev, &s->iomem); +} + +static void ecc_realize(DeviceState *dev, Error **errp) +{ + ECCState *s =3D ECC_MEMCTL(dev); + SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); + + s->regs[0] =3D s->version; =20 if (s->version =3D=3D ECC_MCC) { // SS-600MP only memory_region_init_io(&s->iomem_diag, OBJECT(dev), &ecc_diag_mem_o= ps, s, "ecc.diag", ECC_DIAG_SIZE); - sysbus_init_mmio(dev, &s->iomem_diag); + sysbus_init_mmio(sbd, &s->iomem_diag); } - - return 0; } =20 static Property ecc_properties[] =3D { @@ -321,9 +328,8 @@ static Property ecc_properties[] =3D { static void ecc_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); =20 - k->init =3D ecc_init1; + dc->realize =3D ecc_realize; dc->reset =3D ecc_reset; dc->vmsd =3D &vmstate_ecc; dc->props =3D ecc_properties; @@ -333,6 +339,7 @@ static const TypeInfo ecc_info =3D { .name =3D TYPE_ECC_MEMCTL, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(ECCState), + .instance_init =3D ecc_init, .class_init =3D ecc_class_init, }; =20 --=20 2.13.0.rc2.115.g10c78a162 From nobody Thu Mar 28 20:08:34 2024 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; dkim=fail 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 1495719449679121.8086910847444; Thu, 25 May 2017 06:37:29 -0700 (PDT) Received: from localhost ([::1]:60123 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDsxE-0005Ng-82 for importer@patchew.org; Thu, 25 May 2017 09:37:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34509) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDsvO-0004ER-MO for qemu-devel@nongnu.org; Thu, 25 May 2017 09:35:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dDsvJ-0005Po-Kf for qemu-devel@nongnu.org; Thu, 25 May 2017 09:35:34 -0400 Received: from m12-15.163.com ([220.181.12.15]:35518) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDsvI-0005Oz-1m for qemu-devel@nongnu.org; Thu, 25 May 2017 09:35:29 -0400 Received: from localhost.localdomain (unknown [1.203.183.150]) by smtp11 (Coremail) with SMTP id D8CowADnZC6B3SZZ9rivHA--.14274S4; Thu, 25 May 2017 21:34:58 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=sME1J aRv1WnWCC0xf/Si5EL4kgHuJIERg6a75OIVJzA=; b=FHAviSigwLBlq/qiX5WGf 63lUtSlJUqCKUlT5mg7jwfSmwMCCU7OP3OICpBS7UL4YblXGA2TikyaWno0dAv/C RgP4IRjPny2XeU197K8LZ5Y1VrNeBVXKObLpjX2iw7Mr0JI50YUrK2pSOQ1p1fc5 FwQWUVq8tkc3TLnVXccnCY= From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Thu, 25 May 2017 21:34:45 +0800 Message-Id: <20170525133451.22459-3-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: D8CowADnZC6B3SZZ9rivHA--.14274S4 X-Coremail-Antispam: 1Uf129KBjvJXoW7tw45Xw4fJr1fWr4fJrW5KFg_yoW8tFW3pF 93uFs5Wr15tFZrGr43Jan2gF1kJwn5K3yS9rW3Jrn2qFsrWrn8tFyvyrWSyr909rZ7ZF1F ga95Jw45ur4UCw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jmsjUUUUUU= X-Originating-IP: [1.203.183.150] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/xtbB0gLixlUMEC16DAAAsm 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 2/8] hw/dma: QOM'ify sparc32_dma.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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Drop the old SysBus init function and use instance_init and an realize function Signed-off-by: xiaoqiang zhao Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/dma/sparc32_dma.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/hw/dma/sparc32_dma.c b/hw/dma/sparc32_dma.c index 9c6bdc6295..eb491b50ca 100644 --- a/hw/dma/sparc32_dma.c +++ b/hw/dma/sparc32_dma.c @@ -270,23 +270,28 @@ static const VMStateDescription vmstate_dma =3D { } }; =20 -static int sparc32_dma_init1(SysBusDevice *sbd) +static void sparc32_dma_init(Object *obj) { - DeviceState *dev =3D DEVICE(sbd); - DMAState *s =3D SPARC32_DMA(dev); - int reg_size; + DeviceState *dev =3D DEVICE(obj); + DMAState *s =3D SPARC32_DMA(obj); + SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); =20 sysbus_init_irq(sbd, &s->irq); =20 - reg_size =3D s->is_ledma ? DMA_ETH_SIZE : DMA_SIZE; - memory_region_init_io(&s->iomem, OBJECT(s), &dma_mem_ops, s, - "dma", reg_size); sysbus_init_mmio(sbd, &s->iomem); =20 qdev_init_gpio_in(dev, dma_set_irq, 1); qdev_init_gpio_out(dev, s->gpio, 2); +} =20 - return 0; +static void sparc32_dma_realize(DeviceState *dev, Error **errp) +{ + DMAState *s =3D SPARC32_DMA(dev); + int reg_size; + + reg_size =3D s->is_ledma ? DMA_ETH_SIZE : DMA_SIZE; + memory_region_init_io(&s->iomem, OBJECT(dev), &dma_mem_ops, s, + "dma", reg_size); } =20 static Property sparc32_dma_properties[] =3D { @@ -298,12 +303,11 @@ static Property sparc32_dma_properties[] =3D { static void sparc32_dma_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); =20 - k->init =3D sparc32_dma_init1; dc->reset =3D dma_reset; dc->vmsd =3D &vmstate_dma; dc->props =3D sparc32_dma_properties; + dc->realize =3D sparc32_dma_realize; /* Reason: pointer property "iommu_opaque" */ dc->user_creatable =3D false; } @@ -312,6 +316,7 @@ static const TypeInfo sparc32_dma_info =3D { .name =3D TYPE_SPARC32_DMA, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(DMAState), + .instance_init =3D sparc32_dma_init, .class_init =3D sparc32_dma_class_init, }; =20 --=20 2.13.0.rc2.115.g10c78a162 From nobody Thu Mar 28 20:08:34 2024 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; dkim=fail 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 1495719593080585.1511973154604; Thu, 25 May 2017 06:39:53 -0700 (PDT) Received: from localhost ([::1]:60130 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDszV-0008Lp-Nh for importer@patchew.org; Thu, 25 May 2017 09:39:49 -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 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) 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= 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 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.13.0.rc2.115.g10c78a162 From nobody Thu Mar 28 20:08:34 2024 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; dkim=fail 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 1495719449372503.5967039224861; Thu, 25 May 2017 06:37:29 -0700 (PDT) Received: from localhost ([::1]:60124 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDsxD-0005No-S3 for importer@patchew.org; Thu, 25 May 2017 09:37:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34522) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDsvO-0004EX-Nw 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-0005QC-MA for qemu-devel@nongnu.org; Thu, 25 May 2017 09:35:34 -0400 Received: from m12-15.163.com ([220.181.12.15]:35520) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDsvI-0005Ov-0P for qemu-devel@nongnu.org; Thu, 25 May 2017 09:35:29 -0400 Received: from localhost.localdomain (unknown [1.203.183.150]) by smtp11 (Coremail) with SMTP id D8CowADnZC6B3SZZ9rivHA--.14274S6; Thu, 25 May 2017 21:34:58 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=0SwIC L7gMzQXO6q87SSBhQRG5S/p+dtYoNaRyIrKs1w=; b=c9dLQcPAo39JJnq6ZKbHX PLVBrJdhGRwSW7ALeosed/X5mOnlnm5Bhki8UWYtdYirDSjDo+iyahxL1R8u3r/A hX0qXfLaXoxby7ZQSPvK/xlSxm73jtNIL0dtyDmJ00tkIJOw93TCFf4INdi1/U3P JJEEjeEgPTTKKstEdSsPCM= From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Thu, 25 May 2017 21:34:47 +0800 Message-Id: <20170525133451.22459-5-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: D8CowADnZC6B3SZZ9rivHA--.14274S6 X-Coremail-Antispam: 1Uf129KBjvJXoWxZw4UGF48tFW8Gw4xtr47Arb_yoWrZr4rpF yxCFn7WrZ3tFsFqr4xta1DCF18Awn2kw1xZrsrArsakwn2kr98Ar1kKa4SyFW0qrW09F1f Jay8GryxWw4DJw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jDUUUUUUUU= X-Originating-IP: [1.203.183.150] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/1tbiTALixlSIUV+63wAAsd 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 4/8] hw/misc: QOM'ify slavio_misc.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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Drop the old SysBus init function and use instance_init Signed-off-by: xiaoqiang zhao Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/misc/slavio_misc.c | 43 +++++++++++++++++-------------------------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/hw/misc/slavio_misc.c b/hw/misc/slavio_misc.c index edd5de0702..e1a706e828 100644 --- a/hw/misc/slavio_misc.c +++ b/hw/misc/slavio_misc.c @@ -414,76 +414,73 @@ static const VMStateDescription vmstate_misc =3D { } }; =20 -static int apc_init1(SysBusDevice *dev) +static void apc_init(Object *obj) { - APCState *s =3D APC(dev); + APCState *s =3D APC(obj); + SysBusDevice *dev =3D SYS_BUS_DEVICE(obj); =20 sysbus_init_irq(dev, &s->cpu_halt); =20 /* Power management (APC) XXX: not a Slavio device */ - memory_region_init_io(&s->iomem, OBJECT(s), &apc_mem_ops, s, + memory_region_init_io(&s->iomem, obj, &apc_mem_ops, s, "apc", MISC_SIZE); sysbus_init_mmio(dev, &s->iomem); - return 0; } =20 -static int slavio_misc_init1(SysBusDevice *sbd) +static void slavio_misc_init(Object *obj) { - DeviceState *dev =3D DEVICE(sbd); - MiscState *s =3D SLAVIO_MISC(dev); + DeviceState *dev =3D DEVICE(obj); + MiscState *s =3D SLAVIO_MISC(obj); + SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); =20 sysbus_init_irq(sbd, &s->irq); sysbus_init_irq(sbd, &s->fdc_tc); =20 /* 8 bit registers */ /* Slavio control */ - memory_region_init_io(&s->cfg_iomem, OBJECT(s), &slavio_cfg_mem_ops, s, + memory_region_init_io(&s->cfg_iomem, obj, &slavio_cfg_mem_ops, s, "configuration", MISC_SIZE); sysbus_init_mmio(sbd, &s->cfg_iomem); =20 /* Diagnostics */ - memory_region_init_io(&s->diag_iomem, OBJECT(s), &slavio_diag_mem_ops,= s, + memory_region_init_io(&s->diag_iomem, obj, &slavio_diag_mem_ops, s, "diagnostic", MISC_SIZE); sysbus_init_mmio(sbd, &s->diag_iomem); =20 /* Modem control */ - memory_region_init_io(&s->mdm_iomem, OBJECT(s), &slavio_mdm_mem_ops, s, + memory_region_init_io(&s->mdm_iomem, obj, &slavio_mdm_mem_ops, s, "modem", MISC_SIZE); sysbus_init_mmio(sbd, &s->mdm_iomem); =20 /* 16 bit registers */ /* ss600mp diag LEDs */ - memory_region_init_io(&s->led_iomem, OBJECT(s), &slavio_led_mem_ops, s, + memory_region_init_io(&s->led_iomem, obj, &slavio_led_mem_ops, s, "leds", LED_SIZE); sysbus_init_mmio(sbd, &s->led_iomem); =20 /* 32 bit registers */ /* System control */ - memory_region_init_io(&s->sysctrl_iomem, OBJECT(s), &slavio_sysctrl_me= m_ops, s, + memory_region_init_io(&s->sysctrl_iomem, obj, &slavio_sysctrl_mem_ops,= s, "system-control", SYSCTRL_SIZE); sysbus_init_mmio(sbd, &s->sysctrl_iomem); =20 /* AUX 1 (Misc System Functions) */ - memory_region_init_io(&s->aux1_iomem, OBJECT(s), &slavio_aux1_mem_ops,= s, + memory_region_init_io(&s->aux1_iomem, obj, &slavio_aux1_mem_ops, s, "misc-system-functions", MISC_SIZE); sysbus_init_mmio(sbd, &s->aux1_iomem); =20 /* AUX 2 (Software Powerdown Control) */ - memory_region_init_io(&s->aux2_iomem, OBJECT(s), &slavio_aux2_mem_ops,= s, + memory_region_init_io(&s->aux2_iomem, obj, &slavio_aux2_mem_ops, s, "software-powerdown-control", MISC_SIZE); sysbus_init_mmio(sbd, &s->aux2_iomem); =20 qdev_init_gpio_in(dev, slavio_set_power_fail, 1); - - return 0; } =20 static void slavio_misc_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); =20 - k->init =3D slavio_misc_init1; dc->reset =3D slavio_misc_reset; dc->vmsd =3D &vmstate_misc; } @@ -492,21 +489,15 @@ static const TypeInfo slavio_misc_info =3D { .name =3D TYPE_SLAVIO_MISC, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(MiscState), + .instance_init =3D slavio_misc_init, .class_init =3D slavio_misc_class_init, }; =20 -static void apc_class_init(ObjectClass *klass, void *data) -{ - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); - - k->init =3D apc_init1; -} - static const TypeInfo apc_info =3D { .name =3D TYPE_APC, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(MiscState), - .class_init =3D apc_class_init, + .instance_init =3D apc_init, }; =20 static void slavio_misc_register_types(void) --=20 2.13.0.rc2.115.g10c78a162 From nobody Thu Mar 28 20:08:34 2024 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; dkim=fail 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 149571945103574.5397591252513; Thu, 25 May 2017 06:37:31 -0700 (PDT) Received: from localhost ([::1]:60122 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDsxC-0005Mk-BP for importer@patchew.org; Thu, 25 May 2017 09:37:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34511) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDsvO-0004ET-MR 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 1dDsvK-0005QO-9E for qemu-devel@nongnu.org; Thu, 25 May 2017 09:35:34 -0400 Received: from m12-15.163.com ([220.181.12.15]:35923) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDsvJ-0005PW-2p for qemu-devel@nongnu.org; Thu, 25 May 2017 09:35:30 -0400 Received: from localhost.localdomain (unknown [1.203.183.150]) by smtp11 (Coremail) with SMTP id D8CowADnZC6B3SZZ9rivHA--.14274S7; Thu, 25 May 2017 21:34:59 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=7jPGA xEKeOqKAm/8VyCbCivHh+sJQZFkcNfYBmsEkHo=; b=DSul4x1WbFkAlXbqsYtgH TxnGhvOhL83wG4qTqNPGdXybmVY7qIa9XPpXMoFlfaNUIS4u8NhCGwWeS8AGB3A8 VIsbTDfo4zJjUQl5pNCPHdeLn2HyfFrKbJYdotspWBD+BVv4/BSgL8qsBCBHy6wS 81oiHsJ9cbgIIyULZ4Cx24= From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Thu, 25 May 2017 21:34:48 +0800 Message-Id: <20170525133451.22459-6-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: D8CowADnZC6B3SZZ9rivHA--.14274S7 X-Coremail-Antispam: 1Uf129KBjvJXoWxZw4UGFyfZw1DWFW3tr1rtFb_yoW5ZFykpF Z7CF93WrW8JF4DJ393KrWkWas8Jwn5Gw48t3WxGwsakw1UGr95AF1kA3yS9rWUJrZ7ZF4r tay0y343Wa17Cw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07j6MKZUUUUU= X-Originating-IP: [1.203.183.150] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/xtbB0gPixlUMEC16EwAAs4 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 5/8] hw/timer: QOM'ify m48txx_sysbus 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 * split the old SysBus init function into an instance_init and a Device realize function * use DeviceClass::realize instead of SysBusDeviceClass::init * assign DeviceClass::vmsd instead of using vmstate_register function Signed-off-by: xiaoqiang zhao Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/timer/m48t59.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/hw/timer/m48t59.c b/hw/timer/m48t59.c index 474981a6ac..3a9f541c9b 100644 --- a/hw/timer/m48t59.c +++ b/hw/timer/m48t59.c @@ -640,34 +640,33 @@ void m48t59_realize_common(M48t59State *s, Error **er= rp) s->wd_timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, &watchdog_cb, s); } qemu_get_timedate(&s->alarm, 0); - - vmstate_register(NULL, -1, &vmstate_m48t59, s); } =20 -static int m48t59_init1(SysBusDevice *dev) +static void m48t59_init1(Object *obj) { - M48txxSysBusDeviceClass *u =3D M48TXX_SYS_BUS_GET_CLASS(dev); - M48txxSysBusState *d =3D M48TXX_SYS_BUS(dev); - Object *o =3D OBJECT(dev); + M48txxSysBusDeviceClass *u =3D M48TXX_SYS_BUS_GET_CLASS(obj); + M48txxSysBusState *d =3D M48TXX_SYS_BUS(obj); + SysBusDevice *dev =3D SYS_BUS_DEVICE(obj); M48t59State *s =3D &d->state; - Error *err =3D NULL; =20 s->model =3D u->info.model; s->size =3D u->info.size; sysbus_init_irq(dev, &s->IRQ); =20 - memory_region_init_io(&s->iomem, o, &nvram_ops, s, "m48t59.nvram", + memory_region_init_io(&s->iomem, obj, &nvram_ops, s, "m48t59.nvram", s->size); - memory_region_init_io(&d->io, o, &m48t59_io_ops, s, "m48t59", 4); - sysbus_init_mmio(dev, &s->iomem); - sysbus_init_mmio(dev, &d->io); - m48t59_realize_common(s, &err); - if (err !=3D NULL) { - error_free(err); - return -1; - } + memory_region_init_io(&d->io, obj, &m48t59_io_ops, s, "m48t59", 4); +} + +static void m48t59_realize(DeviceState *dev, Error **errp) +{ + M48txxSysBusState *d =3D M48TXX_SYS_BUS(dev); + M48t59State *s =3D &d->state; + SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); =20 - return 0; + sysbus_init_mmio(sbd, &s->iomem); + sysbus_init_mmio(sbd, &d->io); + m48t59_realize_common(s, errp); } =20 static uint32_t m48txx_sysbus_read(Nvram *obj, uint32_t addr) @@ -696,12 +695,12 @@ static Property m48t59_sysbus_properties[] =3D { static void m48txx_sysbus_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); NvramClass *nc =3D NVRAM_CLASS(klass); =20 - k->init =3D m48t59_init1; + dc->realize =3D m48t59_realize; dc->reset =3D m48t59_reset_sysbus; dc->props =3D m48t59_sysbus_properties; + dc->vmsd =3D &vmstate_m48t59; nc->read =3D m48txx_sysbus_read; nc->write =3D m48txx_sysbus_write; nc->toggle_lock =3D m48txx_sysbus_toggle_lock; @@ -725,6 +724,7 @@ static const TypeInfo m48txx_sysbus_type_info =3D { .name =3D TYPE_M48TXX_SYS_BUS, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(M48txxSysBusState), + .instance_init =3D m48t59_init1, .abstract =3D true, .class_init =3D m48txx_sysbus_class_init, .interfaces =3D (InterfaceInfo[]) { --=20 2.13.0.rc2.115.g10c78a162 From nobody Thu Mar 28 20:08:35 2024 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; dkim=fail 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 1495719450992965.0607232297582; Thu, 25 May 2017 06:37:30 -0700 (PDT) Received: from localhost ([::1]:60121 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDsxB-0005Lj-LC for importer@patchew.org; Thu, 25 May 2017 09:37:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34510) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDsvO-0004ES-MS 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-0005Pp-LA for qemu-devel@nongnu.org; Thu, 25 May 2017 09:35:34 -0400 Received: from m12-15.163.com ([220.181.12.15]:35533) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDsvI-0005P0-0H for qemu-devel@nongnu.org; Thu, 25 May 2017 09:35:29 -0400 Received: from localhost.localdomain (unknown [1.203.183.150]) by smtp11 (Coremail) with SMTP id D8CowADnZC6B3SZZ9rivHA--.14274S8; Thu, 25 May 2017 21:34:59 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=jqvuM Rg1llXHhIxtIhxNfQMFNSYojsas0wZGAGWsr40=; b=Ck28i27u5mwTJsGRdZ3Pm z0o72C2gZgfIwi5odXfvbyAptbiUeyWkcLArAeMCFKlSkRgcLe7VS4hs+aJQ0DgT /xt5h2DpX6fb6nMemT5Y2V0JW0ti1ab/YZLEQzWWAWHFMvrWuTqDpyNDQWjZ4uoN INAhoDUzk7xZz7FyNqW0mU= From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Thu, 25 May 2017 21:34:49 +0800 Message-Id: <20170525133451.22459-7-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: D8CowADnZC6B3SZZ9rivHA--.14274S8 X-Coremail-Antispam: 1Uf129KBjvJXoW7WF18KF45GFyfCw1kWw18Grg_yoW8uFWDpF WxWF9rArnFyr4Dtw4xJF1DWFW8XFn7CF45Ca1ktrs7AFn7W3WDJ3WUJrZ7tFWxJFWv9Fy3 A3yrWr13Zr45Jw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07j6KZXUUUUU= X-Originating-IP: [1.203.183.150] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/xtbB0gPixlUMEC16EwABs5 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 6/8] hw/timer: QOM'ify slavio_timer 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 rename slavio_timer_init1 to slavio_timer_init and assign it to slavio_timer_info.instance_init, then we drop the SysBusDeviceClass::init Signed-off-by: xiaoqiang zhao Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/timer/slavio_timer.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/hw/timer/slavio_timer.c b/hw/timer/slavio_timer.c index bfee1f3027..a8cc9c0148 100644 --- a/hw/timer/slavio_timer.c +++ b/hw/timer/slavio_timer.c @@ -373,9 +373,10 @@ static void slavio_timer_reset(DeviceState *d) s->cputimer_mode =3D 0; } =20 -static int slavio_timer_init1(SysBusDevice *dev) +static void slavio_timer_init(Object *obj) { - SLAVIO_TIMERState *s =3D SLAVIO_TIMER(dev); + SLAVIO_TIMERState *s =3D SLAVIO_TIMER(obj); + SysBusDevice *dev =3D SYS_BUS_DEVICE(obj); QEMUBH *bh; unsigned int i; TimerContext *tc; @@ -394,14 +395,12 @@ static int slavio_timer_init1(SysBusDevice *dev) =20 size =3D i =3D=3D 0 ? SYS_TIMER_SIZE : CPU_TIMER_SIZE; snprintf(timer_name, sizeof(timer_name), "timer-%i", i); - memory_region_init_io(&tc->iomem, OBJECT(s), &slavio_timer_mem_ops= , tc, + memory_region_init_io(&tc->iomem, obj, &slavio_timer_mem_ops, tc, timer_name, size); sysbus_init_mmio(dev, &tc->iomem); =20 sysbus_init_irq(dev, &s->cputimer[i].irq); } - - return 0; } =20 static Property slavio_timer_properties[] =3D { @@ -412,9 +411,7 @@ static Property slavio_timer_properties[] =3D { static void slavio_timer_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); =20 - k->init =3D slavio_timer_init1; dc->reset =3D slavio_timer_reset; dc->vmsd =3D &vmstate_slavio_timer; dc->props =3D slavio_timer_properties; @@ -424,6 +421,7 @@ static const TypeInfo slavio_timer_info =3D { .name =3D TYPE_SLAVIO_TIMER, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(SLAVIO_TIMERState), + .instance_init =3D slavio_timer_init, .class_init =3D slavio_timer_class_init, }; =20 --=20 2.13.0.rc2.115.g10c78a162 From nobody Thu Mar 28 20:08:35 2024 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; dkim=fail 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 1495719764531319.8648198429232; Thu, 25 May 2017 06:42:44 -0700 (PDT) Received: from localhost ([::1]:60147 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDt2H-00037w-Ir for importer@patchew.org; Thu, 25 May 2017 09:42:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34728) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDsw1-0004hn-Dr for qemu-devel@nongnu.org; Thu, 25 May 2017 09:36:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dDsvw-0005Xl-Cx for qemu-devel@nongnu.org; Thu, 25 May 2017 09:36:13 -0400 Received: from m12-15.163.com ([220.181.12.15]:38037) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDsvu-0005XM-Af for qemu-devel@nongnu.org; Thu, 25 May 2017 09:36:08 -0400 Received: from localhost.localdomain (unknown [1.203.183.150]) by smtp11 (Coremail) with SMTP id D8CowADnZC6B3SZZ9rivHA--.14274S9; Thu, 25 May 2017 21:35:00 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=L/7de zTZVAweEO26zSq70yJVClcmqwIfW9hqg1oYq8Y=; b=P2rHVsY7QdoOj3y++AmYT goL9oDv+RO29j4TLPtmOykfKSjEwgA1LpED6aw4pIZlHkM6qjiQGLXlfra4bu4Xt hngBXC62jJ9PwYTcaOPw4Op4zy8ciRV0sSXO3d3R16dIDH1fJogw0fht7bq/FI2m 1v2Pi7K/AlQud/7uJo9rSI= From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Thu, 25 May 2017 21:34:50 +0800 Message-Id: <20170525133451.22459-8-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: D8CowADnZC6B3SZZ9rivHA--.14274S9 X-Coremail-Antispam: 1Uf129KBjvJXoWxWryxXr4ftr13KFyDWF4xtFb_yoWrZw45pF 93ZFn5KFW5WFs7XrWxtr1kuFn8Jwn3Gw1fKr17Crna9rn7Crn8AF4kA3ySvFWDGrWkuF1Y qrWDJryxua1UJ3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07j6KZXUUUUU= X-Originating-IP: [1.203.183.150] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/1tbiqATixlc69B6NfwAAs9 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 7/8] hw/sparc: QOM'ify sun4m.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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Drop the old SysBusDeviceClass::init and use instance_init or DeviceClass::realize instead Signed-off-by: xiaoqiang zhao Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/sparc/sun4m.c | 54 +++++++++++++++++++---------------------------------= -- 1 file changed, 19 insertions(+), 35 deletions(-) diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 5f022cc08d..0faff4619f 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -585,30 +585,23 @@ typedef struct IDRegState { MemoryRegion mem; } IDRegState; =20 -static int idreg_init1(SysBusDevice *dev) +static void idreg_init1(Object *obj) { - IDRegState *s =3D MACIO_ID_REGISTER(dev); + IDRegState *s =3D MACIO_ID_REGISTER(obj); + SysBusDevice *dev =3D SYS_BUS_DEVICE(obj); =20 - memory_region_init_ram(&s->mem, OBJECT(s), + memory_region_init_ram(&s->mem, obj, "sun4m.idreg", sizeof(idreg_data), &error_fatal= ); vmstate_register_ram_global(&s->mem); memory_region_set_readonly(&s->mem, true); sysbus_init_mmio(dev, &s->mem); - return 0; -} - -static void idreg_class_init(ObjectClass *klass, void *data) -{ - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); - - k->init =3D idreg_init1; } =20 static const TypeInfo idreg_info =3D { .name =3D TYPE_MACIO_ID_REGISTER, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(IDRegState), - .class_init =3D idreg_class_init, + .instance_init =3D idreg_init1, }; =20 #define TYPE_TCX_AFX "tcx_afx" @@ -633,28 +626,21 @@ static void afx_init(hwaddr addr) sysbus_mmio_map(s, 0, addr); } =20 -static int afx_init1(SysBusDevice *dev) +static void afx_init1(Object *obj) { - AFXState *s =3D TCX_AFX(dev); + AFXState *s =3D TCX_AFX(obj); + SysBusDevice *dev =3D SYS_BUS_DEVICE(obj); =20 - memory_region_init_ram(&s->mem, OBJECT(s), "sun4m.afx", 4, &error_fata= l); + memory_region_init_ram(&s->mem, obj, "sun4m.afx", 4, &error_fatal); vmstate_register_ram_global(&s->mem); sysbus_init_mmio(dev, &s->mem); - return 0; -} - -static void afx_class_init(ObjectClass *klass, void *data) -{ - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); - - k->init =3D afx_init1; } =20 static const TypeInfo afx_info =3D { .name =3D TYPE_TCX_AFX, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(AFXState), - .class_init =3D afx_class_init, + .instance_init =3D afx_init1, }; =20 #define TYPE_OPENPROM "openprom" @@ -707,16 +693,16 @@ static void prom_init(hwaddr addr, const char *bios_n= ame) } } =20 -static int prom_init1(SysBusDevice *dev) +static void prom_init1(Object *obj) { - PROMState *s =3D OPENPROM(dev); + PROMState *s =3D OPENPROM(obj); + SysBusDevice *dev =3D SYS_BUS_DEVICE(obj); =20 - memory_region_init_ram(&s->prom, OBJECT(s), "sun4m.prom", PROM_SIZE_MA= X, + memory_region_init_ram(&s->prom, obj, "sun4m.prom", PROM_SIZE_MAX, &error_fatal); vmstate_register_ram_global(&s->prom); memory_region_set_readonly(&s->prom, true); sysbus_init_mmio(dev, &s->prom); - return 0; } =20 static Property prom_properties[] =3D { @@ -726,9 +712,7 @@ static Property prom_properties[] =3D { static void prom_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); =20 - k->init =3D prom_init1; dc->props =3D prom_properties; } =20 @@ -737,6 +721,7 @@ static const TypeInfo prom_info =3D { .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(PROMState), .class_init =3D prom_class_init, + .instance_init =3D prom_init1, }; =20 #define TYPE_SUN4M_MEMORY "memory" @@ -750,14 +735,14 @@ typedef struct RamDevice { } RamDevice; =20 /* System RAM */ -static int ram_init1(SysBusDevice *dev) +static void ram_realize(DeviceState *dev, Error **errp) { RamDevice *d =3D SUN4M_RAM(dev); + SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); =20 memory_region_allocate_system_memory(&d->ram, OBJECT(d), "sun4m.ram", d->size); - sysbus_init_mmio(dev, &d->ram); - return 0; + sysbus_init_mmio(sbd, &d->ram); } =20 static void ram_init(hwaddr addr, ram_addr_t RAM_size, @@ -793,9 +778,8 @@ static Property ram_properties[] =3D { static void ram_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); =20 - k->init =3D ram_init1; + dc->realize =3D ram_realize; dc->props =3D ram_properties; } =20 --=20 2.13.0.rc2.115.g10c78a162 From nobody Thu Mar 28 20:08:35 2024 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; dkim=fail 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 149571970001171.676355655429; Thu, 25 May 2017 06:41:40 -0700 (PDT) Received: from localhost ([::1]:60145 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDt1G-0001XK-R7 for importer@patchew.org; Thu, 25 May 2017 09:41:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34513) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDsvO-0004EV-Md 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-0005Pt-LG for qemu-devel@nongnu.org; Thu, 25 May 2017 09:35:34 -0400 Received: from m12-15.163.com ([220.181.12.15]:35522) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDsvI-0005Oy-0U for qemu-devel@nongnu.org; Thu, 25 May 2017 09:35:29 -0400 Received: from localhost.localdomain (unknown [1.203.183.150]) by smtp11 (Coremail) with SMTP id D8CowADnZC6B3SZZ9rivHA--.14274S10; Thu, 25 May 2017 21:35:00 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=BB94R MFoaJg796o/qbKTRQtIByci/sgvUUHci2u9QWQ=; b=Hrio+EZMIZWsR7exRsc3m RVKwVFThW5A2Udi91JG+E4kuZDJswfeblOizmw4DjuKLyt/pgW5RuFNi/is8MwRz 3MhEtGKHegyu47u8i3/502rH9GWl3tGmchCy7P+DYCykeXzxdELDjJjgXwfOh8IX B6U3ccQX6HlIzbdPdJxIP0= From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Thu, 25 May 2017 21:34:51 +0800 Message-Id: <20170525133451.22459-9-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: D8CowADnZC6B3SZZ9rivHA--.14274S10 X-Coremail-Antispam: 1Uf129KBjvJXoW7ZF1kJr4DCFWDJw17Ww15urg_yoW5JFy7pF Z3AFn5JrWrWFZ7XrW7tr4kur98Jwn3K34fGr4xGrn29r9Fkr95JF4DA3ySvr4DKrZ7uF15 trWDtrWxCa1UG3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07j6KZXUUUUU= X-Originating-IP: [1.203.183.150] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/1tbiEATixlWBan4JoQAAsY 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 8/8] hw/sparc64: QOM'ify sun4u.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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Drop the old SysBusDeviceClass::init and use instance_init or DeviceClass::realize instead Signed-off-by: xiaoqiang zhao Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/sparc64/sun4u.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index d347b6616d..18b8f8bcba 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -329,16 +329,16 @@ static void prom_init(hwaddr addr, const char *bios_n= ame) } } =20 -static int prom_init1(SysBusDevice *dev) +static void prom_init1(Object *obj) { - PROMState *s =3D OPENPROM(dev); + PROMState *s =3D OPENPROM(obj); + SysBusDevice *dev =3D SYS_BUS_DEVICE(obj); =20 - memory_region_init_ram(&s->prom, OBJECT(s), "sun4u.prom", PROM_SIZE_MA= X, + memory_region_init_ram(&s->prom, obj, "sun4u.prom", PROM_SIZE_MAX, &error_fatal); vmstate_register_ram_global(&s->prom); memory_region_set_readonly(&s->prom, true); sysbus_init_mmio(dev, &s->prom); - return 0; } =20 static Property prom_properties[] =3D { @@ -348,9 +348,7 @@ static Property prom_properties[] =3D { static void prom_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); =20 - k->init =3D prom_init1; dc->props =3D prom_properties; } =20 @@ -359,6 +357,7 @@ static const TypeInfo prom_info =3D { .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(PROMState), .class_init =3D prom_class_init, + .instance_init =3D prom_init1, }; =20 =20 @@ -373,15 +372,15 @@ typedef struct RamDevice { } RamDevice; =20 /* System RAM */ -static int ram_init1(SysBusDevice *dev) +static void ram_realize(DeviceState *dev, Error **errp) { RamDevice *d =3D SUN4U_RAM(dev); + SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); =20 memory_region_init_ram(&d->ram, OBJECT(d), "sun4u.ram", d->size, &error_fatal); vmstate_register_ram_global(&d->ram); - sysbus_init_mmio(dev, &d->ram); - return 0; + sysbus_init_mmio(sbd, &d->ram); } =20 static void ram_init(hwaddr addr, ram_addr_t RAM_size) @@ -409,9 +408,8 @@ static Property ram_properties[] =3D { static void ram_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); =20 - k->init =3D ram_init1; + dc->realize =3D ram_realize; dc->props =3D ram_properties; } =20 --=20 2.13.0.rc2.115.g10c78a162