Re: [PATCH-for-5.0 03/12] hw/arm/fsl-imx: Add missing error-propagation code

[Peter Maydell]

On Wed, 25 Mar 2020 at 19:18, Philippe Mathieu-Daudé  wrote:
>
> Patch created mechanically by running:
>
>   $ spatch \
> --macro-file scripts/cocci-macro-file.h --include-headers \
> --sp-file 
> scripts/coccinelle/object_property_missing_error_propagate.cocci \
> --keep-comments --smpl-spacing --in-place --dir hw
>
> Signed-off-by: Philippe Mathieu-Daudé 

Reviewed-by: Peter Maydell 

thanks
-- PMM

[PATCH-for-5.0 03/12] hw/arm/fsl-imx: Add missing error-propagation code

[Philippe Mathieu-Daudé]

Patch created mechanically by running:

  $ spatch \
--macro-file scripts/cocci-macro-file.h --include-headers \
--sp-file scripts/coccinelle/object_property_missing_error_propagate.cocci \
--keep-comments --smpl-spacing --in-place --dir hw

Signed-off-by: Philippe Mathieu-Daudé 
---
 hw/arm/fsl-imx25.c | 8 
 hw/arm/fsl-imx6.c  | 8 
 2 files changed, 16 insertions(+)

diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c
index 6f1a82ce3d..c915a2106d 100644
--- a/hw/arm/fsl-imx25.c
+++ b/hw/arm/fsl-imx25.c
@@ -92,247 +92,255 @@ static void fsl_imx25_init(Object *obj)
 static void fsl_imx25_realize(DeviceState *dev, Error **errp)
 {
 FslIMX25State *s = FSL_IMX25(dev);
 uint8_t i;
 Error *err = NULL;
 
 object_property_set_bool(OBJECT(&s->cpu), true, "realized", &err);
 if (err) {
 error_propagate(errp, err);
 return;
 }
 
 object_property_set_bool(OBJECT(&s->avic), true, "realized", &err);
 if (err) {
 error_propagate(errp, err);
 return;
 }
 sysbus_mmio_map(SYS_BUS_DEVICE(&s->avic), 0, FSL_IMX25_AVIC_ADDR);
 sysbus_connect_irq(SYS_BUS_DEVICE(&s->avic), 0,
qdev_get_gpio_in(DEVICE(&s->cpu), ARM_CPU_IRQ));
 sysbus_connect_irq(SYS_BUS_DEVICE(&s->avic), 1,
qdev_get_gpio_in(DEVICE(&s->cpu), ARM_CPU_FIQ));
 
 object_property_set_bool(OBJECT(&s->ccm), true, "realized", &err);
 if (err) {
 error_propagate(errp, err);
 return;
 }
 sysbus_mmio_map(SYS_BUS_DEVICE(&s->ccm), 0, FSL_IMX25_CCM_ADDR);
 
 /* Initialize all UARTs */
 for (i = 0; i < FSL_IMX25_NUM_UARTS; i++) {
 static const struct {
 hwaddr addr;
 unsigned int irq;
 } serial_table[FSL_IMX25_NUM_UARTS] = {
 { FSL_IMX25_UART1_ADDR, FSL_IMX25_UART1_IRQ },
 { FSL_IMX25_UART2_ADDR, FSL_IMX25_UART2_IRQ },
 { FSL_IMX25_UART3_ADDR, FSL_IMX25_UART3_IRQ },
 { FSL_IMX25_UART4_ADDR, FSL_IMX25_UART4_IRQ },
 { FSL_IMX25_UART5_ADDR, FSL_IMX25_UART5_IRQ }
 };
 
 qdev_prop_set_chr(DEVICE(&s->uart[i]), "chardev", serial_hd(i));
 
 object_property_set_bool(OBJECT(&s->uart[i]), true, "realized", &err);
 if (err) {
 error_propagate(errp, err);
 return;
 }
 sysbus_mmio_map(SYS_BUS_DEVICE(&s->uart[i]), 0, serial_table[i].addr);
 sysbus_connect_irq(SYS_BUS_DEVICE(&s->uart[i]), 0,
qdev_get_gpio_in(DEVICE(&s->avic),
 serial_table[i].irq));
 }
 
 /* Initialize all GPT timers */
 for (i = 0; i < FSL_IMX25_NUM_GPTS; i++) {
 static const struct {
 hwaddr addr;
 unsigned int irq;
 } gpt_table[FSL_IMX25_NUM_GPTS] = {
 { FSL_IMX25_GPT1_ADDR, FSL_IMX25_GPT1_IRQ },
 { FSL_IMX25_GPT2_ADDR, FSL_IMX25_GPT2_IRQ },
 { FSL_IMX25_GPT3_ADDR, FSL_IMX25_GPT3_IRQ },
 { FSL_IMX25_GPT4_ADDR, FSL_IMX25_GPT4_IRQ }
 };
 
 s->gpt[i].ccm = IMX_CCM(&s->ccm);
 
 object_property_set_bool(OBJECT(&s->gpt[i]), true, "realized", &err);
 if (err) {
 error_propagate(errp, err);
 return;
 }
 sysbus_mmio_map(SYS_BUS_DEVICE(&s->gpt[i]), 0, gpt_table[i].addr);
 sysbus_connect_irq(SYS_BUS_DEVICE(&s->gpt[i]), 0,
qdev_get_gpio_in(DEVICE(&s->avic),
 gpt_table[i].irq));
 }
 
 /* Initialize all EPIT timers */
 for (i = 0; i < FSL_IMX25_NUM_EPITS; i++) {
 static const struct {
 hwaddr addr;
 unsigned int irq;
 } epit_table[FSL_IMX25_NUM_EPITS] = {
 { FSL_IMX25_EPIT1_ADDR, FSL_IMX25_EPIT1_IRQ },
 { FSL_IMX25_EPIT2_ADDR, FSL_IMX25_EPIT2_IRQ }
 };
 
 s->epit[i].ccm = IMX_CCM(&s->ccm);
 
 object_property_set_bool(OBJECT(&s->epit[i]), true, "realized", &err);
 if (err) {
 error_propagate(errp, err);
 return;
 }
 sysbus_mmio_map(SYS_BUS_DEVICE(&s->epit[i]), 0, epit_table[i].addr);
 sysbus_connect_irq(SYS_BUS_DEVICE(&s->epit[i]), 0,
qdev_get_gpio_in(DEVICE(&s->avic),
 epit_table[i].irq));
 }
 
 qdev_set_nic_properties(DEVICE(&s->fec), &nd_table[0]);
 
 object_property_set_bool(OBJECT(&s->fec), true, "realized", &err);
 if (err) {
 error_propagate(errp, err);
 return;
 }
 sysbus_mmio_map(SYS_BUS_DEVICE(&s->fec), 0, FSL_IMX25_FEC_ADDR);
 sysbus_connect_irq(SYS_BUS_DEVICE(&s->fec), 0,
qdev_get_gpio_in(DEVICE(&s->avic), FSL_IMX25_FEC_IRQ));
 
 object_property_set_bool(OBJECT(&s->rngc), true, "realized", &err);
 if (err) {
 error_propagate(errp, err);