From nobody Mon May 6 02:51:36 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.zohomail.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 1542630341511511.9525018364951; Mon, 19 Nov 2018 04:25:41 -0800 (PST) Received: from localhost ([::1]:55633 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOicW-0007Ty-7n for importer@patchew.org; Mon, 19 Nov 2018 07:25:40 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52702) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiMP-0001mV-0n for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gOiMM-0002uo-3R for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:00 -0500 Received: from cmccmta1.chinamobile.com ([221.176.66.79]:5333) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiML-0002nk-9A; Mon, 19 Nov 2018 07:08:58 -0500 Received: from spf.mail.chinamobile.com (unknown[172.16.121.7]) by rmmx-syy-dmz-app02-12002 (RichMail) with SMTP id 2ee25bf2a7c79f2-910e2; Mon, 19 Nov 2018 20:08:39 +0800 (CST) Received: from localhost.localdomain (unknown[112.25.154.149]) by rmsmtp-syy-appsvr04-12004 (RichMail) with SMTP id 2ee45bf2a7bf447-1050c; Mon, 19 Nov 2018 20:08:39 +0800 (CST) X-RM-TRANSID: 2ee25bf2a7c79f2-910e2 X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 X-RM-TRANSID: 2ee45bf2a7bf447-1050c From: Mao Zhongyi To: qemu-devel@nongnu.org Date: Mon, 19 Nov 2018 20:07:59 +0800 Message-Id: <20181119120820.29878-2-maozhongyi@cmss.chinamobile.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> References: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 221.176.66.79 Subject: [Qemu-devel] [PATCH 01/22] musicpal: Convert sysbus init function to realize function 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: peter.maydell@linaro.org, qemu-arm@nongnu.org, jan.kiszka@web.de, Zhang Shengju , Mao Zhongyi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use DeviceClass rather than SysBusDeviceClass in mv88w8618_wlan_class_init(). Cc: jan.kiszka@web.de Cc: peter.maydell@linaro.org Cc: qemu-arm@nongnu.org Signed-off-by: Mao Zhongyi Signed-off-by: Zhang Shengju Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/musicpal.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index 9648b3af44..7ffcdbb097 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -1147,14 +1147,13 @@ static const MemoryRegionOps mv88w8618_wlan_ops =3D= { .endianness =3D DEVICE_NATIVE_ENDIAN, }; =20 -static int mv88w8618_wlan_init(SysBusDevice *dev) +static void mv88w8618_wlan_realize(DeviceState *dev, Error **errp) { MemoryRegion *iomem =3D g_new(MemoryRegion, 1); =20 memory_region_init_io(iomem, OBJECT(dev), &mv88w8618_wlan_ops, NULL, "musicpal-wlan", MP_WLAN_SIZE); - sysbus_init_mmio(dev, iomem); - return 0; + sysbus_init_mmio(SYS_BUS_DEVICE(dev), iomem); } =20 /* GPIO register offsets */ @@ -1720,9 +1719,9 @@ DEFINE_MACHINE("musicpal", musicpal_machine_init) =20 static void mv88w8618_wlan_class_init(ObjectClass *klass, void *data) { - SysBusDeviceClass *sdc =3D SYS_BUS_DEVICE_CLASS(klass); + DeviceClass *dc =3D DEVICE_CLASS(klass); =20 - sdc->init =3D mv88w8618_wlan_init; + dc->realize =3D mv88w8618_wlan_realize; } =20 static const TypeInfo mv88w8618_wlan_info =3D { --=20 2.17.1 From nobody Mon May 6 02:51:36 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.zohomail.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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1542629635818396.49955300625743; Mon, 19 Nov 2018 04:13:55 -0800 (PST) Received: from localhost ([::1]:55565 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiR6-00061d-Ep for importer@patchew.org; Mon, 19 Nov 2018 07:13:52 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52812) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiMR-0001mo-B8 for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gOiMO-0002yl-No for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:03 -0500 Received: from cmccmta1.chinamobile.com ([221.176.66.79]:5334) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiML-0002ni-Vo; Mon, 19 Nov 2018 07:09:00 -0500 Received: from spf.mail.chinamobile.com (unknown[172.16.121.7]) by rmmx-syy-dmz-app02-12002 (RichMail) with SMTP id 2ee25bf2a7c79f3-910e3; Mon, 19 Nov 2018 20:08:40 +0800 (CST) Received: from localhost.localdomain (unknown[112.25.154.149]) by rmsmtp-syy-appsvr04-12004 (RichMail) with SMTP id 2ee45bf2a7bf447-1050e; Mon, 19 Nov 2018 20:08:40 +0800 (CST) X-RM-TRANSID: 2ee25bf2a7c79f3-910e3 X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 X-RM-TRANSID: 2ee45bf2a7bf447-1050e From: Mao Zhongyi To: qemu-devel@nongnu.org Date: Mon, 19 Nov 2018 20:08:00 +0800 Message-Id: <20181119120820.29878-3-maozhongyi@cmss.chinamobile.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> References: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 221.176.66.79 Subject: [Qemu-devel] [PATCH 02/22] block/noenand: Convert sysbus init function to realize function 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: kwolf@redhat.com, Zhang Shengju , qemu-block@nongnu.org, Mao Zhongyi , mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use DeviceClass rather than SysBusDeviceClass in onenand_class_init(). Cc: kwolf@redhat.com Cc: mreitz@redhat.com Cc: qemu-block@nongnu.org Signed-off-by: Mao Zhongyi Signed-off-by: Zhang Shengju --- hw/block/onenand.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/hw/block/onenand.c b/hw/block/onenand.c index 0cb8d7fa13..6bf89aac1d 100644 --- a/hw/block/onenand.c +++ b/hw/block/onenand.c @@ -768,9 +768,8 @@ static const MemoryRegionOps onenand_ops =3D { .endianness =3D DEVICE_NATIVE_ENDIAN, }; =20 -static int onenand_initfn(SysBusDevice *sbd) +static void onenand_realize(DeviceState *dev, Error **errp) { - DeviceState *dev =3D DEVICE(sbd); OneNANDState *s =3D ONE_NAND(dev); uint32_t size =3D 1 << (24 + ((s->id.dev >> 4) & 7)); void *ram; @@ -790,14 +789,14 @@ static int onenand_initfn(SysBusDevice *sbd) 0xff, size + (size >> 5)); } else { if (blk_is_read_only(s->blk)) { - error_report("Can't use a read-only drive"); - return -1; + error_setg(errp, "Can't use a read-only drive"); + return; } blk_set_perm(s->blk, BLK_PERM_CONSISTENT_READ | BLK_PERM_WRITE, BLK_PERM_ALL, &local_err); if (local_err) { - error_report_err(local_err); - return -1; + error_propagate(errp, local_err); + return; } s->blk_cur =3D s->blk; } @@ -814,15 +813,14 @@ static int onenand_initfn(SysBusDevice *sbd) s->data[1][0] =3D ram + ((0x0200 + (1 << (PAGE_SHIFT - 1))) << s->shif= t); s->data[1][1] =3D ram + ((0x8010 + (1 << (PAGE_SHIFT - 6))) << s->shif= t); onenand_mem_setup(s); - sysbus_init_irq(sbd, &s->intr); - sysbus_init_mmio(sbd, &s->container); + sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->intr); + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->container); vmstate_register(dev, ((s->shift & 0x7f) << 24) | ((s->id.man & 0xff) << 16) | ((s->id.dev & 0xff) << 8) | (s->id.ver & 0xff), &vmstate_onenand, s); - return 0; } =20 static Property onenand_properties[] =3D { @@ -837,9 +835,8 @@ static Property onenand_properties[] =3D { static void onenand_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); =20 - k->init =3D onenand_initfn; + dc->realize =3D onenand_realize; dc->reset =3D onenand_system_reset; dc->props =3D onenand_properties; } --=20 2.17.1 From nobody Mon May 6 02:51:36 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.zohomail.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 154263032649776.09624462980389; Mon, 19 Nov 2018 04:25:26 -0800 (PST) Received: from localhost ([::1]:55630 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOicH-0007ET-7G for importer@patchew.org; Mon, 19 Nov 2018 07:25:25 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52716) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiMP-0001mc-4e for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gOiMN-0002wl-FM for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:00 -0500 Received: from cmccmta3.chinamobile.com ([221.176.66.81]:21647) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiML-0002oa-Rc for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:08:59 -0500 Received: from spf.mail.chinamobile.com (unknown[172.16.121.7]) by rmmx-syy-dmz-app09-12009 (RichMail) with SMTP id 2ee95bf2a7c8b5f-91b06; Mon, 19 Nov 2018 20:08:40 +0800 (CST) Received: from localhost.localdomain (unknown[112.25.154.149]) by rmsmtp-syy-appsvr04-12004 (RichMail) with SMTP id 2ee45bf2a7bf447-1050f; Mon, 19 Nov 2018 20:08:40 +0800 (CST) X-RM-TRANSID: 2ee95bf2a7c8b5f-91b06 X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 X-RM-TRANSID: 2ee45bf2a7bf447-1050f From: Mao Zhongyi To: qemu-devel@nongnu.org Date: Mon, 19 Nov 2018 20:08:01 +0800 Message-Id: <20181119120820.29878-4-maozhongyi@cmss.chinamobile.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> References: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 221.176.66.81 Subject: [Qemu-devel] [PATCH 03/22] char/grlib_apbuart: Convert sysbus init function to realize function 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: marcandre.lureau@redhat.com, Zhang Shengju , chouteau@adacore.com, Mao Zhongyi , pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use DeviceClass rather than SysBusDeviceClass in grlib_apbuart_class_init(). Cc: chouteau@adacore.com Cc: marcandre.lureau@redhat.com Cc: pbonzini@redhat.com Signed-off-by: Mao Zhongyi Signed-off-by: Zhang Shengju --- hw/char/grlib_apbuart.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/hw/char/grlib_apbuart.c b/hw/char/grlib_apbuart.c index bac11bec58..e73ecf2ea5 100644 --- a/hw/char/grlib_apbuart.c +++ b/hw/char/grlib_apbuart.c @@ -239,7 +239,7 @@ static const MemoryRegionOps grlib_apbuart_ops =3D { .endianness =3D DEVICE_NATIVE_ENDIAN, }; =20 -static int grlib_apbuart_init(SysBusDevice *dev) +static void grlib_apbuart_realize(DeviceState *dev, Error **errp) { UART *uart =3D GRLIB_APB_UART(dev); =20 @@ -249,14 +249,12 @@ static int grlib_apbuart_init(SysBusDevice *dev) grlib_apbuart_event, NULL, uart, NULL, true); =20 - sysbus_init_irq(dev, &uart->irq); + sysbus_init_irq(SYS_BUS_DEVICE(dev), &uart->irq); =20 memory_region_init_io(&uart->iomem, OBJECT(uart), &grlib_apbuart_ops, = uart, "uart", UART_REG_SIZE); =20 - sysbus_init_mmio(dev, &uart->iomem); - - return 0; + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &uart->iomem); } =20 static void grlib_apbuart_reset(DeviceState *d) @@ -280,9 +278,8 @@ static Property grlib_apbuart_properties[] =3D { static void grlib_apbuart_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); =20 - k->init =3D grlib_apbuart_init; + dc->realize =3D grlib_apbuart_realize; dc->reset =3D grlib_apbuart_reset; dc->props =3D grlib_apbuart_properties; } --=20 2.17.1 From nobody Mon May 6 02:51:36 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.zohomail.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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1542629635803664.137974127511; Mon, 19 Nov 2018 04:13:55 -0800 (PST) Received: from localhost ([::1]:55562 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiR3-0005yp-MF for importer@patchew.org; Mon, 19 Nov 2018 07:13:49 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52713) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiMP-0001mb-42 for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gOiML-0002uG-PP for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:00 -0500 Received: from cmccmta1.chinamobile.com ([221.176.66.79]:51681) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiMK-0002p1-V0 for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:08:57 -0500 Received: from spf.mail.chinamobile.com (unknown[172.16.121.7]) by rmmx-syy-dmz-app03-12003 (RichMail) with SMTP id 2ee35bf2a7c8bef-914b0; Mon, 19 Nov 2018 20:08:41 +0800 (CST) Received: from localhost.localdomain (unknown[112.25.154.149]) by rmsmtp-syy-appsvr04-12004 (RichMail) with SMTP id 2ee45bf2a7bf447-10511; Mon, 19 Nov 2018 20:08:40 +0800 (CST) X-RM-TRANSID: 2ee35bf2a7c8bef-914b0 X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 X-RM-TRANSID: 2ee45bf2a7bf447-10511 From: Mao Zhongyi To: qemu-devel@nongnu.org Date: Mon, 19 Nov 2018 20:08:02 +0800 Message-Id: <20181119120820.29878-5-maozhongyi@cmss.chinamobile.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> References: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 221.176.66.79 Subject: [Qemu-devel] [PATCH 04/22] core/empty_slot: Convert sysbus init function to realize function 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: Zhang Shengju , Mao Zhongyi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use DeviceClass rather than SysBusDeviceClass in empty_slot_class_init(). Signed-off-by: Mao Zhongyi Signed-off-by: Zhang Shengju Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/core/empty_slot.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/hw/core/empty_slot.c b/hw/core/empty_slot.c index c1b9c2b104..239f78e2a7 100644 --- a/hw/core/empty_slot.c +++ b/hw/core/empty_slot.c @@ -71,21 +71,20 @@ void empty_slot_init(hwaddr addr, uint64_t slot_size) } } =20 -static int empty_slot_init1(SysBusDevice *dev) +static void empty_slot_realize(DeviceState *dev, Error **errp) { EmptySlot *s =3D EMPTY_SLOT(dev); =20 memory_region_init_io(&s->iomem, OBJECT(s), &empty_slot_ops, s, "empty-slot", s->size); - sysbus_init_mmio(dev, &s->iomem); - return 0; + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->iomem); } =20 static void empty_slot_class_init(ObjectClass *klass, void *data) { - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); + DeviceClass *dc =3D DEVICE_CLASS(klass); =20 - k->init =3D empty_slot_init1; + dc->realize =3D empty_slot_realize; } =20 static const TypeInfo empty_slot_info =3D { --=20 2.17.1 From nobody Mon May 6 02:51:36 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.zohomail.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 1542630595601162.8056796080316; Mon, 19 Nov 2018 04:29:55 -0800 (PST) Received: from localhost ([::1]:55693 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOigc-0002rx-I4 for importer@patchew.org; Mon, 19 Nov 2018 07:29:54 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52731) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiMP-0001mh-Kn for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gOiMO-0002xg-12 for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:01 -0500 Received: from cmccmta3.chinamobile.com ([221.176.66.81]:14291) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiMM-0002oT-JO for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:08:59 -0500 Received: from spf.mail.chinamobile.com (unknown[172.16.121.7]) by rmmx-syy-dmz-app12-12012 (RichMail) with SMTP id 2eec5bf2a7c83d7-90e36; Mon, 19 Nov 2018 20:08:41 +0800 (CST) Received: from localhost.localdomain (unknown[112.25.154.149]) by rmsmtp-syy-appsvr04-12004 (RichMail) with SMTP id 2ee45bf2a7bf447-10513; Mon, 19 Nov 2018 20:08:41 +0800 (CST) X-RM-TRANSID: 2eec5bf2a7c83d7-90e36 X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 X-RM-TRANSID: 2ee45bf2a7bf447-10513 From: Mao Zhongyi To: qemu-devel@nongnu.org Date: Mon, 19 Nov 2018 20:08:03 +0800 Message-Id: <20181119120820.29878-6-maozhongyi@cmss.chinamobile.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> References: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 221.176.66.81 Subject: [Qemu-devel] [PATCH 05/22] display/g364fb: Convert sysbus init function to realize function 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: Mao Zhongyi , f4bug@amsat.org, alistair.francis@wdc.com, kraxel@redhat.com, pbonzini@redhat.com, Zhang Shengju Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use DeviceClass rather than SysBusDeviceClass in g364fb_sysbus_class_init(). Cc: pbonzini@redhat.com Cc: kraxel@redhat.com Cc: f4bug@amsat.org Cc: alistair.francis@wdc.com Signed-off-by: Mao Zhongyi Signed-off-by: Zhang Shengju Reviewed-by: Alistair Francis --- hw/display/g364fb.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/hw/display/g364fb.c b/hw/display/g364fb.c index 8ad7e5d824..e7f67088b0 100644 --- a/hw/display/g364fb.c +++ b/hw/display/g364fb.c @@ -489,18 +489,15 @@ typedef struct { G364State g364; } G364SysBusState; =20 -static int g364fb_sysbus_init(SysBusDevice *sbd) +static void g364fb_sysbus_realize(DeviceState *dev, Error **errp) { - DeviceState *dev =3D DEVICE(sbd); G364SysBusState *sbs =3D G364(dev); G364State *s =3D &sbs->g364; =20 g364fb_init(dev, s); - sysbus_init_irq(sbd, &s->irq); - sysbus_init_mmio(sbd, &s->mem_ctrl); - sysbus_init_mmio(sbd, &s->mem_vram); - - return 0; + sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->irq); + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->mem_ctrl); + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->mem_vram); } =20 static void g364fb_sysbus_reset(DeviceState *d) @@ -518,9 +515,8 @@ static Property g364fb_sysbus_properties[] =3D { static void g364fb_sysbus_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); =20 - k->init =3D g364fb_sysbus_init; + dc->realize =3D g364fb_sysbus_realize; set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories); dc->desc =3D "G364 framebuffer"; dc->reset =3D g364fb_sysbus_reset; --=20 2.17.1 From nobody Mon May 6 02:51:36 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.zohomail.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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1542629478190611.0844555781508; Mon, 19 Nov 2018 04:11:18 -0800 (PST) Received: from localhost ([::1]:55549 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiON-00035o-JZ for importer@patchew.org; Mon, 19 Nov 2018 07:11:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52710) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiMP-0001mZ-3k for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gOiMM-0002vA-B6 for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:00 -0500 Received: from cmccmta1.chinamobile.com ([221.176.66.79]:55438) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiML-0002pS-Fh for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:08:58 -0500 Received: from spf.mail.chinamobile.com (unknown[172.16.121.7]) by rmmx-syy-dmz-app01-12001 (RichMail) with SMTP id 2ee15bf2a7c8c63-91075; Mon, 19 Nov 2018 20:08:42 +0800 (CST) Received: from localhost.localdomain (unknown[112.25.154.149]) by rmsmtp-syy-appsvr04-12004 (RichMail) with SMTP id 2ee45bf2a7bf447-10516; Mon, 19 Nov 2018 20:08:41 +0800 (CST) X-RM-TRANSID: 2ee15bf2a7c8c63-91075 X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 X-RM-TRANSID: 2ee45bf2a7bf447-10516 From: Mao Zhongyi To: qemu-devel@nongnu.org Date: Mon, 19 Nov 2018 20:08:04 +0800 Message-Id: <20181119120820.29878-7-maozhongyi@cmss.chinamobile.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> References: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 221.176.66.79 Subject: [Qemu-devel] [PATCH 06/22] dma/puv3_dma: Convert sysbus init function to realize function 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: gxt@mprc.pku.edu.cn, Zhang Shengju , Mao Zhongyi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use DeviceClass rather than SysBusDeviceClass in puv3_dma_class_init(). Cc: gxt@mprc.pku.edu.cn Signed-off-by: Mao Zhongyi Signed-off-by: Zhang Shengju Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/dma/puv3_dma.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/hw/dma/puv3_dma.c b/hw/dma/puv3_dma.c index b97a6c1767..c89eade029 100644 --- a/hw/dma/puv3_dma.c +++ b/hw/dma/puv3_dma.c @@ -76,7 +76,7 @@ static const MemoryRegionOps puv3_dma_ops =3D { .endianness =3D DEVICE_NATIVE_ENDIAN, }; =20 -static int puv3_dma_init(SysBusDevice *dev) +static void puv3_dma_realize(DeviceState *dev, Error **errp) { PUV3DMAState *s =3D PUV3_DMA(dev); int i; @@ -87,16 +87,14 @@ static int puv3_dma_init(SysBusDevice *dev) =20 memory_region_init_io(&s->iomem, OBJECT(s), &puv3_dma_ops, s, "puv3_dm= a", PUV3_REGS_OFFSET); - sysbus_init_mmio(dev, &s->iomem); - - return 0; + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->iomem); } =20 static void puv3_dma_class_init(ObjectClass *klass, void *data) { - SysBusDeviceClass *sdc =3D SYS_BUS_DEVICE_CLASS(klass); + DeviceClass *dc =3D DEVICE_CLASS(klass); =20 - sdc->init =3D puv3_dma_init; + dc->realize =3D puv3_dma_realize; } =20 static const TypeInfo puv3_dma_info =3D { --=20 2.17.1 From nobody Mon May 6 02:51:36 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.zohomail.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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 15426301625741015.2114314499339; Mon, 19 Nov 2018 04:22:42 -0800 (PST) Received: from localhost ([::1]:55613 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiZQ-0004cA-Pp for importer@patchew.org; Mon, 19 Nov 2018 07:22:28 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52704) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiMP-0001mW-14 for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gOiML-0002u6-Ki for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:00 -0500 Received: from cmccmta1.chinamobile.com ([221.176.66.79]:5335) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiMK-0002ol-Rq for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:08:57 -0500 Received: from spf.mail.chinamobile.com (unknown[172.16.121.7]) by rmmx-syy-dmz-app02-12002 (RichMail) with SMTP id 2ee25bf2a7ca9f9-910e9; Mon, 19 Nov 2018 20:08:42 +0800 (CST) Received: from localhost.localdomain (unknown[112.25.154.149]) by rmsmtp-syy-appsvr04-12004 (RichMail) with SMTP id 2ee45bf2a7bf447-10518; Mon, 19 Nov 2018 20:08:42 +0800 (CST) X-RM-TRANSID: 2ee25bf2a7ca9f9-910e9 X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 X-RM-TRANSID: 2ee45bf2a7bf447-10518 From: Mao Zhongyi To: qemu-devel@nongnu.org Date: Mon, 19 Nov 2018 20:08:05 +0800 Message-Id: <20181119120820.29878-8-maozhongyi@cmss.chinamobile.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> References: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 221.176.66.79 Subject: [Qemu-devel] [PATCH 07/22] gpio/puv3_gpio: Convert sysbus init function to realize function 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: gxt@mprc.pku.edu.cn, Zhang Shengju , Mao Zhongyi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use DeviceClass rather than SysBusDeviceClass in puv3_gpio_class_init(). Cc: gxt@mprc.pku.edu.cn Signed-off-by: Mao Zhongyi Signed-off-by: Zhang Shengju --- hw/gpio/puv3_gpio.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/hw/gpio/puv3_gpio.c b/hw/gpio/puv3_gpio.c index 445afccf9f..bd6fc43aae 100644 --- a/hw/gpio/puv3_gpio.c +++ b/hw/gpio/puv3_gpio.c @@ -99,7 +99,7 @@ static const MemoryRegionOps puv3_gpio_ops =3D { .endianness =3D DEVICE_NATIVE_ENDIAN, }; =20 -static int puv3_gpio_init(SysBusDevice *dev) +static void puv3_gpio_realize(DeviceState *dev, Error **errp) { PUV3GPIOState *s =3D PUV3_GPIO(dev); =20 @@ -107,28 +107,26 @@ static int puv3_gpio_init(SysBusDevice *dev) s->reg_GPDR =3D 0; =20 /* FIXME: these irqs not handled yet */ - sysbus_init_irq(dev, &s->irq[PUV3_IRQS_GPIOLOW0]); - sysbus_init_irq(dev, &s->irq[PUV3_IRQS_GPIOLOW1]); - sysbus_init_irq(dev, &s->irq[PUV3_IRQS_GPIOLOW2]); - sysbus_init_irq(dev, &s->irq[PUV3_IRQS_GPIOLOW3]); - sysbus_init_irq(dev, &s->irq[PUV3_IRQS_GPIOLOW4]); - sysbus_init_irq(dev, &s->irq[PUV3_IRQS_GPIOLOW5]); - sysbus_init_irq(dev, &s->irq[PUV3_IRQS_GPIOLOW6]); - sysbus_init_irq(dev, &s->irq[PUV3_IRQS_GPIOLOW7]); - sysbus_init_irq(dev, &s->irq[PUV3_IRQS_GPIOHIGH]); + sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->irq[PUV3_IRQS_GPIOLOW0]); + sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->irq[PUV3_IRQS_GPIOLOW1]); + sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->irq[PUV3_IRQS_GPIOLOW2]); + sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->irq[PUV3_IRQS_GPIOLOW3]); + sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->irq[PUV3_IRQS_GPIOLOW4]); + sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->irq[PUV3_IRQS_GPIOLOW5]); + sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->irq[PUV3_IRQS_GPIOLOW6]); + sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->irq[PUV3_IRQS_GPIOLOW7]); + sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->irq[PUV3_IRQS_GPIOHIGH]); =20 memory_region_init_io(&s->iomem, OBJECT(s), &puv3_gpio_ops, s, "puv3_g= pio", PUV3_REGS_OFFSET); - sysbus_init_mmio(dev, &s->iomem); - - return 0; + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->iomem); } =20 static void puv3_gpio_class_init(ObjectClass *klass, void *data) { - SysBusDeviceClass *sdc =3D SYS_BUS_DEVICE_CLASS(klass); + DeviceClass *dc =3D DEVICE_CLASS(klass); =20 - sdc->init =3D puv3_gpio_init; + dc->realize =3D puv3_gpio_realize; } =20 static const TypeInfo puv3_gpio_info =3D { --=20 2.17.1 From nobody Mon May 6 02:51:36 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 15426294852081005.5360941992171; Mon, 19 Nov 2018 04:11:25 -0800 (PST) Received: from localhost ([::1]:55552 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiOQ-00038O-SS for importer@patchew.org; Mon, 19 Nov 2018 07:11:06 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52739) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiMP-0001mj-P0 for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gOiMM-0002vH-Bo for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:01 -0500 Received: from cmccmta2.chinamobile.com ([221.176.66.80]:24190) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiML-0002q1-JR for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:08:58 -0500 Received: from spf.mail.chinamobile.com (unknown[172.16.121.7]) by rmmx-syy-dmz-app08-12008 (RichMail) with SMTP id 2ee85bf2a7ca694-90c2d; Mon, 19 Nov 2018 20:08:42 +0800 (CST) Received: from localhost.localdomain (unknown[112.25.154.149]) by rmsmtp-syy-appsvr04-12004 (RichMail) with SMTP id 2ee45bf2a7bf447-1051d; Mon, 19 Nov 2018 20:08:42 +0800 (CST) X-RM-TRANSID: 2ee85bf2a7ca694-90c2d X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 X-RM-TRANSID: 2ee45bf2a7bf447-1051d From: Mao Zhongyi To: qemu-devel@nongnu.org Date: Mon, 19 Nov 2018 20:08:06 +0800 Message-Id: <20181119120820.29878-9-maozhongyi@cmss.chinamobile.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> References: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 221.176.66.80 Subject: [Qemu-devel] [PATCH 08/22] milkymist-softusb: Convert sysbus init function to realize function 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: michael@walle.cc, Zhang Shengju , Mao Zhongyi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use DeviceClass rather than SysBusDeviceClass in milkymist_softusb_class_init(). Cc: michael@walle.cc Signed-off-by: Mao Zhongyi Signed-off-by: Zhang Shengju --- hw/input/milkymist-softusb.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/hw/input/milkymist-softusb.c b/hw/input/milkymist-softusb.c index ef8f47cd83..6e4cb29205 100644 --- a/hw/input/milkymist-softusb.c +++ b/hw/input/milkymist-softusb.c @@ -245,32 +245,30 @@ static void milkymist_softusb_reset(DeviceState *d) s->regs[R_CTRL] =3D CTRL_RESET; } =20 -static int milkymist_softusb_init(SysBusDevice *dev) +static void milkymist_softusb_realize(DeviceState *dev, Error **errp) { MilkymistSoftUsbState *s =3D MILKYMIST_SOFTUSB(dev); =20 - sysbus_init_irq(dev, &s->irq); + sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->irq); =20 memory_region_init_io(&s->regs_region, OBJECT(s), &softusb_mmio_ops, s, "milkymist-softusb", R_MAX * 4); - sysbus_init_mmio(dev, &s->regs_region); + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->regs_region); =20 /* register pmem and dmem */ memory_region_init_ram_nomigrate(&s->pmem, OBJECT(s), "milkymist-softu= sb.pmem", s->pmem_size, &error_fatal); vmstate_register_ram_global(&s->pmem); s->pmem_ptr =3D memory_region_get_ram_ptr(&s->pmem); - sysbus_init_mmio(dev, &s->pmem); + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->pmem); memory_region_init_ram_nomigrate(&s->dmem, OBJECT(s), "milkymist-softu= sb.dmem", s->dmem_size, &error_fatal); vmstate_register_ram_global(&s->dmem); s->dmem_ptr =3D memory_region_get_ram_ptr(&s->dmem); - sysbus_init_mmio(dev, &s->dmem); + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->dmem); =20 hid_init(&s->hid_kbd, HID_KEYBOARD, softusb_kbd_hid_datain); hid_init(&s->hid_mouse, HID_MOUSE, softusb_mouse_hid_datain); - - return 0; } =20 static const VMStateDescription vmstate_milkymist_softusb =3D { @@ -296,9 +294,8 @@ static Property milkymist_softusb_properties[] =3D { static void milkymist_softusb_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); =20 - k->init =3D milkymist_softusb_init; + dc->realize =3D milkymist_softusb_realize; dc->reset =3D milkymist_softusb_reset; dc->vmsd =3D &vmstate_milkymist_softusb; dc->props =3D milkymist_softusb_properties; --=20 2.17.1 From nobody Mon May 6 02:51:36 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.zohomail.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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1542629478197189.55271559219955; Mon, 19 Nov 2018 04:11:18 -0800 (PST) Received: from localhost ([::1]:55551 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiOP-00037Y-Fw for importer@patchew.org; Mon, 19 Nov 2018 07:11:05 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52711) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiMP-0001ma-3m for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gOiMM-0002w6-SD for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:00 -0500 Received: from cmccmta1.chinamobile.com ([221.176.66.79]:5336) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiML-0002oi-Vl; Mon, 19 Nov 2018 07:08:58 -0500 Received: from spf.mail.chinamobile.com (unknown[172.16.121.7]) by rmmx-syy-dmz-app02-12002 (RichMail) with SMTP id 2ee25bf2a7cb9fb-910eb; Mon, 19 Nov 2018 20:08:43 +0800 (CST) Received: from localhost.localdomain (unknown[112.25.154.149]) by rmsmtp-syy-appsvr04-12004 (RichMail) with SMTP id 2ee45bf2a7bf447-10521; Mon, 19 Nov 2018 20:08:43 +0800 (CST) X-RM-TRANSID: 2ee25bf2a7cb9fb-910eb X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 X-RM-TRANSID: 2ee45bf2a7bf447-10521 From: Mao Zhongyi To: qemu-devel@nongnu.org Date: Mon, 19 Nov 2018 20:08:07 +0800 Message-Id: <20181119120820.29878-10-maozhongyi@cmss.chinamobile.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> References: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 221.176.66.79 Subject: [Qemu-devel] [PATCH 09/22] input/pl050: Convert sysbus init function to realize function 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: peter.maydell@linaro.org, qemu-arm@nongnu.org, Zhang Shengju , Mao Zhongyi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use DeviceClass rather than SysBusDeviceClass in pl050_class_init(). Cc: peter.maydell@linaro.org Cc: qemu-arm@nongnu.org Signed-off-by: Mao Zhongyi Signed-off-by: Zhang Shengju --- hw/input/pl050.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/hw/input/pl050.c b/hw/input/pl050.c index be9cd57b17..f341c26a63 100644 --- a/hw/input/pl050.c +++ b/hw/input/pl050.c @@ -139,19 +139,18 @@ static const MemoryRegionOps pl050_ops =3D { .endianness =3D DEVICE_NATIVE_ENDIAN, }; =20 -static int pl050_initfn(SysBusDevice *dev) +static void pl050_realize(DeviceState *dev, Error **errp) { PL050State *s =3D PL050(dev); =20 memory_region_init_io(&s->iomem, OBJECT(s), &pl050_ops, s, "pl050", 0x= 1000); - sysbus_init_mmio(dev, &s->iomem); - sysbus_init_irq(dev, &s->irq); + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->iomem); + sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->irq); if (s->is_mouse) { s->dev =3D ps2_mouse_init(pl050_update, s); } else { s->dev =3D ps2_kbd_init(pl050_update, s); } - return 0; } =20 static void pl050_keyboard_init(Object *obj) @@ -183,9 +182,8 @@ static const TypeInfo pl050_mouse_info =3D { static void pl050_class_init(ObjectClass *oc, void *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); - SysBusDeviceClass *sdc =3D SYS_BUS_DEVICE_CLASS(oc); =20 - sdc->init =3D pl050_initfn; + dc->realize =3D pl050_realize; dc->vmsd =3D &vmstate_pl050; } =20 --=20 2.17.1 From nobody Mon May 6 02:51:36 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.zohomail.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 1542630172732500.8453159477016; Mon, 19 Nov 2018 04:22:52 -0800 (PST) Received: from localhost ([::1]:55615 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiZh-0004oj-Oa for importer@patchew.org; Mon, 19 Nov 2018 07:22:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52718) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiMP-0001me-5Q for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gOiMN-0002wy-Go for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:01 -0500 Received: from cmccmta3.chinamobile.com ([221.176.66.81]:21648) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiMM-0002od-L9 for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:08:59 -0500 Received: from spf.mail.chinamobile.com (unknown[172.16.121.7]) by rmmx-syy-dmz-app09-12009 (RichMail) with SMTP id 2ee95bf2a7cab63-91b0a; Mon, 19 Nov 2018 20:08:43 +0800 (CST) Received: from localhost.localdomain (unknown[112.25.154.149]) by rmsmtp-syy-appsvr04-12004 (RichMail) with SMTP id 2ee45bf2a7bf447-10524; Mon, 19 Nov 2018 20:08:43 +0800 (CST) X-RM-TRANSID: 2ee95bf2a7cab63-91b0a X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 X-RM-TRANSID: 2ee45bf2a7bf447-10524 From: Mao Zhongyi To: qemu-devel@nongnu.org Date: Mon, 19 Nov 2018 20:08:08 +0800 Message-Id: <20181119120820.29878-11-maozhongyi@cmss.chinamobile.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> References: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 221.176.66.81 Subject: [Qemu-devel] [PATCH 10/22] intc/puv3_intc: Convert sysbus init function to realize function 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: gxt@mprc.pku.edu.cn, Zhang Shengju , Mao Zhongyi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use DeviceClass rather than SysBusDeviceClass in puv3_intc_class_init(). Cc: gxt@mprc.pku.edu.cn Signed-off-by: Mao Zhongyi Signed-off-by: Zhang Shengju --- hw/intc/puv3_intc.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/hw/intc/puv3_intc.c b/hw/intc/puv3_intc.c index ef8488aacc..dfef505c47 100644 --- a/hw/intc/puv3_intc.c +++ b/hw/intc/puv3_intc.c @@ -101,29 +101,25 @@ static const MemoryRegionOps puv3_intc_ops =3D { .endianness =3D DEVICE_NATIVE_ENDIAN, }; =20 -static int puv3_intc_init(SysBusDevice *sbd) +static void puv3_intc_realize(DeviceState *dev, Error **errp) { - DeviceState *dev =3D DEVICE(sbd); PUV3INTCState *s =3D PUV3_INTC(dev); =20 qdev_init_gpio_in(dev, puv3_intc_handler, PUV3_IRQS_NR); - sysbus_init_irq(sbd, &s->parent_irq); + sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->parent_irq); =20 s->reg_ICMR =3D 0; s->reg_ICPR =3D 0; =20 memory_region_init_io(&s->iomem, OBJECT(s), &puv3_intc_ops, s, "puv3_i= ntc", PUV3_REGS_OFFSET); - sysbus_init_mmio(sbd, &s->iomem); - - return 0; + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->iomem); } =20 static void puv3_intc_class_init(ObjectClass *klass, void *data) { - SysBusDeviceClass *sdc =3D SYS_BUS_DEVICE_CLASS(klass); - - sdc->init =3D puv3_intc_init; + DeviceClass *dc =3D DEVICE_CLASS(klass); + dc->realize =3D puv3_intc_realize; } =20 static const TypeInfo puv3_intc_info =3D { --=20 2.17.1 From nobody Mon May 6 02:51:36 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 154262948511458.05053085442364; Mon, 19 Nov 2018 04:11:25 -0800 (PST) Received: from localhost ([::1]:55550 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiOP-000374-JZ for importer@patchew.org; Mon, 19 Nov 2018 07:11:05 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52705) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiMP-0001mX-1o for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gOiMN-0002xQ-Oz for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:00 -0500 Received: from cmccmta1.chinamobile.com ([221.176.66.79]:24224) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiMM-0002r6-Tb for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:08:59 -0500 Received: from spf.mail.chinamobile.com (unknown[172.16.121.7]) by rmmx-syy-dmz-app04-12004 (RichMail) with SMTP id 2ee45bf2a7cb01a-91a54; Mon, 19 Nov 2018 20:08:44 +0800 (CST) Received: from localhost.localdomain (unknown[112.25.154.149]) by rmsmtp-syy-appsvr04-12004 (RichMail) with SMTP id 2ee45bf2a7bf447-10528; Mon, 19 Nov 2018 20:08:43 +0800 (CST) X-RM-TRANSID: 2ee45bf2a7cb01a-91a54 X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 X-RM-TRANSID: 2ee45bf2a7bf447-10528 From: Mao Zhongyi To: qemu-devel@nongnu.org Date: Mon, 19 Nov 2018 20:08:09 +0800 Message-Id: <20181119120820.29878-12-maozhongyi@cmss.chinamobile.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> References: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 221.176.66.79 Subject: [Qemu-devel] [PATCH 11/22] milkymist-hpdmc: Convert sysbus init function to realize function 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: michael@walle.cc, gxt@mprc.pku.edu.cn, Zhang Shengju , Mao Zhongyi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use DeviceClass rather than SysBusDeviceClass in milkymist_hpdmc_class_init(). Cc: gxt@mprc.pku.edu.cn Cc: michael@walle.cc Signed-off-by: Mao Zhongyi Signed-off-by: Zhang Shengju Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/intc/puv3_intc.c | 1 + hw/misc/milkymist-hpdmc.c | 9 +++------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/hw/intc/puv3_intc.c b/hw/intc/puv3_intc.c index dfef505c47..a3ca6d466b 100644 --- a/hw/intc/puv3_intc.c +++ b/hw/intc/puv3_intc.c @@ -119,6 +119,7 @@ static void puv3_intc_realize(DeviceState *dev, Error *= *errp) static void puv3_intc_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); + dc->realize =3D puv3_intc_realize; } =20 diff --git a/hw/misc/milkymist-hpdmc.c b/hw/misc/milkymist-hpdmc.c index e6140eec6b..44dc0698ec 100644 --- a/hw/misc/milkymist-hpdmc.c +++ b/hw/misc/milkymist-hpdmc.c @@ -129,15 +129,13 @@ static void milkymist_hpdmc_reset(DeviceState *d) | IODELAY_PLL2_LOCKED; } =20 -static int milkymist_hpdmc_init(SysBusDevice *dev) +static void milkymist_hpdmc_realize(DeviceState *dev, Error **errp) { MilkymistHpdmcState *s =3D MILKYMIST_HPDMC(dev); =20 memory_region_init_io(&s->regs_region, OBJECT(dev), &hpdmc_mmio_ops, s, "milkymist-hpdmc", R_MAX * 4); - sysbus_init_mmio(dev, &s->regs_region); - - return 0; + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->regs_region); } =20 static const VMStateDescription vmstate_milkymist_hpdmc =3D { @@ -153,9 +151,8 @@ static const VMStateDescription vmstate_milkymist_hpdmc= =3D { static void milkymist_hpdmc_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); =20 - k->init =3D milkymist_hpdmc_init; + dc->realize =3D milkymist_hpdmc_realize; dc->reset =3D milkymist_hpdmc_reset; dc->vmsd =3D &vmstate_milkymist_hpdmc; } --=20 2.17.1 From nobody Mon May 6 02:51:36 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1542629794119881.9135384155524; Mon, 19 Nov 2018 04:16:34 -0800 (PST) Received: from localhost ([::1]:55586 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiTX-00089g-2O for importer@patchew.org; Mon, 19 Nov 2018 07:16:23 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52804) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiMR-0001mm-8r for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gOiMO-0002xl-2A for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:03 -0500 Received: from cmccmta1.chinamobile.com ([221.176.66.79]:55439) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiMK-0002pQ-SI for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:08:59 -0500 Received: from spf.mail.chinamobile.com (unknown[172.16.121.7]) by rmmx-syy-dmz-app01-12001 (RichMail) with SMTP id 2ee15bf2a7cbc66-91078; Mon, 19 Nov 2018 20:08:44 +0800 (CST) Received: from localhost.localdomain (unknown[112.25.154.149]) by rmsmtp-syy-appsvr04-12004 (RichMail) with SMTP id 2ee45bf2a7bf447-1052a; Mon, 19 Nov 2018 20:08:44 +0800 (CST) X-RM-TRANSID: 2ee15bf2a7cbc66-91078 X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 X-RM-TRANSID: 2ee45bf2a7bf447-1052a From: Mao Zhongyi To: qemu-devel@nongnu.org Date: Mon, 19 Nov 2018 20:08:10 +0800 Message-Id: <20181119120820.29878-13-maozhongyi@cmss.chinamobile.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> References: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 221.176.66.79 Subject: [Qemu-devel] [PATCH 12/22] milkymist-pfpu: Convert sysbus init function to realize function 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: michael@walle.cc, Zhang Shengju , Mao Zhongyi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use DeviceClass rather than SysBusDeviceClass in milkymist_pfpu_class_init(). Cc: michael@walle.cc Signed-off-by: Mao Zhongyi Signed-off-by: Zhang Shengju --- hw/misc/milkymist-pfpu.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/hw/misc/milkymist-pfpu.c b/hw/misc/milkymist-pfpu.c index 86f5e383b0..5d93c6c758 100644 --- a/hw/misc/milkymist-pfpu.c +++ b/hw/misc/milkymist-pfpu.c @@ -497,17 +497,15 @@ static void milkymist_pfpu_reset(DeviceState *d) } } =20 -static int milkymist_pfpu_init(SysBusDevice *dev) +static void milkymist_pfpu_realize(DeviceState *dev, Error **errp) { MilkymistPFPUState *s =3D MILKYMIST_PFPU(dev); =20 - sysbus_init_irq(dev, &s->irq); + sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->irq); =20 memory_region_init_io(&s->regs_region, OBJECT(dev), &pfpu_mmio_ops, s, "milkymist-pfpu", MICROCODE_END * 4); - sysbus_init_mmio(dev, &s->regs_region); - - return 0; + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->regs_region); } =20 static const VMStateDescription vmstate_milkymist_pfpu =3D { @@ -527,9 +525,8 @@ static const VMStateDescription vmstate_milkymist_pfpu = =3D { static void milkymist_pfpu_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); =20 - k->init =3D milkymist_pfpu_init; + dc->realize =3D milkymist_pfpu_realize; dc->reset =3D milkymist_pfpu_reset; dc->vmsd =3D &vmstate_milkymist_pfpu; } --=20 2.17.1 From nobody Mon May 6 02:51:36 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1542630488881935.0832912750826; Mon, 19 Nov 2018 04:28:08 -0800 (PST) Received: from localhost ([::1]:55664 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiec-0000oE-CW for importer@patchew.org; Mon, 19 Nov 2018 07:27:50 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52736) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiMP-0001mi-Nt for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gOiMM-0002vy-RN for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:01 -0500 Received: from cmccmta2.chinamobile.com ([221.176.66.80]:63007) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiMM-0002rR-0G for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:08:58 -0500 Received: from spf.mail.chinamobile.com (unknown[172.16.121.7]) by rmmx-syy-dmz-app06-12006 (RichMail) with SMTP id 2ee65bf2a7ca3b4-91062; Mon, 19 Nov 2018 20:08:44 +0800 (CST) Received: from localhost.localdomain (unknown[112.25.154.149]) by rmsmtp-syy-appsvr04-12004 (RichMail) with SMTP id 2ee45bf2a7bf447-1052f; Mon, 19 Nov 2018 20:08:44 +0800 (CST) X-RM-TRANSID: 2ee65bf2a7ca3b4-91062 X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 X-RM-TRANSID: 2ee45bf2a7bf447-1052f From: Mao Zhongyi To: qemu-devel@nongnu.org Date: Mon, 19 Nov 2018 20:08:11 +0800 Message-Id: <20181119120820.29878-14-maozhongyi@cmss.chinamobile.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> References: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 221.176.66.80 Subject: [Qemu-devel] [PATCH 13/22] puv3_pm.c: Convert sysbus init function to realize function 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: gxt@mprc.pku.edu.cn, Zhang Shengju , Mao Zhongyi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use DeviceClass rather than SysBusDeviceClass in puv3_pm_class_init(). Cc: gxt@mprc.pku.edu.cn Signed-off-by: Mao Zhongyi Signed-off-by: Zhang Shengju Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/misc/puv3_pm.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/hw/misc/puv3_pm.c b/hw/misc/puv3_pm.c index 577cebaac7..afe191fbe1 100644 --- a/hw/misc/puv3_pm.c +++ b/hw/misc/puv3_pm.c @@ -119,7 +119,7 @@ static const MemoryRegionOps puv3_pm_ops =3D { .endianness =3D DEVICE_NATIVE_ENDIAN, }; =20 -static int puv3_pm_init(SysBusDevice *dev) +static void puv3_pm_realize(DeviceState *dev, Error **errp) { PUV3PMState *s =3D PUV3_PM(dev); =20 @@ -127,16 +127,14 @@ static int puv3_pm_init(SysBusDevice *dev) =20 memory_region_init_io(&s->iomem, OBJECT(s), &puv3_pm_ops, s, "puv3_pm", PUV3_REGS_OFFSET); - sysbus_init_mmio(dev, &s->iomem); - - return 0; + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->iomem); } =20 static void puv3_pm_class_init(ObjectClass *klass, void *data) { - SysBusDeviceClass *sdc =3D SYS_BUS_DEVICE_CLASS(klass); + DeviceClass *dc =3D DEVICE_CLASS(klass); =20 - sdc->init =3D puv3_pm_init; + dc->realize =3D puv3_pm_realize; } =20 static const TypeInfo puv3_pm_info =3D { --=20 2.17.1 From nobody Mon May 6 02:51:36 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.zohomail.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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1542629982378541.288691695479; Mon, 19 Nov 2018 04:19:42 -0800 (PST) Received: from localhost ([::1]:55597 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiWf-0002aJ-Du for importer@patchew.org; Mon, 19 Nov 2018 07:19:37 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52813) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiMR-0001mp-B7 for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gOiMO-0002xz-4m for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:03 -0500 Received: from cmccmta1.chinamobile.com ([221.176.66.79]:24225) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiMN-0002r9-6g for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:08:59 -0500 Received: from spf.mail.chinamobile.com (unknown[172.16.121.7]) by rmmx-syy-dmz-app04-12004 (RichMail) with SMTP id 2ee45bf2a7cc01d-91a57; Mon, 19 Nov 2018 20:08:45 +0800 (CST) Received: from localhost.localdomain (unknown[112.25.154.149]) by rmsmtp-syy-appsvr04-12004 (RichMail) with SMTP id 2ee45bf2a7bf447-10532; Mon, 19 Nov 2018 20:08:45 +0800 (CST) X-RM-TRANSID: 2ee45bf2a7cc01d-91a57 X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 X-RM-TRANSID: 2ee45bf2a7bf447-10532 From: Mao Zhongyi To: qemu-devel@nongnu.org Date: Mon, 19 Nov 2018 20:08:12 +0800 Message-Id: <20181119120820.29878-15-maozhongyi@cmss.chinamobile.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> References: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 221.176.66.79 Subject: [Qemu-devel] [PATCH 14/22] nvram/ds1225y: Convert sysbus init function to realize function 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, Zhang Shengju , Mao Zhongyi , marcandre.lureau@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use DeviceClass rather than SysBusDeviceClass in nvram_sysbus_class_init(). Cc: pbonzini@redhat.com Cc: marcandre.lureau@redhat.com Signed-off-by: Mao Zhongyi Signed-off-by: Zhang Shengju Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/nvram/ds1225y.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/hw/nvram/ds1225y.c b/hw/nvram/ds1225y.c index ad7345f288..b6ef463db0 100644 --- a/hw/nvram/ds1225y.c +++ b/hw/nvram/ds1225y.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "trace.h" +#include "qemu/error-report.h" =20 typedef struct { MemoryRegion iomem; @@ -113,7 +114,7 @@ typedef struct { NvRamState nvram; } SysBusNvRamState; =20 -static int nvram_sysbus_initfn(SysBusDevice *dev) +static void nvram_sysbus_realize(DeviceState *dev, Error **errp) { SysBusNvRamState *sys =3D DS1225Y(dev); NvRamState *s =3D &sys->nvram; @@ -123,20 +124,18 @@ static int nvram_sysbus_initfn(SysBusDevice *dev) =20 memory_region_init_io(&s->iomem, OBJECT(s), &nvram_ops, s, "nvram", s->chip_size); - sysbus_init_mmio(dev, &s->iomem); + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->iomem); =20 /* Read current file */ file =3D s->filename ? fopen(s->filename, "rb") : NULL; if (file) { /* Read nvram contents */ if (fread(s->contents, s->chip_size, 1, file) !=3D 1) { - printf("nvram_sysbus_initfn: short read\n"); + error_report("nvram_sysbus_realize: short read"); } fclose(file); } nvram_post_load(s, 0); - - return 0; } =20 static Property nvram_sysbus_properties[] =3D { @@ -148,9 +147,8 @@ static Property nvram_sysbus_properties[] =3D { static void nvram_sysbus_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); =20 - k->init =3D nvram_sysbus_initfn; + dc->realize =3D nvram_sysbus_realize; dc->vmsd =3D &vmstate_nvram; dc->props =3D nvram_sysbus_properties; } --=20 2.17.1 From nobody Mon May 6 02:51:36 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.zohomail.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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1542629636432655.4509457279571; Mon, 19 Nov 2018 04:13:56 -0800 (PST) Received: from localhost ([::1]:55564 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiR3-0005zO-Ty for importer@patchew.org; Mon, 19 Nov 2018 07:13:49 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52706) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiMP-0001mY-1w for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gOiMN-0002wb-Bx for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:00 -0500 Received: from cmccmta1.chinamobile.com ([221.176.66.79]:55440) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiMM-0002qE-KZ; Mon, 19 Nov 2018 07:08:59 -0500 Received: from spf.mail.chinamobile.com (unknown[172.16.121.7]) by rmmx-syy-dmz-app01-12001 (RichMail) with SMTP id 2ee15bf2a7ccc67-91079; Mon, 19 Nov 2018 20:08:45 +0800 (CST) Received: from localhost.localdomain (unknown[112.25.154.149]) by rmsmtp-syy-appsvr04-12004 (RichMail) with SMTP id 2ee45bf2a7bf447-10536; Mon, 19 Nov 2018 20:08:45 +0800 (CST) X-RM-TRANSID: 2ee15bf2a7ccc67-91079 X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 X-RM-TRANSID: 2ee45bf2a7bf447-10536 From: Mao Zhongyi To: qemu-devel@nongnu.org Date: Mon, 19 Nov 2018 20:08:13 +0800 Message-Id: <20181119120820.29878-16-maozhongyi@cmss.chinamobile.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> References: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 221.176.66.79 Subject: [Qemu-devel] [PATCH 15/22] pci-bridge/dec: Convert sysbus init function to realize function 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: Mao Zhongyi , mst@redhat.com, qemu-ppc@nongnu.org, Zhang Shengju , david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use DeviceClass rather than SysBusDeviceClass in pci_dec_21154_device_class_init(). Cc: david@gibson.dropbear.id.au Cc: mst@redhat.com Cc: marcel.apfelbaum@gmail.com Cc: qemu-ppc@nongnu.org Signed-off-by: Mao Zhongyi Signed-off-by: Zhang Shengju Acked-by: David Gibson Reviewed-by: David Gibson --- hw/pci-bridge/dec.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/hw/pci-bridge/dec.c b/hw/pci-bridge/dec.c index 84492d5e5f..5b21c20e50 100644 --- a/hw/pci-bridge/dec.c +++ b/hw/pci-bridge/dec.c @@ -98,7 +98,7 @@ PCIBus *pci_dec_21154_init(PCIBus *parent_bus, int devfn) return pci_bridge_get_sec_bus(br); } =20 -static int pci_dec_21154_device_init(SysBusDevice *dev) +static void pci_dec_21154_device_realize(DeviceState *dev, Error **errp) { PCIHostState *phb; =20 @@ -108,9 +108,8 @@ static int pci_dec_21154_device_init(SysBusDevice *dev) dev, "pci-conf-idx", 0x1000); memory_region_init_io(&phb->data_mem, OBJECT(dev), &pci_host_data_le_o= ps, dev, "pci-data-idx", 0x1000); - sysbus_init_mmio(dev, &phb->conf_mem); - sysbus_init_mmio(dev, &phb->data_mem); - return 0; + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &phb->conf_mem); + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &phb->data_mem); } =20 static void dec_21154_pci_host_realize(PCIDevice *d, Error **errp) @@ -150,9 +149,9 @@ static const TypeInfo dec_21154_pci_host_info =3D { =20 static void pci_dec_21154_device_class_init(ObjectClass *klass, void *data) { - SysBusDeviceClass *sdc =3D SYS_BUS_DEVICE_CLASS(klass); + DeviceClass *dc =3D DEVICE_CLASS(klass); =20 - sdc->init =3D pci_dec_21154_device_init; + dc->realize =3D pci_dec_21154_device_realize; } =20 static const TypeInfo pci_dec_21154_device_info =3D { --=20 2.17.1 From nobody Mon May 6 02:51:36 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.zohomail.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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1542629982499304.3895312489349; Mon, 19 Nov 2018 04:19:42 -0800 (PST) Received: from localhost ([::1]:55596 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiWe-0002Zx-7C for importer@patchew.org; Mon, 19 Nov 2018 07:19:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52723) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiMP-0001mg-5c for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gOiMN-0002wr-Fb for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:00 -0500 Received: from cmccmta3.chinamobile.com ([221.176.66.81]:21649) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiML-0002pK-Sp for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:08:59 -0500 Received: from spf.mail.chinamobile.com (unknown[172.16.121.7]) by rmmx-syy-dmz-app09-12009 (RichMail) with SMTP id 2ee95bf2a7cbb64-91b0b; Mon, 19 Nov 2018 20:08:46 +0800 (CST) Received: from localhost.localdomain (unknown[112.25.154.149]) by rmsmtp-syy-appsvr04-12004 (RichMail) with SMTP id 2ee45bf2a7bf447-1053b; Mon, 19 Nov 2018 20:08:46 +0800 (CST) X-RM-TRANSID: 2ee95bf2a7cbb64-91b0b X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 X-RM-TRANSID: 2ee45bf2a7bf447-1053b From: Mao Zhongyi To: qemu-devel@nongnu.org Date: Mon, 19 Nov 2018 20:08:14 +0800 Message-Id: <20181119120820.29878-17-maozhongyi@cmss.chinamobile.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> References: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 221.176.66.81 Subject: [Qemu-devel] [PATCH 16/22] timer/etraxfs_timer: Convert sysbus init function to realize function 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@gmail.com, Zhang Shengju , Mao Zhongyi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use DeviceClass rather than SysBusDeviceClass in etraxfs_timer_class_init(). Cc: edgar.iglesias@gmail.com Signed-off-by: Mao Zhongyi Signed-off-by: Zhang Shengju --- hw/timer/etraxfs_timer.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/hw/timer/etraxfs_timer.c b/hw/timer/etraxfs_timer.c index d13bc30b2d..e8c53b836e 100644 --- a/hw/timer/etraxfs_timer.c +++ b/hw/timer/etraxfs_timer.c @@ -315,7 +315,7 @@ static void etraxfs_timer_reset(void *opaque) qemu_irq_lower(t->irq); } =20 -static int etraxfs_timer_init(SysBusDevice *dev) +static void etraxfs_timer_realize(DeviceState *dev, Error **errp) { ETRAXTimerState *t =3D ETRAX_TIMER(dev); =20 @@ -326,21 +326,20 @@ static int etraxfs_timer_init(SysBusDevice *dev) t->ptimer_t1 =3D ptimer_init(t->bh_t1, PTIMER_POLICY_DEFAULT); t->ptimer_wd =3D ptimer_init(t->bh_wd, PTIMER_POLICY_DEFAULT); =20 - sysbus_init_irq(dev, &t->irq); - sysbus_init_irq(dev, &t->nmi); + sysbus_init_irq(SYS_BUS_DEVICE(dev), &t->irq); + sysbus_init_irq(SYS_BUS_DEVICE(dev), &t->nmi); =20 memory_region_init_io(&t->mmio, OBJECT(t), &timer_ops, t, "etraxfs-timer", 0x5c); - sysbus_init_mmio(dev, &t->mmio); + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &t->mmio); qemu_register_reset(etraxfs_timer_reset, t); - return 0; } =20 static void etraxfs_timer_class_init(ObjectClass *klass, void *data) { - SysBusDeviceClass *sdc =3D SYS_BUS_DEVICE_CLASS(klass); + DeviceClass *dc =3D DEVICE_CLASS(klass); =20 - sdc->init =3D etraxfs_timer_init; + dc->realize =3D etraxfs_timer_realize; } =20 static const TypeInfo etraxfs_timer_info =3D { --=20 2.17.1 From nobody Mon May 6 02:51:36 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=temperror (zoho.com: Error in retrieving data from DNS) 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 1542629794085516.1247913231043; Mon, 19 Nov 2018 04:16:34 -0800 (PST) Received: from localhost ([::1]:55583 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiTX-00088d-1s for importer@patchew.org; Mon, 19 Nov 2018 07:16:23 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52717) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiMP-0001md-4m for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gOiML-0002uN-Pr for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:01 -0500 Received: from cmccmta3.chinamobile.com ([221.176.66.81]:32644) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiMK-0002rT-V4 for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:08:57 -0500 Received: from spf.mail.chinamobile.com (unknown[172.16.121.7]) by rmmx-syy-dmz-app11-12011 (RichMail) with SMTP id 2eeb5bf2a7cd5e6-909fe; Mon, 19 Nov 2018 20:08:46 +0800 (CST) Received: from localhost.localdomain (unknown[112.25.154.149]) by rmsmtp-syy-appsvr04-12004 (RichMail) with SMTP id 2ee45bf2a7bf447-1053d; Mon, 19 Nov 2018 20:08:46 +0800 (CST) X-RM-TRANSID: 2eeb5bf2a7cd5e6-909fe X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 X-RM-TRANSID: 2ee45bf2a7bf447-1053d From: Mao Zhongyi To: qemu-devel@nongnu.org Date: Mon, 19 Nov 2018 20:08:15 +0800 Message-Id: <20181119120820.29878-18-maozhongyi@cmss.chinamobile.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> References: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 221.176.66.81 Subject: [Qemu-devel] [PATCH 17/22] timer/grlib_gptimer: Convert sysbus init function to realize function 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: chouteau@adacore.com, Mao Zhongyi , Zhang Shengju Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use DeviceClass rather than SysBusDeviceClass in grlib_gptimer_class_init(). Cc: chouteau@adacore.com Signed-off-by: Mao Zhongyi Signed-off-by: Zhang Shengju --- hw/timer/grlib_gptimer.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/hw/timer/grlib_gptimer.c b/hw/timer/grlib_gptimer.c index 4ed96e970a..c4d739708f 100644 --- a/hw/timer/grlib_gptimer.c +++ b/hw/timer/grlib_gptimer.c @@ -347,7 +347,7 @@ static void grlib_gptimer_reset(DeviceState *d) } } =20 -static int grlib_gptimer_init(SysBusDevice *dev) +static void grlib_gptimer_realize(DeviceState *dev, Error **errp) { GPTimerUnit *unit =3D GRLIB_GPTIMER(dev); unsigned int i; @@ -366,7 +366,7 @@ static int grlib_gptimer_init(SysBusDevice *dev) timer->id =3D i; =20 /* One IRQ line for each timer */ - sysbus_init_irq(dev, &timer->irq); + sysbus_init_irq(SYS_BUS_DEVICE(dev), &timer->irq); =20 ptimer_set_freq(timer->ptimer, unit->freq_hz); } @@ -375,8 +375,7 @@ static int grlib_gptimer_init(SysBusDevice *dev) unit, "gptimer", UNIT_REG_SIZE + GPTIMER_REG_SIZE * unit->nr_time= rs); =20 - sysbus_init_mmio(dev, &unit->iomem); - return 0; + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &unit->iomem); } =20 static Property grlib_gptimer_properties[] =3D { @@ -389,9 +388,8 @@ static Property grlib_gptimer_properties[] =3D { static void grlib_gptimer_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); =20 - k->init =3D grlib_gptimer_init; + dc->realize =3D grlib_gptimer_realize; dc->reset =3D grlib_gptimer_reset; dc->props =3D grlib_gptimer_properties; } --=20 2.17.1 From nobody Mon May 6 02:51:36 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.zohomail.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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1542630729071795.1330838203268; Mon, 19 Nov 2018 04:32:09 -0800 (PST) Received: from localhost ([::1]:55708 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiih-0004In-0y for importer@patchew.org; Mon, 19 Nov 2018 07:32:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52971) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiMX-0001uW-Ka for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gOiMV-00036e-I3 for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:09 -0500 Received: from cmccmta1.chinamobile.com ([221.176.66.79]:24227) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiMU-0002qw-Re for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:07 -0500 Received: from spf.mail.chinamobile.com (unknown[172.16.121.7]) by rmmx-syy-dmz-app04-12004 (RichMail) with SMTP id 2ee45bf2a7ce021-91a5b; Mon, 19 Nov 2018 20:08:47 +0800 (CST) Received: from localhost.localdomain (unknown[112.25.154.149]) by rmsmtp-syy-appsvr04-12004 (RichMail) with SMTP id 2ee45bf2a7bf447-10540; Mon, 19 Nov 2018 20:08:46 +0800 (CST) X-RM-TRANSID: 2ee45bf2a7ce021-91a5b X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 X-RM-TRANSID: 2ee45bf2a7bf447-10540 From: Mao Zhongyi To: qemu-devel@nongnu.org Date: Mon, 19 Nov 2018 20:08:16 +0800 Message-Id: <20181119120820.29878-19-maozhongyi@cmss.chinamobile.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> References: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 221.176.66.79 Subject: [Qemu-devel] [PATCH 18/22] timer/puv3_ost: Convert sysbus init function to realize function 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: gxt@mprc.pku.edu.cn, Zhang Shengju , Mao Zhongyi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use DeviceClass rather than SysBusDeviceClass in puv3_ost_class_init(). Cc: gxt@mprc.pku.edu.cn Signed-off-by: Mao Zhongyi Signed-off-by: Zhang Shengju --- hw/timer/puv3_ost.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/hw/timer/puv3_ost.c b/hw/timer/puv3_ost.c index 0b3d717e60..853b96dbde 100644 --- a/hw/timer/puv3_ost.c +++ b/hw/timer/puv3_ost.c @@ -113,7 +113,7 @@ static void puv3_ost_tick(void *opaque) } } =20 -static int puv3_ost_init(SysBusDevice *dev) +static void puv3_ost_realize(DeviceState *dev, Error **errp) { PUV3OSTState *s =3D PUV3_OST(dev); =20 @@ -122,7 +122,7 @@ static int puv3_ost_init(SysBusDevice *dev) s->reg_OSMR0 =3D 0; s->reg_OSCR =3D 0; =20 - sysbus_init_irq(dev, &s->irq); + sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->irq); =20 s->bh =3D qemu_bh_new(puv3_ost_tick, s); s->ptimer =3D ptimer_init(s->bh, PTIMER_POLICY_DEFAULT); @@ -130,16 +130,14 @@ static int puv3_ost_init(SysBusDevice *dev) =20 memory_region_init_io(&s->iomem, OBJECT(s), &puv3_ost_ops, s, "puv3_os= t", PUV3_REGS_OFFSET); - sysbus_init_mmio(dev, &s->iomem); - - return 0; + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->iomem); } =20 static void puv3_ost_class_init(ObjectClass *klass, void *data) { - SysBusDeviceClass *sdc =3D SYS_BUS_DEVICE_CLASS(klass); + DeviceClass *dc =3D DEVICE_CLASS(klass); =20 - sdc->init =3D puv3_ost_init; + dc->realize =3D puv3_ost_realize; } =20 static const TypeInfo puv3_ost_info =3D { --=20 2.17.1 From nobody Mon May 6 02:51:36 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.zohomail.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 1542630484132683.3793432179893; Mon, 19 Nov 2018 04:28:04 -0800 (PST) Received: from localhost ([::1]:55670 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiek-0000vP-NS for importer@patchew.org; Mon, 19 Nov 2018 07:27:58 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52722) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiMP-0001mf-5Y for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gOiMM-0002vQ-EA for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:01 -0500 Received: from cmccmta3.chinamobile.com ([221.176.66.81]:7323) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiML-0002s9-Lu for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:08:58 -0500 Received: from spf.mail.chinamobile.com (unknown[172.16.121.7]) by rmmx-syy-dmz-app10-12010 (RichMail) with SMTP id 2eea5bf2a7cea2c-919ba; Mon, 19 Nov 2018 20:08:47 +0800 (CST) Received: from localhost.localdomain (unknown[112.25.154.149]) by rmsmtp-syy-appsvr04-12004 (RichMail) with SMTP id 2ee45bf2a7bf447-10545; Mon, 19 Nov 2018 20:08:47 +0800 (CST) X-RM-TRANSID: 2eea5bf2a7cea2c-919ba X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 X-RM-TRANSID: 2ee45bf2a7bf447-10545 From: Mao Zhongyi To: qemu-devel@nongnu.org Date: Mon, 19 Nov 2018 20:08:17 +0800 Message-Id: <20181119120820.29878-20-maozhongyi@cmss.chinamobile.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> References: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 221.176.66.81 Subject: [Qemu-devel] [PATCH 19/22] usb/tusb6010: Convert sysbus init function to realize function 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: kraxel@redhat.com, Mao Zhongyi , Zhang Shengju Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use DeviceClass rather than SysBusDeviceClass in tusb6010_class_init(). Cc: kraxel@redhat.com Signed-off-by: Mao Zhongyi Signed-off-by: Zhang Shengju --- hw/usb/tusb6010.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/hw/usb/tusb6010.c b/hw/usb/tusb6010.c index a2128024c1..0712281c42 100644 --- a/hw/usb/tusb6010.c +++ b/hw/usb/tusb6010.c @@ -808,29 +808,26 @@ static void tusb6010_reset(DeviceState *dev) musb_reset(s->musb); } =20 -static int tusb6010_init(SysBusDevice *sbd) +static void tusb6010_realize(DeviceState *dev, Error **errp) { - DeviceState *dev =3D DEVICE(sbd); TUSBState *s =3D TUSB(dev); =20 s->otg_timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, tusb_otg_tick, s); s->pwr_timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, tusb_power_tick, s); memory_region_init_io(&s->iomem[1], OBJECT(s), &tusb_async_ops, s, "tusb-async", UINT32_MAX); - sysbus_init_mmio(sbd, &s->iomem[0]); - sysbus_init_mmio(sbd, &s->iomem[1]); - sysbus_init_irq(sbd, &s->irq); + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->iomem[0]); + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->iomem[1]); + sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->irq); qdev_init_gpio_in(dev, tusb6010_irq, musb_irq_max + 1); s->musb =3D musb_init(dev, 1); - return 0; } =20 static void tusb6010_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); =20 - k->init =3D tusb6010_init; + dc->realize =3D tusb6010_realize; dc->reset =3D tusb6010_reset; } =20 --=20 2.17.1 From nobody Mon May 6 02:51:36 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.zohomail.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 1542629790196431.7920123361997; Mon, 19 Nov 2018 04:16:30 -0800 (PST) Received: from localhost ([::1]:55584 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiTV-00089E-Fn for importer@patchew.org; Mon, 19 Nov 2018 07:16:21 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52801) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiMR-0001ml-66 for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gOiMO-0002yJ-Dt for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:03 -0500 Received: from cmccmta1.chinamobile.com ([221.176.66.79]:24226) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiMN-0002r7-JX for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:00 -0500 Received: from spf.mail.chinamobile.com (unknown[172.16.121.7]) by rmmx-syy-dmz-app04-12004 (RichMail) with SMTP id 2ee45bf2a7cf022-91a5c; Mon, 19 Nov 2018 20:08:48 +0800 (CST) Received: from localhost.localdomain (unknown[112.25.154.149]) by rmsmtp-syy-appsvr04-12004 (RichMail) with SMTP id 2ee45bf2a7bf447-1054a; Mon, 19 Nov 2018 20:08:47 +0800 (CST) X-RM-TRANSID: 2ee45bf2a7cf022-91a5c X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 X-RM-TRANSID: 2ee45bf2a7bf447-1054a From: Mao Zhongyi To: qemu-devel@nongnu.org Date: Mon, 19 Nov 2018 20:08:18 +0800 Message-Id: <20181119120820.29878-21-maozhongyi@cmss.chinamobile.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> References: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 221.176.66.79 Subject: [Qemu-devel] [PATCH 20/22] xen_backend: Convert sysbus init function to realize function 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: anthony.perard@citrix.com, xen-devel@lists.xenproject.org, sstabellini@kernel.org, Zhang Shengju , Mao Zhongyi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use DeviceClass rather than SysBusDeviceClass in xen_sysdev_class_init(). Cc: sstabellini@kernel.org Cc: anthony.perard@citrix.com Cc: xen-devel@lists.xenproject.org Signed-off-by: Mao Zhongyi Signed-off-by: Zhang Shengju --- hw/xen/xen_backend.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/xen/xen_backend.c b/hw/xen/xen_backend.c index 9a8e8771ec..73b0ed0169 100644 --- a/hw/xen/xen_backend.c +++ b/hw/xen/xen_backend.c @@ -809,9 +809,8 @@ static const TypeInfo xensysbus_info =3D { } }; =20 -static int xen_sysdev_init(SysBusDevice *dev) +static void xen_sysdev_realize(DeviceState *dev, Error **errp) { - return 0; } =20 static Property xen_sysdev_properties[] =3D { @@ -821,9 +820,8 @@ static Property xen_sysdev_properties[] =3D { static void xen_sysdev_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); =20 - k->init =3D xen_sysdev_init; + dc->realize =3D xen_sysdev_realize; dc->props =3D xen_sysdev_properties; dc->bus_type =3D TYPE_XENSYSBUS; } --=20 2.17.1 From nobody Mon May 6 02:51:36 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.zohomail.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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1542630162430957.364560824811; Mon, 19 Nov 2018 04:22:42 -0800 (PST) Received: from localhost ([::1]:55614 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiZT-0004du-G6 for importer@patchew.org; Mon, 19 Nov 2018 07:22:31 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52907) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiMT-0001po-KY for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gOiMP-00030Z-UG for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:05 -0500 Received: from cmccmta2.chinamobile.com ([221.176.66.80]:55550) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiMP-0002xB-3y; Mon, 19 Nov 2018 07:09:01 -0500 Received: from spf.mail.chinamobile.com (unknown[172.16.121.7]) by rmmx-syy-dmz-app05-12005 (RichMail) with SMTP id 2ee55bf2a7d0a0c-90ddd; Mon, 19 Nov 2018 20:08:48 +0800 (CST) Received: from localhost.localdomain (unknown[112.25.154.149]) by rmsmtp-syy-appsvr04-12004 (RichMail) with SMTP id 2ee45bf2a7bf447-1054c; Mon, 19 Nov 2018 20:08:48 +0800 (CST) X-RM-TRANSID: 2ee55bf2a7d0a0c-90ddd X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 X-RM-TRANSID: 2ee45bf2a7bf447-1054c From: Mao Zhongyi To: qemu-devel@nongnu.org Date: Mon, 19 Nov 2018 20:08:19 +0800 Message-Id: <20181119120820.29878-22-maozhongyi@cmss.chinamobile.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> References: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 221.176.66.80 Subject: [Qemu-devel] [PATCH 21/22] event-facility: Change SysBusDeviceClass *sbdc to SysBusDeviceClass *sbc 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: Mao Zhongyi , david@redhat.com, cohuck@redhat.com, borntraeger@de.ibm.com, qemu-s390x@nongnu.org, Zhang Shengju , rth@twiddle.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Most of the SysBusDeviceClass variables are named sbc, and sbdc here is a bit weird, so changing sbdc to keep it consistent with others might look good. Cc: cohuck@redhat.com Cc: borntraeger@de.ibm.com Cc: rth@twiddle.net Cc: david@redhat.com Cc: qemu-s390x@nongnu.org Signed-off-by: Mao Zhongyi Signed-off-by: Zhang Shengju --- hw/s390x/event-facility.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c index ee5b83448b..759e7bee01 100644 --- a/hw/s390x/event-facility.c +++ b/hw/s390x/event-facility.c @@ -484,8 +484,8 @@ static void reset_event_facility(DeviceState *dev) =20 static void init_event_facility_class(ObjectClass *klass, void *data) { - SysBusDeviceClass *sbdc =3D SYS_BUS_DEVICE_CLASS(klass); - DeviceClass *dc =3D DEVICE_CLASS(sbdc); + SysBusDeviceClass *sbc =3D SYS_BUS_DEVICE_CLASS(klass); + DeviceClass *dc =3D DEVICE_CLASS(sbc); SCLPEventFacilityClass *k =3D EVENT_FACILITY_CLASS(dc); =20 dc->reset =3D reset_event_facility; --=20 2.17.1 From nobody Mon May 6 02:51:36 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.zohomail.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 1542629632008967.0494738437287; Mon, 19 Nov 2018 04:13:52 -0800 (PST) Received: from localhost ([::1]:55563 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiR2-0005yt-Sa for importer@patchew.org; Mon, 19 Nov 2018 07:13:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52865) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiMS-0001pI-UJ for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gOiMQ-00030q-82 for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:04 -0500 Received: from cmccmta2.chinamobile.com ([221.176.66.80]:55551) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOiMP-0002xC-FH for qemu-devel@nongnu.org; Mon, 19 Nov 2018 07:09:02 -0500 Received: from spf.mail.chinamobile.com (unknown[172.16.121.7]) by rmmx-syy-dmz-app05-12005 (RichMail) with SMTP id 2ee55bf2a7d0a0d-90dde; Mon, 19 Nov 2018 20:08:49 +0800 (CST) Received: from localhost.localdomain (unknown[112.25.154.149]) by rmsmtp-syy-appsvr04-12004 (RichMail) with SMTP id 2ee45bf2a7bf447-10554; Mon, 19 Nov 2018 20:08:49 +0800 (CST) X-RM-TRANSID: 2ee55bf2a7d0a0d-90dde X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 X-RM-TRANSID: 2ee45bf2a7bf447-10554 From: Mao Zhongyi To: qemu-devel@nongnu.org Date: Mon, 19 Nov 2018 20:08:20 +0800 Message-Id: <20181119120820.29878-23-maozhongyi@cmss.chinamobile.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> References: <20181119120820.29878-1-maozhongyi@cmss.chinamobile.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 221.176.66.80 Subject: [Qemu-devel] [PATCH 22/22] core/sysbus: remove the SysBusDeviceClass::init path 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: peter.maydell@linaro.org, thuth@redhat.com, ehabkost@redhat.com, Mao Zhongyi , richard.henderson@linaro.org, armbru@redhat.com, alistair.francis@wdc.com, pbonzini@redhat.com, Zhang Shengju Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Currently, all sysbus devices have been converted to realize(), so remove this path. Cc: ehabkost@redhat.com Cc: thuth@redhat.com Cc: pbonzini@redhat.com Cc: armbru@redhat.com Cc: peter.maydell@linaro.org Cc: richard.henderson@linaro.org Cc: alistair.francis@wdc.com Signed-off-by: Mao Zhongyi Signed-off-by: Zhang Shengju --- hw/core/sysbus.c | 15 --------------- include/hw/sysbus.h | 3 --- 2 files changed, 18 deletions(-) diff --git a/hw/core/sysbus.c b/hw/core/sysbus.c index 7ac36ad3e7..030ad426c1 100644 --- a/hw/core/sysbus.c +++ b/hw/core/sysbus.c @@ -201,20 +201,6 @@ void sysbus_init_ioports(SysBusDevice *dev, uint32_t i= oport, uint32_t size) } } =20 -/* TODO remove once all sysbus devices have been converted to realize */ -static void sysbus_realize(DeviceState *dev, Error **errp) -{ - SysBusDevice *sd =3D SYS_BUS_DEVICE(dev); - SysBusDeviceClass *sbc =3D SYS_BUS_DEVICE_GET_CLASS(sd); - - if (!sbc->init) { - return; - } - if (sbc->init(sd) < 0) { - error_setg(errp, "Device initialization failed"); - } -} - DeviceState *sysbus_create_varargs(const char *name, hwaddr addr, ...) { @@ -327,7 +313,6 @@ MemoryRegion *sysbus_address_space(SysBusDevice *dev) static void sysbus_device_class_init(ObjectClass *klass, void *data) { DeviceClass *k =3D DEVICE_CLASS(klass); - k->realize =3D sysbus_realize; k->bus_type =3D TYPE_SYSTEM_BUS; /* * device_add plugs devices into a suitable bus. For "real" buses, diff --git a/include/hw/sysbus.h b/include/hw/sysbus.h index 0b59a3b8d6..1aedcf05c9 100644 --- a/include/hw/sysbus.h +++ b/include/hw/sysbus.h @@ -38,9 +38,6 @@ typedef struct SysBusDevice SysBusDevice; typedef struct SysBusDeviceClass { /*< private >*/ DeviceClass parent_class; - /*< public >*/ - - int (*init)(SysBusDevice *dev); =20 /* * Let the sysbus device format its own non-PIO, non-MMIO unit address. --=20 2.17.1