From nobody Fri May 3 04:27:09 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 1493463295937297.8449322738081; Sat, 29 Apr 2017 03:54:55 -0700 (PDT) Received: from localhost ([::1]:40592 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4Q1e-0005XV-KV for importer@patchew.org; Sat, 29 Apr 2017 06:54:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50600) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4PxA-0002Au-Jx for qemu-devel@nongnu.org; Sat, 29 Apr 2017 06:50:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d4Px6-0003ic-FA for qemu-devel@nongnu.org; Sat, 29 Apr 2017 06:50:16 -0400 Received: from m12-12.163.com ([220.181.12.12]:42593) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4Px5-0003dJ-RU for qemu-devel@nongnu.org; Sat, 29 Apr 2017 06:50:12 -0400 Received: from localhost.localdomain (unknown [1.203.183.82]) by smtp8 (Coremail) with SMTP id DMCowACXrJjCbwRZpVZtBA--.23413S3; Sat, 29 Apr 2017 18:49:48 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=rc1gUx525JN64LfC8I uXTzhs9E1bfJn747SQyE2kSTY=; b=bgkwSrNNd2z9unicVyqcyA0yMYBpDmmtj/ mWZZPIUC9Bb1/X/vfNeOgpIpaD+mWH0F61VYTOWLm8mMxuz0PrOJ9TxP2+Qts7Gg 7XJ3Pv+BKcR391msbkmdYmnauEfH/cQ/2h68dtbjtZbkV9S0sOhGVZ5F7ArmprQv 0YhS84Yn0= From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Sat, 29 Apr 2017 18:49:29 +0800 Message-Id: <20170429104937.31341-2-zxq_yx_007@163.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170429104937.31341-1-zxq_yx_007@163.com> References: <20170429104937.31341-1-zxq_yx_007@163.com> X-CM-TRANSID: DMCowACXrJjCbwRZpVZtBA--.23413S3 X-Coremail-Antispam: 1Uf129KBjvJXoW7tw47uw1fKr17KF1DGFWUXFb_yoW8uF15pF Z7WFs5Zrs5KFZ7JrWftF1DC3W8A397G34xKr1xJr1Skw43Gr45tFWkuayay34DtrZ2v3WY qayrGa47Aa12kw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jqJPiUUUUU= X-Originating-IP: [1.203.183.82] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/xtbBEg3IxlZX2r-avwAAsQ X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 220.181.12.12 Subject: [Qemu-devel] [PATCH v2 1/9] 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, 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 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" * 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.11.0 From nobody Fri May 3 04:27:09 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 1493463404452924.1391104073817; Sat, 29 Apr 2017 03:56:44 -0700 (PDT) Received: from localhost ([::1]:40604 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4Q3P-000743-8a for importer@patchew.org; Sat, 29 Apr 2017 06:56:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50603) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4PxA-0002Aw-K6 for qemu-devel@nongnu.org; Sat, 29 Apr 2017 06:50:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d4Px5-0003ho-Jk for qemu-devel@nongnu.org; Sat, 29 Apr 2017 06:50:16 -0400 Received: from m12-12.163.com ([220.181.12.12]:42605) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4Px4-0003dY-VS for qemu-devel@nongnu.org; Sat, 29 Apr 2017 06:50:11 -0400 Received: from localhost.localdomain (unknown [1.203.183.82]) by smtp8 (Coremail) with SMTP id DMCowACXrJjCbwRZpVZtBA--.23413S4; Sat, 29 Apr 2017 18:49:49 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=FZc1vJW7yY3ZU+LvVu xPD5PeWb/kVTBDBhXJorjYfPI=; b=L3koRCDnPYpK+PyNN0L4+X7g8L5MYhjRN2 LiAg0noBNHw7c1kgqZFz1A/gPiOWQNScQagAlD2mt3nd4FOklWSkBEnf46eW9LJn j5YjyDyde3JGadELsfEO+ypehAgvnLiAxJdI3+Yq3oIXJ24LxMigD1jZALTyqAdD Z1F16cstg= From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Sat, 29 Apr 2017 18:49:30 +0800 Message-Id: <20170429104937.31341-3-zxq_yx_007@163.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170429104937.31341-1-zxq_yx_007@163.com> References: <20170429104937.31341-1-zxq_yx_007@163.com> X-CM-TRANSID: DMCowACXrJjCbwRZpVZtBA--.23413S4 X-Coremail-Antispam: 1Uf129KBjvJXoW7tw4rtr4UtFWDtrWUAr45trb_yoW8trykpF 93uFs5Wry5KFZrGr13Xan2gF1kJwnYk3yS9rW3Jrn2qFsrWr15tFyvyrySyr909rZ7ZF1F ga95Jw45ur1UCw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jW2NZUUUUU= X-Originating-IP: [1.203.183.82] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/1tbiFg3IxlWBVt7uZwAAsA X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 220.181.12.12 Subject: [Qemu-devel] [PATCH v2 2/9] 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, 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 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 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 9d545e412e..ef4c6a93c8 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->cannot_instantiate_with_device_add_yet =3D true; } @@ -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.11.0 From nobody Fri May 3 04:27:09 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 1493463138046306.64581754829226; Sat, 29 Apr 2017 03:52:18 -0700 (PDT) Received: from localhost ([::1]:40577 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4Pz5-0003GP-Nf for importer@patchew.org; Sat, 29 Apr 2017 06:52:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50601) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4PxA-0002Av-JW for qemu-devel@nongnu.org; Sat, 29 Apr 2017 06:50:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d4Px5-0003iR-Lq for qemu-devel@nongnu.org; Sat, 29 Apr 2017 06:50:16 -0400 Received: from m12-12.163.com ([220.181.12.12]:42603) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4Px4-0003dQ-R4 for qemu-devel@nongnu.org; Sat, 29 Apr 2017 06:50:11 -0400 Received: from localhost.localdomain (unknown [1.203.183.82]) by smtp8 (Coremail) with SMTP id DMCowACXrJjCbwRZpVZtBA--.23413S5; Sat, 29 Apr 2017 18:49:49 +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=kTMK+jg/R39DYhCinty0fQ9hz/QFEXNKmK 3OPDJ/Ly6UPqb9eK3IrDHqivSPzwXU3HEKs8FnzOOSql64Ls5TVwL7+bYKkI67ki WfAnRNk4BM87UFfpQOevyO7cPmphwb9SfoTH1udYhI0tOGhCnANWG/140g2QMt5o wvAi05WK0= From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Sat, 29 Apr 2017 18:49:31 +0800 Message-Id: <20170429104937.31341-4-zxq_yx_007@163.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170429104937.31341-1-zxq_yx_007@163.com> References: <20170429104937.31341-1-zxq_yx_007@163.com> X-CM-TRANSID: DMCowACXrJjCbwRZpVZtBA--.23413S5 X-Coremail-Antispam: 1Uf129KBjvJXoW7tw47CFWDGw1rJF4DXF15CFg_yoW8Wry5pF 93uFn7ZrWUtFs7JFy7JFn2kF10qw1kK3W7GrWfJrsagF17GrW5Wanay34S9rWUJrWvv3Wf Xw1rGF9rJF4Iyw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jLVyxUUUUU= X-Originating-IP: [1.203.183.82] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/1tbiqA3Ixlc68rz3CgAAs1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 220.181.12.12 Subject: [Qemu-devel] [PATCH v2 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: edgar.iglesias@xilinx.com, peter.maydell@linaro.org, mark.cave-ayland@ilande.co.uk, 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 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 From nobody Fri May 3 04:27:09 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 149346329672023.24911314394774; Sat, 29 Apr 2017 03:54:56 -0700 (PDT) Received: from localhost ([::1]:40593 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4Q1f-0005Yz-E9 for importer@patchew.org; Sat, 29 Apr 2017 06:54:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50610) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4PxA-0002B1-Ks for qemu-devel@nongnu.org; Sat, 29 Apr 2017 06:50:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d4Px5-0003i1-Kf for qemu-devel@nongnu.org; Sat, 29 Apr 2017 06:50:16 -0400 Received: from m12-12.163.com ([220.181.12.12]:42618) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4Px4-0003en-Uk for qemu-devel@nongnu.org; Sat, 29 Apr 2017 06:50:11 -0400 Received: from localhost.localdomain (unknown [1.203.183.82]) by smtp8 (Coremail) with SMTP id DMCowACXrJjCbwRZpVZtBA--.23413S6; Sat, 29 Apr 2017 18:49:49 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=uww9uc97T0kjarffIx kxp+dr6+/iR86SoiKvnlb6ke8=; b=Im+qwDnn/B2Ny6ZVn2SSPjOfUkzoK9zRJf xKX4eQBdIw2O3tRCJhGEkABmSGwWDFy02Tclcrnw7IDMFWty8Cybw7ZizA69Wt++ Ra2ehAiJw1nsCkrHdZM4gJCck+5+c6TjvZ7bCqISzILAE1BOg80TNkbfcQfPpJwA n5mABDiZI= From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Sat, 29 Apr 2017 18:49:32 +0800 Message-Id: <20170429104937.31341-5-zxq_yx_007@163.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170429104937.31341-1-zxq_yx_007@163.com> References: <20170429104937.31341-1-zxq_yx_007@163.com> X-CM-TRANSID: DMCowACXrJjCbwRZpVZtBA--.23413S6 X-Coremail-Antispam: 1Uf129KBjvJXoWxZw4UGF48tFW8Gw4xtr47Arb_yoWrCF1rpF yxGFn7WrZ3tFsFqr4xta1DCF1rAwn2kw4xZrsrArsakwn2kr98Ar1kKa4SyFW0qrW09F1f Xay8GFyxWw4DJwUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jkYFAUUUUU= X-Originating-IP: [1.203.183.82] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/1tbiqA3Ixlc68rz3CgABs0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 220.181.12.12 Subject: [Qemu-devel] [PATCH v2 4/9] 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, 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 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/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.11.0 From nobody Fri May 3 04:27:09 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 1493463139137277.1410731174967; Sat, 29 Apr 2017 03:52:19 -0700 (PDT) Received: from localhost ([::1]:40579 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4Pz7-0003IH-Mj for importer@patchew.org; Sat, 29 Apr 2017 06:52:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50604) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4PxA-0002Ax-Kd for qemu-devel@nongnu.org; Sat, 29 Apr 2017 06:50:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d4Px5-0003iE-M9 for qemu-devel@nongnu.org; Sat, 29 Apr 2017 06:50:16 -0400 Received: from m12-12.163.com ([220.181.12.12]:42590) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4Px4-0003dH-U6 for qemu-devel@nongnu.org; Sat, 29 Apr 2017 06:50:11 -0400 Received: from localhost.localdomain (unknown [1.203.183.82]) by smtp8 (Coremail) with SMTP id DMCowAAnzhbNbwRZZlhtBA--.26750S2; Sat, 29 Apr 2017 18:49:49 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=yrim9BPk+zJ1qucqge N9anNFk0xDi3h8DC/NbbQWS0Q=; b=qW4Gsis/UIMm/owuBxBV6pQfVq1N5SmIY8 OP6RwR0aUn0inbjV10hLf23kINAI6A0QCykkkI/A8fmd5jc6+4m5hITLovjVO5R+ XBcTyXQLlDZknvJkzXRw07/Xa8zDJ6GF7Sw8O3+fKXEWvN6xXXIiJo5cS86vZGFb /lEwEJ4lc= From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Sat, 29 Apr 2017 18:49:33 +0800 Message-Id: <20170429104937.31341-6-zxq_yx_007@163.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170429104937.31341-1-zxq_yx_007@163.com> References: <20170429104937.31341-1-zxq_yx_007@163.com> X-CM-TRANSID: DMCowAAnzhbNbwRZZlhtBA--.26750S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxZw4UCw4ruw15Zr1UZry7ZFb_yoW5WF18pF Z3AF95WrW8GF47JrWfKrykGas5Jwn3Gw48t3W7Gwnakw1xJr9YyF1kA3ya9rWUJrZ7ZF4r tayxtw13W3W7Gw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jSYL9UUUUU= X-Originating-IP: [1.203.183.82] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/1tbiMw7IxlXllK6URgAAsr X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 220.181.12.12 Subject: [Qemu-devel] [PATCH v2 5/9] hw/timer: QOM'ify m48txx_sysbus (pass 1) 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, 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 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" * split the old SysBus init function into an instance_init and a Device realize function * use DeviceClass::realize instead of SysBusDeviceClass::init Signed-off-by: xiaoqiang zhao Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/timer/m48t59.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/hw/timer/m48t59.c b/hw/timer/m48t59.c index 474981a6ac..eff259ef96 100644 --- a/hw/timer/m48t59.c +++ b/hw/timer/m48t59.c @@ -644,30 +644,31 @@ void m48t59_realize_common(M48t59State *s, Error **er= rp) 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,10 +697,9 @@ 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; nc->read =3D m48txx_sysbus_read; @@ -725,6 +725,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.11.0 From nobody Fri May 3 04:27:09 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 1493463138179391.3940223851772; Sat, 29 Apr 2017 03:52:18 -0700 (PDT) Received: from localhost ([::1]:40578 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4Pz6-0003HG-Hx for importer@patchew.org; Sat, 29 Apr 2017 06:52:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50599) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4PxA-0002At-Jc for qemu-devel@nongnu.org; Sat, 29 Apr 2017 06:50:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d4Px5-0003iK-Lw for qemu-devel@nongnu.org; Sat, 29 Apr 2017 06:50:16 -0400 Received: from m12-12.163.com ([220.181.12.12]:42591) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4Px4-0003dG-Tl for qemu-devel@nongnu.org; Sat, 29 Apr 2017 06:50:11 -0400 Received: from localhost.localdomain (unknown [1.203.183.82]) by smtp8 (Coremail) with SMTP id DMCowAAnzhbNbwRZZlhtBA--.26750S3; Sat, 29 Apr 2017 18:49:50 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=CdsybGqzFD5pZDcSWy AcNO8GRjls1e+l9W0oNTiuuEg=; b=HrveGY4NIzTe0Y9XusZqd1iAcYPTR1KrXF kqYeoGK1eM6ZX5V8CACSya9g0ewg3YNYTzpoGXAAiLzkhGKbTub/FeQuPKohvLhP fi1qtIRVx+2XVE+oG/SYCWn9qteXYHlUYA9/yT4wOgQh+IQNvxckrU6OTXGi+FY7 /FekCPgZ0= From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Sat, 29 Apr 2017 18:49:34 +0800 Message-Id: <20170429104937.31341-7-zxq_yx_007@163.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170429104937.31341-1-zxq_yx_007@163.com> References: <20170429104937.31341-1-zxq_yx_007@163.com> X-CM-TRANSID: DMCowAAnzhbNbwRZZlhtBA--.26750S3 X-Coremail-Antispam: 1Uf129KBjvdXoW7JryUGw43AF48KF1DKw18uFg_yoWDArX_ua yrCw4fWr4UCwnFga48uws0q34Fyw1UJr1Yya18KF4Iyr4UJ3yUA3s8WF98Cr18Wa43Wa42 9Fs7Jr98KFWxGjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUn8hL5UUUUU== X-Originating-IP: [1.203.183.82] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/1tbiFg7IxlWBVt7ubAAAsI X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 220.181.12.12 Subject: [Qemu-devel] [PATCH v2 6/9] hw/timer: QOM'ify m48txx_sysbus (pass 2) 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, 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 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/timer/m48t59.c b/hw/timer/m48t59.c index eff259ef96..3a9f541c9b 100644 --- a/hw/timer/m48t59.c +++ b/hw/timer/m48t59.c @@ -640,8 +640,6 @@ void m48t59_realize_common(M48t59State *s, Error **errp) 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 void m48t59_init1(Object *obj) @@ -702,6 +700,7 @@ static void m48txx_sysbus_class_init(ObjectClass *klass= , void *data) 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; --=20 2.11.0 From nobody Fri May 3 04:27:09 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 149346329216222.895565178688116; Sat, 29 Apr 2017 03:54:52 -0700 (PDT) Received: from localhost ([::1]:40590 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4Q1a-0005VE-Sj for importer@patchew.org; Sat, 29 Apr 2017 06:54:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50607) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4PxA-0002Az-Ke for qemu-devel@nongnu.org; Sat, 29 Apr 2017 06:50:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d4Px5-0003hu-L4 for qemu-devel@nongnu.org; Sat, 29 Apr 2017 06:50:16 -0400 Received: from m12-12.163.com ([220.181.12.12]:42629) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4Px5-0003ew-0t for qemu-devel@nongnu.org; Sat, 29 Apr 2017 06:50:11 -0400 Received: from localhost.localdomain (unknown [1.203.183.82]) by smtp8 (Coremail) with SMTP id DMCowAAnzhbNbwRZZlhtBA--.26750S4; Sat, 29 Apr 2017 18:49:50 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=Nm/x+9F6HAneVAs5qQ FuyGPRx/xXLNy3Qq+sNDpulfU=; b=KVnZmhHM+iXOC4Tk4eTVNWL7qI4gc9AQwe +qNREtT1lMne9L+oILFBECjeZ32AXcouYjDbB68z/osGRN5YxGiFTS9/piBfdRVy 6U0BdQGtF66i9orjSKBE6uoja0u+EqfNoUmXRznIRxaIwHWJLj0awFQc9LZoEAgY 2u3V1nmxg= From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Sat, 29 Apr 2017 18:49:35 +0800 Message-Id: <20170429104937.31341-8-zxq_yx_007@163.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170429104937.31341-1-zxq_yx_007@163.com> References: <20170429104937.31341-1-zxq_yx_007@163.com> X-CM-TRANSID: DMCowAAnzhbNbwRZZlhtBA--.26750S4 X-Coremail-Antispam: 1Uf129KBjvJXoW7WF18KF45GFyfZw1UKw4Uurg_yoW8ur1DpF WxWF9rArnFyr4Dtw4xJF1DWFW8XFn7CF45Cw4ktws7AFn7W3WDJ3WUJrZ7tFWxJFWv9Fy3 A3yrWF13Zr45Jw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jX9NsUUUUU= X-Originating-IP: [1.203.183.82] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/1tbiqA7Ixlc68rz3DgAAsy X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 220.181.12.12 Subject: [Qemu-devel] [PATCH v2 7/9] 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, 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 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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.11.0 From nobody Fri May 3 04:27:09 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 1493463295118166.95589512511003; Sat, 29 Apr 2017 03:54:55 -0700 (PDT) Received: from localhost ([::1]:40591 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4Q1d-0005XS-PY for importer@patchew.org; Sat, 29 Apr 2017 06:54:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50609) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4PxA-0002B0-LE for qemu-devel@nongnu.org; Sat, 29 Apr 2017 06:50:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d4Px5-0003iO-La for qemu-devel@nongnu.org; Sat, 29 Apr 2017 06:50:16 -0400 Received: from m12-12.163.com ([220.181.12.12]:42621) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4Px4-0003ep-RH for qemu-devel@nongnu.org; Sat, 29 Apr 2017 06:50:11 -0400 Received: from localhost.localdomain (unknown [1.203.183.82]) by smtp8 (Coremail) with SMTP id DMCowAAnzhbNbwRZZlhtBA--.26750S5; Sat, 29 Apr 2017 18:49:50 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=uULqUKpxGndE+8miKy XAeTNFTdT1NMckeA6AIBwlm8Q=; b=Y8B66gws1a1kA2AiEDJYyWkvoTj0bYPtVv Bamd0fQgDYwIFyPVm63q4drQOrns5VZOAnUl8SYbSc3r0Gq3leEZFNAJh9hFRc39 X+vEeBQ0lAJMmYA02PJMSQOGuOaI14NiPavGwVz06G7fDXfr1QarlUPIkVYFc7ho d8PkZC/1Y= From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Sat, 29 Apr 2017 18:49:36 +0800 Message-Id: <20170429104937.31341-9-zxq_yx_007@163.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170429104937.31341-1-zxq_yx_007@163.com> References: <20170429104937.31341-1-zxq_yx_007@163.com> X-CM-TRANSID: DMCowAAnzhbNbwRZZlhtBA--.26750S5 X-Coremail-Antispam: 1Uf129KBjvJXoWxWryxXr4ftr13KFyDWF4xtFb_yoWrZry5pF 93ZFn5KFW5WFs7XrWxtr1kuFn8Jwn3Gw1fKr17Crna9rn7Crn8AF4kA3ySvFWDGrWkuF1Y qrWkJryxua1UJ3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jldgXUUUUU= X-Originating-IP: [1.203.183.82] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/xtbBEA7IxlUMBUtwegAAsN X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 220.181.12.12 Subject: [Qemu-devel] [PATCH v2 8/9] 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, 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 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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.11.0 From nobody Fri May 3 04:27:09 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 1493463405729528.8861009022578; Sat, 29 Apr 2017 03:56:45 -0700 (PDT) Received: from localhost ([::1]:40605 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4Q3Q-00074m-Gn for importer@patchew.org; Sat, 29 Apr 2017 06:56:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50605) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4PxA-0002Ay-Ko for qemu-devel@nongnu.org; Sat, 29 Apr 2017 06:50:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d4Px5-0003i7-LZ for qemu-devel@nongnu.org; Sat, 29 Apr 2017 06:50:16 -0400 Received: from m12-12.163.com ([220.181.12.12]:42601) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4Px4-0003dP-RV for qemu-devel@nongnu.org; Sat, 29 Apr 2017 06:50:11 -0400 Received: from localhost.localdomain (unknown [1.203.183.82]) by smtp8 (Coremail) with SMTP id DMCowAAnzhbNbwRZZlhtBA--.26750S6; Sat, 29 Apr 2017 18:49:50 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=/s0TYAVPwadw77eelB 8S4r2Xz9CuG3mgbPC61FRwVmw=; b=gfkHWgc1c+9iki1OP5/HWgH/cJi3ROwRkN IUPKEJPE5/2+TZ9NMeYAqKBGVdQW0a2rus+wSIZmna3eKWS0GcEBbSs+Xk8SePbs pYwgDd99CHvCFTBjQBKORdCZwqzTwiMEQgM8+ixu6rl+01ZANA+P4Jn89qbf7quS d3YY8UblI= From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Sat, 29 Apr 2017 18:49:37 +0800 Message-Id: <20170429104937.31341-10-zxq_yx_007@163.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170429104937.31341-1-zxq_yx_007@163.com> References: <20170429104937.31341-1-zxq_yx_007@163.com> X-CM-TRANSID: DMCowAAnzhbNbwRZZlhtBA--.26750S6 X-Coremail-Antispam: 1Uf129KBjvJXoW7ZF1kJr4DCFWDGry8Jw15twb_yoW8Kw47pF Z3ZFn5JrWrWFZ7X3y7tr4kur98Jwn3K34fGr4xGrn29rnFkr95JF4DA3ySvr4DKrWkuF1Y qrWDJrWxCa1UG3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jyhFcUUUUU= X-Originating-IP: [1.203.183.82] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/xtbB0g7IxlUMDsy9xQAAsx X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 220.181.12.12 Subject: [Qemu-devel] [PATCH v2 9/9] 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, 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 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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.11.0