From nobody Mon Apr 29 14:38:51 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; 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 1486302020140968.6495818434303; Sun, 5 Feb 2017 05:40:20 -0800 (PST) Received: from localhost ([::1]:43285 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1caN3C-0001Ji-0C for importer@patchew.org; Sun, 05 Feb 2017 08:40:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33673) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1caN1B-0000Aq-3Z for qemu-devel@nongnu.org; Sun, 05 Feb 2017 08:38:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1caN17-0003HV-Ur for qemu-devel@nongnu.org; Sun, 05 Feb 2017 08:38:13 -0500 Received: from m12-14.163.com ([220.181.12.14]:60842) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1caN17-0003Em-At for qemu-devel@nongnu.org; Sun, 05 Feb 2017 08:38:09 -0500 Received: from localhost.localdomain (unknown [117.136.0.125]) by smtp10 (Coremail) with SMTP id DsCowAAHg7WZKpdY30+9Ig--.34490S3; Sun, 05 Feb 2017 21:37:44 +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=muTwU/91xsg368JgGbrtVrLz7ejMV/n5He fY+iZqqPs75GD2myjr2YI0u5QZkvibYx2xi676oQfY3Zw7/13CjX5gepn0mmaLZK 7ZhC8i6w4u0wVYWPbUf3fwvpV7YFOkjInBl/zsQTBZLWipfuAh0ql3mKr1mcR4fk 97ccrpPaI= From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Sun, 5 Feb 2017 21:37:19 +0800 Message-Id: <20170205133727.23424-2-zxq_yx_007@163.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170205133727.23424-1-zxq_yx_007@163.com> References: <20170205133727.23424-1-zxq_yx_007@163.com> X-CM-TRANSID: DsCowAAHg7WZKpdY30+9Ig--.34490S3 X-Coremail-Antispam: 1Uf129KBjvJXoW7tw47uw1fKr17KF1DGFWUXFb_yoW8uF15pF Z7WFs5Zrs5KFZ7JrWftF1DC3W8A397G34xKr1xJr1Skw43Gr45tFWkuayay34DtrZ2v3WY qayrGa47Aa12kw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jI-erUUUUU= X-Originating-IP: [117.136.0.125] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/1tbiTAh1xlSIS5Yh5gAAsx X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 220.181.12.14 Subject: [Qemu-devel] [RESEND PATCH 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: pbonzini@redhat.com, mark.cave-ayland@ilande.co.uk, atar4qemu@gmail.com, peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" * 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 Mon Apr 29 14:38:51 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; 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 1486302615629746.2184381833504; Sun, 5 Feb 2017 05:50:15 -0800 (PST) Received: from localhost ([::1]:43333 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1caNCo-0000cb-BO for importer@patchew.org; Sun, 05 Feb 2017 08:50:14 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33677) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1caN1B-0000At-4b for qemu-devel@nongnu.org; Sun, 05 Feb 2017 08:38:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1caN17-0003HS-Us for qemu-devel@nongnu.org; Sun, 05 Feb 2017 08:38:13 -0500 Received: from m12-14.163.com ([220.181.12.14]:60852) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1caN17-0003Ew-Ag for qemu-devel@nongnu.org; Sun, 05 Feb 2017 08:38:09 -0500 Received: from localhost.localdomain (unknown [117.136.0.125]) by smtp10 (Coremail) with SMTP id DsCowAAHg7WZKpdY30+9Ig--.34490S4; Sun, 05 Feb 2017 21:37:44 +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=NkH146D40/i8Y/vAjNHRry69kf84zNE2Ni eEN1iOo62fKknI8alL8j0rBP4Y28BNHQ1Bd9nFtfO5NaBt/eQv2NkrGIWfn9kwy3 vEbC9LtCHTHRVPQO30zJVqq0cbyAu+Imi7WudcRUNlZCN4md/sBBPrVPnviAYDVx jGnFGDm2k= From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Sun, 5 Feb 2017 21:37:20 +0800 Message-Id: <20170205133727.23424-3-zxq_yx_007@163.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170205133727.23424-1-zxq_yx_007@163.com> References: <20170205133727.23424-1-zxq_yx_007@163.com> X-CM-TRANSID: DsCowAAHg7WZKpdY30+9Ig--.34490S4 X-Coremail-Antispam: 1Uf129KBjvJXoW7tw4rtr4UtFWDtrWUAr45trb_yoW8trykpF 93uFs5Wry5KFZrGr13Xan2gF1kJwnYk3yS9rW3Jrn2qFsrWr15tFyvyrySyr909rZ7ZF1F ga95Jw45ur1UCw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jPL05UUUUU= X-Originating-IP: [117.136.0.125] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/xtbB0gl1xlUMCmuL7QAAs2 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 220.181.12.14 Subject: [Qemu-devel] [RESEND PATCH 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: pbonzini@redhat.com, mark.cave-ayland@ilande.co.uk, atar4qemu@gmail.com, peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Drop the old SysBus init function and use instance_init 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 Mon Apr 29 14:38:51 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; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1486302470601897.9818225287847; Sun, 5 Feb 2017 05:47:50 -0800 (PST) Received: from localhost ([::1]:43323 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1caNAS-0007Ta-M8 for importer@patchew.org; Sun, 05 Feb 2017 08:47:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33669) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1caN1B-0000Am-2Z for qemu-devel@nongnu.org; Sun, 05 Feb 2017 08:38:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1caN17-0003Hc-VJ for qemu-devel@nongnu.org; Sun, 05 Feb 2017 08:38:13 -0500 Received: from m12-14.163.com ([220.181.12.14]:60843) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1caN17-0003Ei-B6 for qemu-devel@nongnu.org; Sun, 05 Feb 2017 08:38:09 -0500 Received: from localhost.localdomain (unknown [117.136.0.125]) by smtp10 (Coremail) with SMTP id DsCowAAHg7WZKpdY30+9Ig--.34490S5; Sun, 05 Feb 2017 21:37:45 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=td9bK1qbER/ekHJ3vb DpB5BP3yUiS+h2MW3+E4uWXDw=; b=ShpsnLv8JPXXe94J+cYrgYQaN/PNP+sVB4 /KV9iWavr/9CF2SX0fYd36N7UKfpaaY5QY17By2qb/3Nwz5xc5cBav/fTFNDoVrN Lx+7Td/pKfi8vaRN/wYvbGreGrtl9YfGKu6JaRzrQeSxz8dX0+S8oNw/Taqir1UU h5UmuhCNk= From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Sun, 5 Feb 2017 21:37:21 +0800 Message-Id: <20170205133727.23424-4-zxq_yx_007@163.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170205133727.23424-1-zxq_yx_007@163.com> References: <20170205133727.23424-1-zxq_yx_007@163.com> X-CM-TRANSID: DsCowAAHg7WZKpdY30+9Ig--.34490S5 X-Coremail-Antispam: 1Uf129KBjvJXoW7tw47CFWDGw1rJF4DXF15CFg_yoW8Wry5pF 93uFn7ZrWUtFs7JFy7JFn2kF10qw1kK3W7GrWfJrsagF17GrW5Wanay34S9rWUJrWvv3Wf Xw1rGF9rJF4Iyw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jPNVkUUUUU= X-Originating-IP: [117.136.0.125] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/1tbiFgl1xlWBUnmo4QAAsa X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 220.181.12.14 Subject: [Qemu-devel] [RESEND PATCH 3/9] hw/dma: QOM'ify sun4m_iommu.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, mark.cave-ayland@ilande.co.uk, atar4qemu@gmail.com, peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Drop the old SysBus init function and use instance_init Signed-off-by: xiaoqiang zhao Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/dma/sun4m_iommu.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/hw/dma/sun4m_iommu.c b/hw/dma/sun4m_iommu.c index b3cbc54c23..335ef63cbc 100644 --- a/hw/dma/sun4m_iommu.c +++ b/hw/dma/sun4m_iommu.c @@ -349,17 +349,16 @@ static void iommu_reset(DeviceState *d) s->regs[IOMMU_MASK_ID] =3D IOMMU_TS_MASK; } =20 -static int iommu_init1(SysBusDevice *dev) +static void iommu_init(Object *obj) { - IOMMUState *s =3D SUN4M_IOMMU(dev); + IOMMUState *s =3D SUN4M_IOMMU(obj); + SysBusDevice *dev =3D SYS_BUS_DEVICE(obj); =20 sysbus_init_irq(dev, &s->irq); =20 - memory_region_init_io(&s->iomem, OBJECT(s), &iommu_mem_ops, s, "iommu", + memory_region_init_io(&s->iomem, obj, &iommu_mem_ops, s, "iommu", IOMMU_NREGS * sizeof(uint32_t)); sysbus_init_mmio(dev, &s->iomem); - - return 0; } =20 static Property iommu_properties[] =3D { @@ -370,9 +369,7 @@ static Property iommu_properties[] =3D { static void iommu_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); =20 - k->init =3D iommu_init1; dc->reset =3D iommu_reset; dc->vmsd =3D &vmstate_iommu; dc->props =3D iommu_properties; @@ -382,6 +379,7 @@ static const TypeInfo iommu_info =3D { .name =3D TYPE_SUN4M_IOMMU, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(IOMMUState), + .instance_init =3D iommu_init, .class_init =3D iommu_class_init, }; =20 --=20 2.11.0 From nobody Mon Apr 29 14:38:51 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; 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 1486302471852849.8856698710678; Sun, 5 Feb 2017 05:47:51 -0800 (PST) Received: from localhost ([::1]:43324 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1caNAT-0007UF-Jy for importer@patchew.org; Sun, 05 Feb 2017 08:47:49 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33679) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1caN1B-0000Au-4d for qemu-devel@nongnu.org; Sun, 05 Feb 2017 08:38:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1caN17-0003H7-Uv for qemu-devel@nongnu.org; Sun, 05 Feb 2017 08:38:13 -0500 Received: from m12-14.163.com ([220.181.12.14]:60840) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1caN17-0003El-AZ for qemu-devel@nongnu.org; Sun, 05 Feb 2017 08:38:09 -0500 Received: from localhost.localdomain (unknown [117.136.0.125]) by smtp10 (Coremail) with SMTP id DsCowACnVrepKpdYyVK9Ig--.30409S2; Sun, 05 Feb 2017 21:37:46 +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=DERItpP979u7LXEXdP5bpwKMNg0LAg9Dmh EGMrqcntRvBFh5mblWdpaQpcqCXykYR5MHjnno0S/7+wiu5CTkMsfKc/EMMmk4nr WbIOViP4q/Uktjji8AH3ADVwus3nRWTfWrYH9xshX/GAsrut/0W6WJnZMPWZBefy L7J0lyZG0= From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Sun, 5 Feb 2017 21:37:22 +0800 Message-Id: <20170205133727.23424-5-zxq_yx_007@163.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170205133727.23424-1-zxq_yx_007@163.com> References: <20170205133727.23424-1-zxq_yx_007@163.com> X-CM-TRANSID: DsCowACnVrepKpdYyVK9Ig--.30409S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxZw4UGF48tFW8Gw4xtr47Arb_yoWrCF1rpF yxGFn7WrZ3tFsFqr4xta1DCF1rAwn2kw4xZrsrArsakwn2kr98Ar1kKa4SyFW0qrW09F1f Xay8GFyxWw4DJwUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jk2-5UUUUU= X-Originating-IP: [117.136.0.125] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/1tbiOwp1xlXlXUbwXQAAsE X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 220.181.12.14 Subject: [Qemu-devel] [RESEND PATCH 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: pbonzini@redhat.com, mark.cave-ayland@ilande.co.uk, atar4qemu@gmail.com, peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Drop the old SysBus init function and use instance_init Signed-off-by: xiaoqiang zhao Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/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 Mon Apr 29 14:38:51 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; 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 1486302271621694.7902604709051; Sun, 5 Feb 2017 05:44:31 -0800 (PST) Received: from localhost ([::1]:43307 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1caN7G-0004ry-Eh for importer@patchew.org; Sun, 05 Feb 2017 08:44:30 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33674) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1caN1B-0000As-3c for qemu-devel@nongnu.org; Sun, 05 Feb 2017 08:38:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1caN17-0003Hl-VO for qemu-devel@nongnu.org; Sun, 05 Feb 2017 08:38:13 -0500 Received: from m12-14.163.com ([220.181.12.14]:60837) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1caN17-0003En-BI for qemu-devel@nongnu.org; Sun, 05 Feb 2017 08:38:09 -0500 Received: from localhost.localdomain (unknown [117.136.0.125]) by smtp10 (Coremail) with SMTP id DsCowACnVrepKpdYyVK9Ig--.30409S3; Sun, 05 Feb 2017 21:37:46 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=0LIuUqaLw7GAp8Zb/F nJyFCrYZG5tkaNSU9xSup/3kk=; b=RM/XplcZkWk73/1zyL7PSXBZuaoWkYgOrI 0SbKgXd/AqCBTu/O+ImxubMmS7Dikw4zH3Ef8aEECzdHrGfIaA1MDfcNVyblr/9y +gKaF28IH7qedfGzlFKiozQv4NLBIPfr9rtpobR6opfN5x0ZX+LIPN74dXsziKCP buxDydvx0= From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Sun, 5 Feb 2017 21:37:23 +0800 Message-Id: <20170205133727.23424-6-zxq_yx_007@163.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170205133727.23424-1-zxq_yx_007@163.com> References: <20170205133727.23424-1-zxq_yx_007@163.com> X-CM-TRANSID: DsCowACnVrepKpdYyVK9Ig--.30409S3 X-Coremail-Antispam: 1Uf129KBjvJXoWxZw1kKw1fGFyUAFWkuFy8Krg_yoW5Wr1UpF Z7AF95WrW8GF47JrWfKrWDGas5Jwn3Gw48t3WxGwsakw17Gr95JF1kA3ya9FWUGrZ7ZF4r tayxtry3W3W7Gw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jlZXOUUUUU= X-Originating-IP: [117.136.0.125] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/1tbiFgp1xlWBUnmo5wAAsf X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 220.181.12.14 Subject: [Qemu-devel] [RESEND PATCH 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: pbonzini@redhat.com, mark.cave-ayland@ilande.co.uk, atar4qemu@gmail.com, peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" * 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 e46ca88391..39e425e950 100644 --- a/hw/timer/m48t59.c +++ b/hw/timer/m48t59.c @@ -765,30 +765,31 @@ static void m48t59_isa_realize(DeviceState *dev, Erro= r **errp) } } =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); +} =20 - return 0; +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); + + sysbus_init_mmio(sbd, &s->iomem); + sysbus_init_mmio(sbd, &d->io); + m48t59_realize_common(s, errp); } =20 static uint32_t m48txx_isa_read(Nvram *obj, uint32_t addr) @@ -862,10 +863,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; @@ -891,6 +891,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 Mon Apr 29 14:38:51 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; 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 1486302020616358.2333031076829; Sun, 5 Feb 2017 05:40:20 -0800 (PST) Received: from localhost ([::1]:43287 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1caN3D-0001LB-6m for importer@patchew.org; Sun, 05 Feb 2017 08:40:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33672) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1caN1B-0000Ap-2k for qemu-devel@nongnu.org; Sun, 05 Feb 2017 08:38:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1caN17-0003Hf-Vj for qemu-devel@nongnu.org; Sun, 05 Feb 2017 08:38:13 -0500 Received: from m12-14.163.com ([220.181.12.14]:60841) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1caN17-0003Eo-BL for qemu-devel@nongnu.org; Sun, 05 Feb 2017 08:38:09 -0500 Received: from localhost.localdomain (unknown [117.136.0.125]) by smtp10 (Coremail) with SMTP id DsCowACnVrepKpdYyVK9Ig--.30409S4; Sun, 05 Feb 2017 21:37:47 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=cOBbRaG7WyLx2DEjfo InoTB9kaVFVUL6yraaLM5jwJw=; b=mT36ppf95QoSzfakAe6UxsJgOfaKNKTpyb NkymvRedvpyf/xcIrLkZ2YZTvURlQpKksRbqlXd3neBxC6XIqqA6mBXYYCwCNys5 9Z53Lw6P2VrZiPUtIzqx+wG7Uz55GsT9Lw/v6uY+3IuQd1fFSa+EzRGLmbsj+4zk ZX4cHIloE= From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Sun, 5 Feb 2017 21:37:24 +0800 Message-Id: <20170205133727.23424-7-zxq_yx_007@163.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170205133727.23424-1-zxq_yx_007@163.com> References: <20170205133727.23424-1-zxq_yx_007@163.com> X-CM-TRANSID: DsCowACnVrepKpdYyVK9Ig--.30409S4 X-Coremail-Antispam: 1Uf129KBjvJXoW7tw4rtr1DGr4kGw1rCFykKrg_yoW8uw1UpF Z8ZF1kWrWDWFsFqw4fGryDXa98Ww1kJr12ya9rGws7C3WUtrs5tr1qyry7Jr4kGr9FvrW3 Za1xAr98Wa13Cr7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07bU9aPUUUUU= X-Originating-IP: [117.136.0.125] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/1tbiMwt1xlXlkEmg3gAAsc X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 220.181.12.14 Subject: [Qemu-devel] [RESEND PATCH 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: pbonzini@redhat.com, mark.cave-ayland@ilande.co.uk, atar4qemu@gmail.com, peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" assign DeviceClass::vmsd instead of using vmstate_register function Signed-off-by: xiaoqiang zhao --- hw/timer/m48t59.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/hw/timer/m48t59.c b/hw/timer/m48t59.c index 39e425e950..6afcce4669 100644 --- a/hw/timer/m48t59.c +++ b/hw/timer/m48t59.c @@ -639,6 +639,28 @@ static const VMStateDescription vmstate_m48t59 =3D { } }; =20 +static const VMStateDescription vmstate_m48t59_isa =3D { + .name =3D "m48t59", + .version_id =3D 1, + .minimum_version_id =3D 1, + .fields =3D (VMStateField[]) { + VMSTATE_STRUCT(state, M48txxISAState, 0, + vmstate_m48t59, M48t59State), + VMSTATE_END_OF_LIST() + } +}; + +static const VMStateDescription vmstate_m48t59_sys_bus =3D { + .name =3D "m48t59", + .version_id =3D 1, + .minimum_version_id =3D 1, + .fields =3D (VMStateField[]) { + VMSTATE_STRUCT(state, M48txxSysBusState, 0, + vmstate_m48t59, M48t59State), + VMSTATE_END_OF_LIST() + } +}; + static void m48t59_reset_common(M48t59State *NVRAM) { NVRAM->addr =3D 0; @@ -744,8 +766,6 @@ static 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_isa_realize(DeviceState *dev, Error **errp) @@ -824,6 +844,7 @@ static void m48txx_isa_class_init(ObjectClass *klass, v= oid *data) dc->realize =3D m48t59_isa_realize; dc->reset =3D m48t59_reset_isa; dc->props =3D m48t59_isa_properties; + dc->vmsd =3D &vmstate_m48t59_isa; nc->read =3D m48txx_isa_read; nc->write =3D m48txx_isa_write; nc->toggle_lock =3D m48txx_isa_toggle_lock; @@ -868,6 +889,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_sys_bus; 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 Mon Apr 29 14:38:51 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; 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 1486302268519698.6908630787482; Sun, 5 Feb 2017 05:44:28 -0800 (PST) Received: from localhost ([::1]:43305 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1caN7D-0004pd-2z for importer@patchew.org; Sun, 05 Feb 2017 08:44:27 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33683) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1caN1B-0000Av-5H for qemu-devel@nongnu.org; Sun, 05 Feb 2017 08:38:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1caN18-0003IS-QY for qemu-devel@nongnu.org; Sun, 05 Feb 2017 08:38:13 -0500 Received: from m12-14.163.com ([220.181.12.14]:60844) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1caN17-0003Ep-CK for qemu-devel@nongnu.org; Sun, 05 Feb 2017 08:38:10 -0500 Received: from localhost.localdomain (unknown [117.136.0.125]) by smtp10 (Coremail) with SMTP id DsCowACnVrepKpdYyVK9Ig--.30409S5; Sun, 05 Feb 2017 21:37:47 +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=YN3Ahw3He1E1FHqBN+zA6jwnNviP6UmaSi awCb1eXvvOs7r5Ejh7z6tUbHKkFCbHjatT+vpDM/h76pMBIz98EWcZi6ihTXpXZV WP4UynmNhOB8Tnk4XyHYkOKyKipq6P2gzTf2c3o6Yi2ks2hs9LqxDSrxqYHEw2pd aXqtb21ZA= From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Sun, 5 Feb 2017 21:37:25 +0800 Message-Id: <20170205133727.23424-8-zxq_yx_007@163.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170205133727.23424-1-zxq_yx_007@163.com> References: <20170205133727.23424-1-zxq_yx_007@163.com> X-CM-TRANSID: DsCowACnVrepKpdYyVK9Ig--.30409S5 X-Coremail-Antispam: 1Uf129KBjvJXoW7WF18KF45GFyfZw1UKw4Uurg_yoW8ur1DpF WxWF9rArnFyr4Dtw4xJF1DWFW8XFn7CF45Cw4ktws7AFn7W3WDJ3WUJrZ7tFWxJFWv9Fy3 A3yrWF13Zr45Jw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07bUdgZUUUUU= X-Originating-IP: [117.136.0.125] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/xtbB0gt1xlUMCmuL-AAAsl X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 220.181.12.14 Subject: [Qemu-devel] [RESEND PATCH 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: pbonzini@redhat.com, mark.cave-ayland@ilande.co.uk, atar4qemu@gmail.com, peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 Mon Apr 29 14:38:51 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; 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 1486302020181743.0012575323753; Sun, 5 Feb 2017 05:40:20 -0800 (PST) Received: from localhost ([::1]:43286 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1caN3C-0001KA-Dz for importer@patchew.org; Sun, 05 Feb 2017 08:40:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33671) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1caN1B-0000Ao-2j for qemu-devel@nongnu.org; Sun, 05 Feb 2017 08:38:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1caN17-0003HI-U7 for qemu-devel@nongnu.org; Sun, 05 Feb 2017 08:38:13 -0500 Received: from m12-14.163.com ([220.181.12.14]:60846) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1caN17-0003Eh-BF for qemu-devel@nongnu.org; Sun, 05 Feb 2017 08:38:09 -0500 Received: from localhost.localdomain (unknown [117.136.0.125]) by smtp10 (Coremail) with SMTP id DsCowAA3HrerKpdYVFO9Ig--.38574S2; Sun, 05 Feb 2017 21:37: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=9GQAfG7U5qp0pM5Re+ BUzm5NjFlGRrPt8iZZtc253TU=; b=JlUZexuh6yS/mVi02f1egWbbMTvmNa+mFD vRyatwZrUqZQLXzUu84ebWhBL6EjYei7jF8PXx33DKvbB1VpmRdttReTvUBz09VJ g+zS93jWgQU2eq8LjFgaaHTmrxdZemVhNnqZ4TSVV432bHstdK55BecJp7TX91lr tEPXpulyI= From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Sun, 5 Feb 2017 21:37:26 +0800 Message-Id: <20170205133727.23424-9-zxq_yx_007@163.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170205133727.23424-1-zxq_yx_007@163.com> References: <20170205133727.23424-1-zxq_yx_007@163.com> X-CM-TRANSID: DsCowAA3HrerKpdYVFO9Ig--.38574S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxWryxXr4ftr17WFWkCry5CFg_yoWrZry5pF 93ZFn5KFW5WFs7XrWxtr1kuFn8Jwn3Gw1fKr1xCrn29rn7Crn8AF4kA3ySvrWDGrWkuF1Y qrWDJryxua1UJ3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jkF4iUUUUU= X-Originating-IP: [117.136.0.125] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/1tbiOwx1xlXlXUbwaAAAs3 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 220.181.12.14 Subject: [Qemu-devel] [RESEND PATCH 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: pbonzini@redhat.com, mark.cave-ayland@ilande.co.uk, atar4qemu@gmail.com, peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Drop the old 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 f5b6efddf8..352ca0bb4c 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -584,30 +584,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" @@ -632,28 +625,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" @@ -706,16 +692,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 { @@ -725,9 +711,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 @@ -736,6 +720,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" @@ -749,14 +734,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, @@ -792,9 +777,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 Mon Apr 29 14:38:51 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; 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 1486302268755763.4320107993203; Sun, 5 Feb 2017 05:44:28 -0800 (PST) Received: from localhost ([::1]:43306 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1caN7D-0004qL-Gx for importer@patchew.org; Sun, 05 Feb 2017 08:44:27 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33684) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1caN1B-0000Aw-6D for qemu-devel@nongnu.org; Sun, 05 Feb 2017 08:38:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1caN17-0003HN-VX for qemu-devel@nongnu.org; Sun, 05 Feb 2017 08:38:13 -0500 Received: from m12-14.163.com ([220.181.12.14]:60845) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1caN17-0003Ek-Ax for qemu-devel@nongnu.org; Sun, 05 Feb 2017 08:38:09 -0500 Received: from localhost.localdomain (unknown [117.136.0.125]) by smtp10 (Coremail) with SMTP id DsCowAA3HrerKpdYVFO9Ig--.38574S3; Sun, 05 Feb 2017 21:37: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=1UMfUuHaCy4nWYjkud deev0xj9c9D7vOKbfPG5YBEW4=; b=DGGQ8xH6xkHF23sU6UIFwjL63xF0XCAuf8 SnXoLdTbxhYEYA0jCwH5xJON5yTstQNft9D+zxip5nnVqVtQa4JeYvCYBSyFmLY1 +wWCHvEtHId6qJ0wxcGxfXJhW7wBOukMHCB1j1M7jS085GN3bSLug1xEJwBf6xkM BfAMiUHbo= From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Sun, 5 Feb 2017 21:37:27 +0800 Message-Id: <20170205133727.23424-10-zxq_yx_007@163.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170205133727.23424-1-zxq_yx_007@163.com> References: <20170205133727.23424-1-zxq_yx_007@163.com> X-CM-TRANSID: DsCowAA3HrerKpdYVFO9Ig--.38574S3 X-Coremail-Antispam: 1Uf129KBjvJXoW7ZF1kJr4DCFWDGry8Xr43Jrb_yoW8Kw47pF Z3ZFn5GrWrWFZ7X3y7tr4ku3s8Jwn3K34fGr4xGrn29rnFkr95JFs8A3ySvr4DKrWkuF1Y qrWDJrWxGa1UG3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jlMKZUUUUU= X-Originating-IP: [117.136.0.125] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/1tbiMw11xlXlkEmg7AAAso X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 220.181.12.14 Subject: [Qemu-devel] [RESEND PATCH 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: pbonzini@redhat.com, mark.cave-ayland@ilande.co.uk, atar4qemu@gmail.com, peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Drop the old 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 d1a6bca873..5182be2e1f 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