From nobody Sun May 19 08:26:04 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=eik.bme.hu Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1674002141147723.4245109947362; Tue, 17 Jan 2023 16:35:41 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHwPw-0005wP-Dp; Tue, 17 Jan 2023 19:35:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pHwPq-0005tp-4f; Tue, 17 Jan 2023 19:35:01 -0500 Received: from zero.eik.bme.hu ([2001:738:2001:2001::2001]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pHwPn-00055J-Tn; Tue, 17 Jan 2023 19:34:57 -0500 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id 3F316746369; Wed, 18 Jan 2023 01:32:32 +0100 (CET) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 1A3C174635C; Wed, 18 Jan 2023 01:32:32 +0100 (CET) Message-Id: <67b2d4700879c3b4cd574f1faa1a0d1950b3d0ee.1674001242.git.balaton@eik.bme.hu> In-Reply-To: References: From: BALATON Zoltan Subject: [PATCH 1/4] hw/misc/macio: Avoid some QOM casts To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org Cc: Mark Cave-Ayland Date: Wed, 18 Jan 2023 01:32:32 +0100 (CET) X-Spam-Probability: 8% Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:738:2001:2001::2001; envelope-from=balaton@eik.bme.hu; helo=zero.eik.bme.hu X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1674002144563100001 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" At several places we already have the object pointer with the right type so we don't need to cast it back and forth. Avoiding these casts improves readability. Signed-off-by: BALATON Zoltan Reviewed-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/misc/macio/macio.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c index 08dbdd7fc0..0dfe372965 100644 --- a/hw/misc/macio/macio.c +++ b/hw/misc/macio/macio.c @@ -220,11 +220,11 @@ static void macio_oldworld_init(Object *obj) DeviceState *dev; int i; =20 - object_initialize_child(OBJECT(s), "pic", &os->pic, TYPE_HEATHROW); + object_initialize_child(obj, "pic", &os->pic, TYPE_HEATHROW); =20 - object_initialize_child(OBJECT(s), "cuda", &s->cuda, TYPE_CUDA); + object_initialize_child(obj, "cuda", &s->cuda, TYPE_CUDA); =20 - object_initialize_child(OBJECT(s), "nvram", &os->nvram, TYPE_MACIO_NVR= AM); + object_initialize_child(obj, "nvram", &os->nvram, TYPE_MACIO_NVRAM); dev =3D DEVICE(&os->nvram); qdev_prop_set_uint32(dev, "size", MACIO_NVRAM_SIZE); qdev_prop_set_uint32(dev, "it_shift", 4); @@ -372,9 +372,9 @@ static void macio_newworld_init(Object *obj) NewWorldMacIOState *ns =3D NEWWORLD_MACIO(obj); int i; =20 - object_initialize_child(OBJECT(s), "pic", &ns->pic, TYPE_OPENPIC); + object_initialize_child(obj, "pic", &ns->pic, TYPE_OPENPIC); =20 - object_initialize_child(OBJECT(s), "gpio", &ns->gpio, TYPE_MACIO_GPIO); + object_initialize_child(obj, "gpio", &ns->gpio, TYPE_MACIO_GPIO); =20 for (i =3D 0; i < 2; i++) { macio_init_ide(s, &ns->ide[i], i); @@ -390,9 +390,9 @@ static void macio_instance_init(Object *obj) qbus_init(&s->macio_bus, sizeof(s->macio_bus), TYPE_MACIO_BUS, DEVICE(obj), "macio.0"); =20 - object_initialize_child(OBJECT(s), "dbdma", &s->dbdma, TYPE_MAC_DBDMA); + object_initialize_child(obj, "dbdma", &s->dbdma, TYPE_MAC_DBDMA); =20 - object_initialize_child(OBJECT(s), "escc", &s->escc, TYPE_ESCC); + object_initialize_child(obj, "escc", &s->escc, TYPE_ESCC); } =20 static const VMStateDescription vmstate_macio_oldworld =3D { --=20 2.30.6 From nobody Sun May 19 08:26:04 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=eik.bme.hu Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1674002197765515.0264983668324; Tue, 17 Jan 2023 16:36:37 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHwPv-0005v9-Cd; Tue, 17 Jan 2023 19:35:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pHwPr-0005ts-Bg; Tue, 17 Jan 2023 19:35:01 -0500 Received: from zero.eik.bme.hu ([152.66.115.2]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pHwPo-00055Q-P4; Tue, 17 Jan 2023 19:34:59 -0500 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id 579CB7466FF; Wed, 18 Jan 2023 01:32:33 +0100 (CET) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 28A60746392; Wed, 18 Jan 2023 01:32:33 +0100 (CET) Message-Id: <6c79d6903fc11e153f8050a374904c2b5d5db585.1674001242.git.balaton@eik.bme.hu> In-Reply-To: References: From: BALATON Zoltan Subject: [PATCH 2/4] hw/misc/macio: Rename sysbus_dev to sbd for consistency and brevity To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org Cc: Mark Cave-Ayland Date: Wed, 18 Jan 2023 01:32:33 +0100 (CET) X-Spam-Probability: 8% Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=152.66.115.2; envelope-from=balaton@eik.bme.hu; helo=zero.eik.bme.hu X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1674002199680100004 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Some functions use sysbus_dev while others sbd name for local variable storing a sysbus device pointer. Standardise on the shorter name to be consistent and make the code easier to read as short name is less distracting and needs less line breaks. Signed-off-by: BALATON Zoltan Reviewed-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/misc/macio/macio.c | 78 +++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 43 deletions(-) diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c index 0dfe372965..4d7223cc85 100644 --- a/hw/misc/macio/macio.c +++ b/hw/misc/macio/macio.c @@ -96,14 +96,14 @@ static void macio_bar_setup(MacIOState *s) static void macio_common_realize(PCIDevice *d, Error **errp) { MacIOState *s =3D MACIO(d); - SysBusDevice *sysbus_dev; + SysBusDevice *sbd; =20 if (!qdev_realize(DEVICE(&s->dbdma), BUS(&s->macio_bus), errp)) { return; } - sysbus_dev =3D SYS_BUS_DEVICE(&s->dbdma); + sbd =3D SYS_BUS_DEVICE(&s->dbdma); memory_region_add_subregion(&s->bar, 0x08000, - sysbus_mmio_get_region(sysbus_dev, 0)); + sysbus_mmio_get_region(sbd, 0)); =20 qdev_prop_set_uint32(DEVICE(&s->escc), "disabled", 0); qdev_prop_set_uint32(DEVICE(&s->escc), "frequency", ESCC_CLOCK); @@ -122,11 +122,10 @@ static void macio_realize_ide(MacIOState *s, MACIOIDE= State *ide, qemu_irq irq0, qemu_irq irq1, int dmaid, Error **errp) { - SysBusDevice *sysbus_dev; + SysBusDevice *sbd =3D SYS_BUS_DEVICE(ide); =20 - sysbus_dev =3D SYS_BUS_DEVICE(ide); - sysbus_connect_irq(sysbus_dev, 0, irq0); - sysbus_connect_irq(sysbus_dev, 1, irq1); + sysbus_connect_irq(sbd, 0, irq0); + sysbus_connect_irq(sbd, 1, irq1); qdev_prop_set_uint32(DEVICE(ide), "channel", dmaid); object_property_set_link(OBJECT(ide), "dbdma", OBJECT(&s->dbdma), &error_abort); @@ -141,7 +140,7 @@ static void macio_oldworld_realize(PCIDevice *d, Error = **errp) OldWorldMacIOState *os =3D OLDWORLD_MACIO(d); DeviceState *pic_dev =3D DEVICE(&os->pic); Error *err =3D NULL; - SysBusDevice *sysbus_dev; + SysBusDevice *sbd; =20 macio_common_realize(d, &err); if (err) { @@ -153,33 +152,30 @@ static void macio_oldworld_realize(PCIDevice *d, Erro= r **errp) if (!qdev_realize(DEVICE(&os->pic), BUS(&s->macio_bus), errp)) { return; } - sysbus_dev =3D SYS_BUS_DEVICE(&os->pic); + sbd =3D SYS_BUS_DEVICE(&os->pic); memory_region_add_subregion(&s->bar, 0x0, - sysbus_mmio_get_region(sysbus_dev, 0)); + sysbus_mmio_get_region(sbd, 0)); =20 qdev_prop_set_uint64(DEVICE(&s->cuda), "timebase-frequency", s->frequency); if (!qdev_realize(DEVICE(&s->cuda), BUS(&s->macio_bus), errp)) { return; } - sysbus_dev =3D SYS_BUS_DEVICE(&s->cuda); + sbd =3D SYS_BUS_DEVICE(&s->cuda); memory_region_add_subregion(&s->bar, 0x16000, - sysbus_mmio_get_region(sysbus_dev, 0)); - sysbus_connect_irq(sysbus_dev, 0, qdev_get_gpio_in(pic_dev, - OLDWORLD_CUDA_IRQ)); + sysbus_mmio_get_region(sbd, 0)); + sysbus_connect_irq(sbd, 0, qdev_get_gpio_in(pic_dev, OLDWORLD_CUDA_IRQ= )); =20 - sysbus_dev =3D SYS_BUS_DEVICE(&s->escc); - sysbus_connect_irq(sysbus_dev, 0, qdev_get_gpio_in(pic_dev, - OLDWORLD_ESCCB_IRQ)= ); - sysbus_connect_irq(sysbus_dev, 1, qdev_get_gpio_in(pic_dev, - OLDWORLD_ESCCA_IRQ)= ); + sbd =3D SYS_BUS_DEVICE(&s->escc); + sysbus_connect_irq(sbd, 0, qdev_get_gpio_in(pic_dev, OLDWORLD_ESCCB_IR= Q)); + sysbus_connect_irq(sbd, 1, qdev_get_gpio_in(pic_dev, OLDWORLD_ESCCA_IR= Q)); =20 if (!qdev_realize(DEVICE(&os->nvram), BUS(&s->macio_bus), errp)) { return; } - sysbus_dev =3D SYS_BUS_DEVICE(&os->nvram); + sbd =3D SYS_BUS_DEVICE(&os->nvram); memory_region_add_subregion(&s->bar, 0x60000, - sysbus_mmio_get_region(sysbus_dev, 0)); + sysbus_mmio_get_region(sbd, 0)); pmac_format_nvram_partition(&os->nvram, os->nvram.size); =20 /* IDE buses */ @@ -274,7 +270,7 @@ static void macio_newworld_realize(PCIDevice *d, Error = **errp) NewWorldMacIOState *ns =3D NEWWORLD_MACIO(d); DeviceState *pic_dev =3D DEVICE(&ns->pic); Error *err =3D NULL; - SysBusDevice *sysbus_dev; + SysBusDevice *sbd; MemoryRegion *timer_memory =3D NULL; =20 macio_common_realize(d, &err); @@ -285,16 +281,14 @@ static void macio_newworld_realize(PCIDevice *d, Erro= r **errp) =20 /* OpenPIC */ qdev_prop_set_uint32(pic_dev, "model", OPENPIC_MODEL_KEYLARGO); - sysbus_dev =3D SYS_BUS_DEVICE(&ns->pic); - sysbus_realize_and_unref(sysbus_dev, &error_fatal); + sbd =3D SYS_BUS_DEVICE(&ns->pic); + sysbus_realize_and_unref(sbd, &error_fatal); memory_region_add_subregion(&s->bar, 0x40000, - sysbus_mmio_get_region(sysbus_dev, 0)); + sysbus_mmio_get_region(sbd, 0)); =20 - sysbus_dev =3D SYS_BUS_DEVICE(&s->escc); - sysbus_connect_irq(sysbus_dev, 0, qdev_get_gpio_in(pic_dev, - NEWWORLD_ESCCB_IRQ)= ); - sysbus_connect_irq(sysbus_dev, 1, qdev_get_gpio_in(pic_dev, - NEWWORLD_ESCCA_IRQ)= ); + sbd =3D SYS_BUS_DEVICE(&s->escc); + sysbus_connect_irq(sbd, 0, qdev_get_gpio_in(pic_dev, NEWWORLD_ESCCB_IR= Q)); + sysbus_connect_irq(sbd, 1, qdev_get_gpio_in(pic_dev, NEWWORLD_ESCCA_IR= Q)); =20 /* IDE buses */ macio_realize_ide(s, &ns->ide[0], @@ -326,27 +320,26 @@ static void macio_newworld_realize(PCIDevice *d, Erro= r **errp) if (!qdev_realize(DEVICE(&ns->gpio), BUS(&s->macio_bus), errp)) { return; } - sysbus_dev =3D SYS_BUS_DEVICE(&ns->gpio); - sysbus_connect_irq(sysbus_dev, 1, qdev_get_gpio_in(pic_dev, + sbd =3D SYS_BUS_DEVICE(&ns->gpio); + sysbus_connect_irq(sbd, 1, qdev_get_gpio_in(pic_dev, NEWWORLD_EXTING_GPIO1)); - sysbus_connect_irq(sysbus_dev, 9, qdev_get_gpio_in(pic_dev, + sysbus_connect_irq(sbd, 9, qdev_get_gpio_in(pic_dev, NEWWORLD_EXTING_GPIO9)); memory_region_add_subregion(&s->bar, 0x50, - sysbus_mmio_get_region(sysbus_dev, 0)); + sysbus_mmio_get_region(sbd, 0)); =20 /* PMU */ object_initialize_child(OBJECT(s), "pmu", &s->pmu, TYPE_VIA_PMU); - object_property_set_link(OBJECT(&s->pmu), "gpio", OBJECT(sysbus_de= v), + object_property_set_link(OBJECT(&s->pmu), "gpio", OBJECT(sbd), &error_abort); qdev_prop_set_bit(DEVICE(&s->pmu), "has-adb", ns->has_adb); if (!qdev_realize(DEVICE(&s->pmu), BUS(&s->macio_bus), errp)) { return; } - sysbus_dev =3D SYS_BUS_DEVICE(&s->pmu); - sysbus_connect_irq(sysbus_dev, 0, qdev_get_gpio_in(pic_dev, - NEWWORLD_PMU_IR= Q)); + sbd =3D SYS_BUS_DEVICE(&s->pmu); + sysbus_connect_irq(sbd, 0, qdev_get_gpio_in(pic_dev, NEWWORLD_PMU_= IRQ)); memory_region_add_subregion(&s->bar, 0x16000, - sysbus_mmio_get_region(sysbus_dev, 0)); + sysbus_mmio_get_region(sbd, 0)); } else { object_unparent(OBJECT(&ns->gpio)); =20 @@ -358,11 +351,10 @@ static void macio_newworld_realize(PCIDevice *d, Erro= r **errp) if (!qdev_realize(DEVICE(&s->cuda), BUS(&s->macio_bus), errp)) { return; } - sysbus_dev =3D SYS_BUS_DEVICE(&s->cuda); - sysbus_connect_irq(sysbus_dev, 0, qdev_get_gpio_in(pic_dev, - NEWWORLD_CUDA_I= RQ)); + sbd =3D SYS_BUS_DEVICE(&s->cuda); + sysbus_connect_irq(sbd, 0, qdev_get_gpio_in(pic_dev, NEWWORLD_CUDA= _IRQ)); memory_region_add_subregion(&s->bar, 0x16000, - sysbus_mmio_get_region(sysbus_dev, 0)); + sysbus_mmio_get_region(sbd, 0)); } } =20 --=20 2.30.6 From nobody Sun May 19 08:26:04 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=eik.bme.hu Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1674002140901900.1876250906746; Tue, 17 Jan 2023 16:35:40 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHwPv-0005vB-C5; Tue, 17 Jan 2023 19:35:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pHwPr-0005tr-62; Tue, 17 Jan 2023 19:35:01 -0500 Received: from zero.eik.bme.hu ([152.66.115.2]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pHwPp-00055Y-3K; Tue, 17 Jan 2023 19:34:58 -0500 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id 5FB84746E58; Wed, 18 Jan 2023 01:32:34 +0100 (CET) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 411FC746E06; Wed, 18 Jan 2023 01:32:34 +0100 (CET) Message-Id: <165a4ea190af7c09832f50f02004fad82f704898.1674001242.git.balaton@eik.bme.hu> In-Reply-To: References: From: BALATON Zoltan Subject: [PATCH 3/4] hw/misc/macio: Remove some single use local variables To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org Cc: Mark Cave-Ayland Date: Wed, 18 Jan 2023 01:32:34 +0100 (CET) X-Spam-Probability: 8% Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=152.66.115.2; envelope-from=balaton@eik.bme.hu; helo=zero.eik.bme.hu X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1674002144611100004 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Drop some local variables that could just be substituted at the single place they were used. This makes the code shorter and simpler. Signed-off-by: BALATON Zoltan Reviewed-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/misc/macio/macio.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c index 4d7223cc85..ae2a9a960d 100644 --- a/hw/misc/macio/macio.c +++ b/hw/misc/macio/macio.c @@ -53,10 +53,8 @@ */ static void macio_escc_legacy_setup(MacIOState *s) { - ESCCState *escc =3D ESCC(&s->escc); - SysBusDevice *sbd =3D SYS_BUS_DEVICE(escc); + SysBusDevice *sbd =3D SYS_BUS_DEVICE(&s->escc); MemoryRegion *escc_legacy =3D g_new(MemoryRegion, 1); - MemoryRegion *bar =3D &s->bar; int i; static const int maps[] =3D { 0x00, 0x00, /* Command B */ @@ -80,16 +78,15 @@ static void macio_escc_legacy_setup(MacIOState *s) memory_region_add_subregion(escc_legacy, maps[i], port); } =20 - memory_region_add_subregion(bar, 0x12000, escc_legacy); + memory_region_add_subregion(&s->bar, 0x12000, escc_legacy); } =20 static void macio_bar_setup(MacIOState *s) { - ESCCState *escc =3D ESCC(&s->escc); - SysBusDevice *sbd =3D SYS_BUS_DEVICE(escc); - MemoryRegion *bar =3D &s->bar; + SysBusDevice *sbd =3D SYS_BUS_DEVICE(&s->escc); + MemoryRegion *bar =3D sysbus_mmio_get_region(sbd, 0); =20 - memory_region_add_subregion(bar, 0x13000, sysbus_mmio_get_region(sbd, = 0)); + memory_region_add_subregion(&s->bar, 0x13000, bar); macio_escc_legacy_setup(s); } =20 --=20 2.30.6 From nobody Sun May 19 08:26:04 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=eik.bme.hu Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1674002197889561.4427919295391; Tue, 17 Jan 2023 16:36:37 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHwPw-0005wR-L6; Tue, 17 Jan 2023 19:35:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pHwPs-0005tt-FD; Tue, 17 Jan 2023 19:35:01 -0500 Received: from zero.eik.bme.hu ([2001:738:2001:2001::2001]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pHwPq-00055h-II; Tue, 17 Jan 2023 19:35:00 -0500 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id 7A440746F31; Wed, 18 Jan 2023 01:32:35 +0100 (CET) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 5554E746F2F; Wed, 18 Jan 2023 01:32:35 +0100 (CET) Message-Id: In-Reply-To: References: From: BALATON Zoltan Subject: [PATCH 4/4] hw/misc/macio: Return bool from functions taking errp To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org Cc: Mark Cave-Ayland Date: Wed, 18 Jan 2023 01:32:35 +0100 (CET) X-Spam-Probability: 8% Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:738:2001:2001::2001; envelope-from=balaton@eik.bme.hu; helo=zero.eik.bme.hu X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1674002199651100003 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use the convention to return bool from functions which take an error pointer which allows for callers to pass through their error pointer without needing a local. Signed-off-by: BALATON Zoltan Reviewed-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/misc/macio/macio.c | 62 +++++++++++++++++-------------------------- 1 file changed, 25 insertions(+), 37 deletions(-) diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c index ae2a9a960d..265c0bbd8d 100644 --- a/hw/misc/macio/macio.c +++ b/hw/misc/macio/macio.c @@ -90,13 +90,13 @@ static void macio_bar_setup(MacIOState *s) macio_escc_legacy_setup(s); } =20 -static void macio_common_realize(PCIDevice *d, Error **errp) +static bool macio_common_realize(PCIDevice *d, Error **errp) { MacIOState *s =3D MACIO(d); SysBusDevice *sbd; =20 if (!qdev_realize(DEVICE(&s->dbdma), BUS(&s->macio_bus), errp)) { - return; + return false; } sbd =3D SYS_BUS_DEVICE(&s->dbdma); memory_region_add_subregion(&s->bar, 0x08000, @@ -108,14 +108,16 @@ static void macio_common_realize(PCIDevice *d, Error = **errp) qdev_prop_set_uint32(DEVICE(&s->escc), "chnBtype", escc_serial); qdev_prop_set_uint32(DEVICE(&s->escc), "chnAtype", escc_serial); if (!qdev_realize(DEVICE(&s->escc), BUS(&s->macio_bus), errp)) { - return; + return false; } =20 macio_bar_setup(s); pci_register_bar(d, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->bar); + + return true; } =20 -static void macio_realize_ide(MacIOState *s, MACIOIDEState *ide, +static bool macio_realize_ide(MacIOState *s, MACIOIDEState *ide, qemu_irq irq0, qemu_irq irq1, int dmaid, Error **errp) { @@ -128,7 +130,7 @@ static void macio_realize_ide(MacIOState *s, MACIOIDESt= ate *ide, &error_abort); macio_ide_register_dma(ide); =20 - qdev_realize(DEVICE(ide), BUS(&s->macio_bus), errp); + return qdev_realize(DEVICE(ide), BUS(&s->macio_bus), errp); } =20 static void macio_oldworld_realize(PCIDevice *d, Error **errp) @@ -136,12 +138,9 @@ static void macio_oldworld_realize(PCIDevice *d, Error= **errp) MacIOState *s =3D MACIO(d); OldWorldMacIOState *os =3D OLDWORLD_MACIO(d); DeviceState *pic_dev =3D DEVICE(&os->pic); - Error *err =3D NULL; SysBusDevice *sbd; =20 - macio_common_realize(d, &err); - if (err) { - error_propagate(errp, err); + if (!macio_common_realize(d, errp)) { return; } =20 @@ -176,21 +175,17 @@ static void macio_oldworld_realize(PCIDevice *d, Erro= r **errp) pmac_format_nvram_partition(&os->nvram, os->nvram.size); =20 /* IDE buses */ - macio_realize_ide(s, &os->ide[0], - qdev_get_gpio_in(pic_dev, OLDWORLD_IDE0_IRQ), - qdev_get_gpio_in(pic_dev, OLDWORLD_IDE0_DMA_IRQ), - 0x16, &err); - if (err) { - error_propagate(errp, err); + if (!macio_realize_ide(s, &os->ide[0], + qdev_get_gpio_in(pic_dev, OLDWORLD_IDE0_IRQ), + qdev_get_gpio_in(pic_dev, OLDWORLD_IDE0_DMA_IRQ= ), + 0x16, errp)) { return; } =20 - macio_realize_ide(s, &os->ide[1], - qdev_get_gpio_in(pic_dev, OLDWORLD_IDE1_IRQ), - qdev_get_gpio_in(pic_dev, OLDWORLD_IDE1_DMA_IRQ), - 0x1a, &err); - if (err) { - error_propagate(errp, err); + if (!macio_realize_ide(s, &os->ide[1], + qdev_get_gpio_in(pic_dev, OLDWORLD_IDE1_IRQ), + qdev_get_gpio_in(pic_dev, OLDWORLD_IDE1_DMA_IRQ= ), + 0x1a, errp)) { return; } } @@ -266,13 +261,10 @@ static void macio_newworld_realize(PCIDevice *d, Erro= r **errp) MacIOState *s =3D MACIO(d); NewWorldMacIOState *ns =3D NEWWORLD_MACIO(d); DeviceState *pic_dev =3D DEVICE(&ns->pic); - Error *err =3D NULL; SysBusDevice *sbd; MemoryRegion *timer_memory =3D NULL; =20 - macio_common_realize(d, &err); - if (err) { - error_propagate(errp, err); + if (!macio_common_realize(d, errp)) { return; } =20 @@ -288,21 +280,17 @@ static void macio_newworld_realize(PCIDevice *d, Erro= r **errp) sysbus_connect_irq(sbd, 1, qdev_get_gpio_in(pic_dev, NEWWORLD_ESCCA_IR= Q)); =20 /* IDE buses */ - macio_realize_ide(s, &ns->ide[0], - qdev_get_gpio_in(pic_dev, NEWWORLD_IDE0_IRQ), - qdev_get_gpio_in(pic_dev, NEWWORLD_IDE0_DMA_IRQ), - 0x16, &err); - if (err) { - error_propagate(errp, err); + if (!macio_realize_ide(s, &ns->ide[0], + qdev_get_gpio_in(pic_dev, NEWWORLD_IDE0_IRQ), + qdev_get_gpio_in(pic_dev, NEWWORLD_IDE0_DMA_IRQ= ), + 0x16, errp)) { return; } =20 - macio_realize_ide(s, &ns->ide[1], - qdev_get_gpio_in(pic_dev, NEWWORLD_IDE1_IRQ), - qdev_get_gpio_in(pic_dev, NEWWORLD_IDE1_DMA_IRQ), - 0x1a, &err); - if (err) { - error_propagate(errp, err); + if (!macio_realize_ide(s, &ns->ide[1], + qdev_get_gpio_in(pic_dev, NEWWORLD_IDE1_IRQ), + qdev_get_gpio_in(pic_dev, NEWWORLD_IDE1_DMA_IRQ= ), + 0x1a, errp)) { return; } =20 --=20 2.30.6