From: David Gibson <david@gibson.dropbear.id.au> To: "Philippe Mathieu-Daudé" <f4bug@amsat.org> Cc: "Paul Burton" <pburton@wavecomp.com>, "Sagar Karandikar" <sagark@eecs.berkeley.edu>, "Peter Maydell" <peter.maydell@linaro.org>, "Jason Wang" <jasowang@redhat.com>, "Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>, qemu-devel@nongnu.org, "Alistair Francis" <Alistair.Francis@wdc.com>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, "Michael S. Tsirkin" <mst@redhat.com>, "Markus Armbruster" <armbru@redhat.com>, "Aleksandar Markovic" <aleksandar.qemu.devel@gmail.com>, "Palmer Dabbelt" <palmer@dabbelt.com>, "Aleksandar Rikalo" <aleksandar.rikalo@rt-rk.com>, "Philippe Mathieu-Daudé" <philmd@redhat.com>, "Eduardo Habkost" <ehabkost@redhat.com>, "Alistair Francis" <alistair@alistair23.me>, qemu-arm@nongnu.org, "Richard Henderson" <rth@twiddle.net>, qemu-riscv@nongnu.org, "Bastian Koppelmann" <kbastian@mail.uni-paderborn.de>, "Andrew Baumann" <Andrew.Baumann@microsoft.com>, "Jean-Christophe Dubois" <jcd@tribudubois.net>, qemu-ppc@nongnu.org, "Paolo Bonzini" <pbonzini@redhat.com>, "Aurelien Jarno" <aurelien@aurel32.net> Subject: Re: [PATCH-for-5.0 10/12] hw/misc/macio/macio: Add missing error-propagation code Date: Thu, 26 Mar 2020 10:55:16 +1100 [thread overview] Message-ID: <20200325235516.GG36889@umbus.fritz.box> (raw) In-Reply-To: <20200325191830.16553-11-f4bug@amsat.org> [-- Attachment #1: Type: text/plain, Size: 5621 bytes --] On Wed, Mar 25, 2020 at 08:18:28PM +0100, Philippe Mathieu-Daudé wrote: > Running the coccinelle script produced: > > $ spatch \ > --macro-file scripts/cocci-macro-file.h --include-headers \ > --sp-file scripts/coccinelle/object_property_missing_error_propagate.cocci \ > --keep-comments --smpl-spacing --dir hw > > [[manual check required: error_propagate() might be missing in object_property_set_bool() hw/misc/macio/macio.c:350:8]] > > Add the missing error_propagate() after manual review. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> Acked-by: David Gibson <david@gibson.dropbear.id.au> > --- > hw/misc/macio/macio.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c > index 79222192e8..fffb64a7d5 100644 > --- a/hw/misc/macio/macio.c > +++ b/hw/misc/macio/macio.c > @@ -292,98 +292,102 @@ static const MemoryRegionOps timer_ops = { > static void macio_newworld_realize(PCIDevice *d, Error **errp) > { > MacIOState *s = MACIO(d); > NewWorldMacIOState *ns = NEWWORLD_MACIO(d); > DeviceState *pic_dev = DEVICE(ns->pic); > Error *err = NULL; > SysBusDevice *sysbus_dev; > MemoryRegion *timer_memory = NULL; > > macio_common_realize(d, &err); > if (err) { > error_propagate(errp, err); > return; > } > > sysbus_dev = 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)); > > /* OpenPIC */ > sysbus_dev = SYS_BUS_DEVICE(ns->pic); > memory_region_add_subregion(&s->bar, 0x40000, > sysbus_mmio_get_region(sysbus_dev, 0)); > > /* 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); > return; > } > > 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); > return; > } > > /* Timer */ > timer_memory = g_new(MemoryRegion, 1); > memory_region_init_io(timer_memory, OBJECT(s), &timer_ops, NULL, "timer", > 0x1000); > memory_region_add_subregion(&s->bar, 0x15000, timer_memory); > > if (ns->has_pmu) { > /* GPIOs */ > sysbus_dev = SYS_BUS_DEVICE(&ns->gpio); > object_property_set_link(OBJECT(&ns->gpio), OBJECT(pic_dev), "pic", > &error_abort); > memory_region_add_subregion(&s->bar, 0x50, > sysbus_mmio_get_region(sysbus_dev, 0)); > object_property_set_bool(OBJECT(&ns->gpio), true, "realized", &err); > + if (err) { > + error_propagate(errp, err); > + return; > + } > > /* PMU */ > object_initialize_child(OBJECT(s), "pmu", &s->pmu, sizeof(s->pmu), > TYPE_VIA_PMU, &error_abort, NULL); > object_property_set_link(OBJECT(&s->pmu), OBJECT(sysbus_dev), "gpio", > &error_abort); > qdev_prop_set_bit(DEVICE(&s->pmu), "has-adb", ns->has_adb); > qdev_set_parent_bus(DEVICE(&s->pmu), BUS(&s->macio_bus)); > > object_property_set_bool(OBJECT(&s->pmu), true, "realized", &err); > if (err) { > error_propagate(errp, err); > return; > } > sysbus_dev = SYS_BUS_DEVICE(&s->pmu); > sysbus_connect_irq(sysbus_dev, 0, qdev_get_gpio_in(pic_dev, > NEWWORLD_PMU_IRQ)); > memory_region_add_subregion(&s->bar, 0x16000, > sysbus_mmio_get_region(sysbus_dev, 0)); > } else { > /* CUDA */ > object_initialize_child(OBJECT(s), "cuda", &s->cuda, sizeof(s->cuda), > TYPE_CUDA, &error_abort, NULL); > qdev_set_parent_bus(DEVICE(&s->cuda), BUS(&s->macio_bus)); > qdev_prop_set_uint64(DEVICE(&s->cuda), "timebase-frequency", > s->frequency); > > object_property_set_bool(OBJECT(&s->cuda), true, "realized", &err); > if (err) { > error_propagate(errp, err); > return; > } > sysbus_dev = SYS_BUS_DEVICE(&s->cuda); > sysbus_connect_irq(sysbus_dev, 0, qdev_get_gpio_in(pic_dev, > NEWWORLD_CUDA_IRQ)); > memory_region_add_subregion(&s->bar, 0x16000, > sysbus_mmio_get_region(sysbus_dev, 0)); > } > } -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: David Gibson <david@gibson.dropbear.id.au> To: "Philippe Mathieu-Daudé" <f4bug@amsat.org> Cc: qemu-devel@nongnu.org, "Alistair Francis" <alistair@alistair23.me>, "Paul Burton" <pburton@wavecomp.com>, "Palmer Dabbelt" <palmer@dabbelt.com>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, qemu-ppc@nongnu.org, "Jason Wang" <jasowang@redhat.com>, "Sagar Karandikar" <sagark@eecs.berkeley.edu>, "Richard Henderson" <rth@twiddle.net>, "Peter Maydell" <peter.maydell@linaro.org>, "Eduardo Habkost" <ehabkost@redhat.com>, "Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>, "Alistair Francis" <Alistair.Francis@wdc.com>, "Bastian Koppelmann" <kbastian@mail.uni-paderborn.de>, qemu-arm@nongnu.org, qemu-riscv@nongnu.org, "Andrew Baumann" <Andrew.Baumann@microsoft.com>, "Aleksandar Markovic" <aleksandar.qemu.devel@gmail.com>, "Jean-Christophe Dubois" <jcd@tribudubois.net>, "Michael S. Tsirkin" <mst@redhat.com>, "Markus Armbruster" <armbru@redhat.com>, "Aurelien Jarno" <aurelien@aurel32.net>, "Aleksandar Rikalo" <aleksandar.rikalo@rt-rk.com>, "Paolo Bonzini" <pbonzini@redhat.com>, "Philippe Mathieu-Daudé" <philmd@redhat.com>, "Marcel Apfelbaum" <marcel.apfelbaum@gmail.com> Subject: Re: [PATCH-for-5.0 10/12] hw/misc/macio/macio: Add missing error-propagation code Date: Thu, 26 Mar 2020 10:55:16 +1100 [thread overview] Message-ID: <20200325235516.GG36889@umbus.fritz.box> (raw) In-Reply-To: <20200325191830.16553-11-f4bug@amsat.org> [-- Attachment #1: Type: text/plain, Size: 5621 bytes --] On Wed, Mar 25, 2020 at 08:18:28PM +0100, Philippe Mathieu-Daudé wrote: > Running the coccinelle script produced: > > $ spatch \ > --macro-file scripts/cocci-macro-file.h --include-headers \ > --sp-file scripts/coccinelle/object_property_missing_error_propagate.cocci \ > --keep-comments --smpl-spacing --dir hw > > [[manual check required: error_propagate() might be missing in object_property_set_bool() hw/misc/macio/macio.c:350:8]] > > Add the missing error_propagate() after manual review. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> Acked-by: David Gibson <david@gibson.dropbear.id.au> > --- > hw/misc/macio/macio.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c > index 79222192e8..fffb64a7d5 100644 > --- a/hw/misc/macio/macio.c > +++ b/hw/misc/macio/macio.c > @@ -292,98 +292,102 @@ static const MemoryRegionOps timer_ops = { > static void macio_newworld_realize(PCIDevice *d, Error **errp) > { > MacIOState *s = MACIO(d); > NewWorldMacIOState *ns = NEWWORLD_MACIO(d); > DeviceState *pic_dev = DEVICE(ns->pic); > Error *err = NULL; > SysBusDevice *sysbus_dev; > MemoryRegion *timer_memory = NULL; > > macio_common_realize(d, &err); > if (err) { > error_propagate(errp, err); > return; > } > > sysbus_dev = 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)); > > /* OpenPIC */ > sysbus_dev = SYS_BUS_DEVICE(ns->pic); > memory_region_add_subregion(&s->bar, 0x40000, > sysbus_mmio_get_region(sysbus_dev, 0)); > > /* 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); > return; > } > > 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); > return; > } > > /* Timer */ > timer_memory = g_new(MemoryRegion, 1); > memory_region_init_io(timer_memory, OBJECT(s), &timer_ops, NULL, "timer", > 0x1000); > memory_region_add_subregion(&s->bar, 0x15000, timer_memory); > > if (ns->has_pmu) { > /* GPIOs */ > sysbus_dev = SYS_BUS_DEVICE(&ns->gpio); > object_property_set_link(OBJECT(&ns->gpio), OBJECT(pic_dev), "pic", > &error_abort); > memory_region_add_subregion(&s->bar, 0x50, > sysbus_mmio_get_region(sysbus_dev, 0)); > object_property_set_bool(OBJECT(&ns->gpio), true, "realized", &err); > + if (err) { > + error_propagate(errp, err); > + return; > + } > > /* PMU */ > object_initialize_child(OBJECT(s), "pmu", &s->pmu, sizeof(s->pmu), > TYPE_VIA_PMU, &error_abort, NULL); > object_property_set_link(OBJECT(&s->pmu), OBJECT(sysbus_dev), "gpio", > &error_abort); > qdev_prop_set_bit(DEVICE(&s->pmu), "has-adb", ns->has_adb); > qdev_set_parent_bus(DEVICE(&s->pmu), BUS(&s->macio_bus)); > > object_property_set_bool(OBJECT(&s->pmu), true, "realized", &err); > if (err) { > error_propagate(errp, err); > return; > } > sysbus_dev = SYS_BUS_DEVICE(&s->pmu); > sysbus_connect_irq(sysbus_dev, 0, qdev_get_gpio_in(pic_dev, > NEWWORLD_PMU_IRQ)); > memory_region_add_subregion(&s->bar, 0x16000, > sysbus_mmio_get_region(sysbus_dev, 0)); > } else { > /* CUDA */ > object_initialize_child(OBJECT(s), "cuda", &s->cuda, sizeof(s->cuda), > TYPE_CUDA, &error_abort, NULL); > qdev_set_parent_bus(DEVICE(&s->cuda), BUS(&s->macio_bus)); > qdev_prop_set_uint64(DEVICE(&s->cuda), "timebase-frequency", > s->frequency); > > object_property_set_bool(OBJECT(&s->cuda), true, "realized", &err); > if (err) { > error_propagate(errp, err); > return; > } > sysbus_dev = SYS_BUS_DEVICE(&s->cuda); > sysbus_connect_irq(sysbus_dev, 0, qdev_get_gpio_in(pic_dev, > NEWWORLD_CUDA_IRQ)); > memory_region_add_subregion(&s->bar, 0x16000, > sysbus_mmio_get_region(sysbus_dev, 0)); > } > } -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2020-03-26 0:44 UTC|newest] Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-03-25 19:18 [PATCH-for-5.0 00/12] hw: Add missing error-propagation code Philippe Mathieu-Daudé 2020-03-25 19:18 ` Philippe Mathieu-Daudé 2020-03-25 19:18 ` [PATCH-for-5.0 01/12] scripts/coccinelle: Add script to catch missing error_propagate() calls Philippe Mathieu-Daudé 2020-03-25 19:18 ` Philippe Mathieu-Daudé 2020-03-26 21:32 ` Peter Maydell 2020-03-26 21:32 ` Peter Maydell 2020-03-25 19:18 ` [PATCH-for-5.0 02/12] hw/arm/bcm2835_peripherals: Add missing error-propagation code Philippe Mathieu-Daudé 2020-03-25 19:18 ` Philippe Mathieu-Daudé 2020-03-26 21:34 ` Peter Maydell 2020-03-26 21:34 ` Peter Maydell 2020-03-25 19:18 ` [PATCH-for-5.0 03/12] hw/arm/fsl-imx: " Philippe Mathieu-Daudé 2020-03-25 19:18 ` Philippe Mathieu-Daudé 2020-03-26 21:35 ` Peter Maydell 2020-03-26 21:35 ` Peter Maydell 2020-03-25 19:18 ` [PATCH-for-5.0 04/12] hw/arm/stm32fx05_soc: " Philippe Mathieu-Daudé 2020-03-25 19:18 ` Philippe Mathieu-Daudé 2020-03-25 20:51 ` Alistair Francis 2020-03-25 20:51 ` Alistair Francis 2020-03-26 21:45 ` Peter Maydell 2020-03-26 21:45 ` Peter Maydell 2020-03-25 19:18 ` [PATCH-for-5.0 05/12] hw/i386/x86: " Philippe Mathieu-Daudé 2020-03-25 19:18 ` Philippe Mathieu-Daudé 2020-03-26 21:38 ` Peter Maydell 2020-03-26 21:38 ` Peter Maydell 2020-03-25 19:18 ` [PATCH-for-5.0 06/12] hw/dma/xilinx_axidma: " Philippe Mathieu-Daudé 2020-03-25 19:18 ` Philippe Mathieu-Daudé 2020-03-25 20:52 ` Alistair Francis 2020-03-25 20:52 ` Alistair Francis 2020-03-26 21:46 ` Peter Maydell 2020-03-26 21:46 ` Peter Maydell 2020-03-25 19:18 ` [PATCH-for-5.0 07/12] hw/mips/cps: " Philippe Mathieu-Daudé 2020-03-25 19:18 ` Philippe Mathieu-Daudé 2020-03-26 21:43 ` Peter Maydell 2020-03-26 21:43 ` Peter Maydell 2020-03-26 22:48 ` Aleksandar Markovic 2020-03-26 22:48 ` Aleksandar Markovic 2020-03-25 19:18 ` [PATCH-for-5.0 08/12] hw/mips/boston: " Philippe Mathieu-Daudé 2020-03-25 19:18 ` Philippe Mathieu-Daudé 2020-03-26 21:47 ` Peter Maydell 2020-03-26 21:47 ` Peter Maydell 2020-03-26 22:50 ` Aleksandar Markovic 2020-03-26 22:50 ` Aleksandar Markovic 2020-03-25 19:18 ` [PATCH-for-5.0 09/12] hw/mips/mips_malta: " Philippe Mathieu-Daudé 2020-03-25 19:18 ` Philippe Mathieu-Daudé 2020-03-26 21:49 ` Peter Maydell 2020-03-26 21:49 ` Peter Maydell 2020-03-26 22:49 ` Aleksandar Markovic 2020-03-26 22:49 ` Aleksandar Markovic 2020-03-25 19:18 ` [PATCH-for-5.0 10/12] hw/misc/macio/macio: " Philippe Mathieu-Daudé 2020-03-25 19:18 ` Philippe Mathieu-Daudé 2020-03-25 23:55 ` David Gibson [this message] 2020-03-25 23:55 ` David Gibson 2020-03-26 21:50 ` Peter Maydell 2020-03-26 21:50 ` Peter Maydell 2020-03-25 19:18 ` [PATCH-for-5.0 11/12] hw/net/xilinx_axienet: " Philippe Mathieu-Daudé 2020-03-25 19:18 ` Philippe Mathieu-Daudé 2020-03-25 20:52 ` Alistair Francis 2020-03-25 20:52 ` Alistair Francis 2020-03-26 21:51 ` Peter Maydell 2020-03-26 21:51 ` Peter Maydell 2020-03-25 19:18 ` [PATCH-for-5.0 12/12] hw/riscv/sifive_u: " Philippe Mathieu-Daudé 2020-03-25 19:18 ` Philippe Mathieu-Daudé 2020-03-25 20:52 ` Alistair Francis 2020-03-25 20:52 ` Alistair Francis 2020-03-26 21:55 ` Peter Maydell 2020-03-26 21:55 ` Peter Maydell 2020-03-31 17:02 ` Philippe Mathieu-Daudé 2020-03-31 17:02 ` Philippe Mathieu-Daudé 2020-03-31 17:03 ` Peter Maydell 2020-03-31 17:03 ` Peter Maydell 2020-03-25 19:20 ` [PATCH-for-5.0 00/12] hw: " Philippe Mathieu-Daudé 2020-03-25 19:20 ` Philippe Mathieu-Daudé 2020-03-30 9:21 ` Stefan Hajnoczi 2020-03-30 9:21 ` Stefan Hajnoczi 2020-04-06 17:47 ` Philippe Mathieu-Daudé 2020-04-06 17:47 ` Philippe Mathieu-Daudé 2020-03-31 13:23 ` Markus Armbruster 2020-03-31 13:23 ` Markus Armbruster 2020-04-03 17:53 ` Philippe Mathieu-Daudé 2020-04-03 17:53 ` Philippe Mathieu-Daudé 2020-04-04 5:55 ` Markus Armbruster 2020-04-04 5:55 ` Markus Armbruster
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200325235516.GG36889@umbus.fritz.box \ --to=david@gibson.dropbear.id.au \ --cc=Alistair.Francis@wdc.com \ --cc=Andrew.Baumann@microsoft.com \ --cc=aleksandar.qemu.devel@gmail.com \ --cc=aleksandar.rikalo@rt-rk.com \ --cc=alistair@alistair23.me \ --cc=armbru@redhat.com \ --cc=aurelien@aurel32.net \ --cc=edgar.iglesias@gmail.com \ --cc=ehabkost@redhat.com \ --cc=f4bug@amsat.org \ --cc=jasowang@redhat.com \ --cc=jcd@tribudubois.net \ --cc=kbastian@mail.uni-paderborn.de \ --cc=mark.cave-ayland@ilande.co.uk \ --cc=mst@redhat.com \ --cc=palmer@dabbelt.com \ --cc=pbonzini@redhat.com \ --cc=pburton@wavecomp.com \ --cc=peter.maydell@linaro.org \ --cc=philmd@redhat.com \ --cc=qemu-arm@nongnu.org \ --cc=qemu-devel@nongnu.org \ --cc=qemu-ppc@nongnu.org \ --cc=qemu-riscv@nongnu.org \ --cc=rth@twiddle.net \ --cc=sagark@eecs.berkeley.edu \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.