Re: [PATCH-for-9.0 20/25] hw: Simplify memory_region_init_ram() calls

2023-12-03 Thread Gavin Shan 

On 11/21/23 07:32, Philippe Mathieu-Daudé wrote:

Mechanical change using the following coccinelle script:

@@
expression mr, owner, arg3, arg4, errp;
@@
-   memory_region_init_ram(mr, owner, arg3, arg4, &errp);
 if (
-   errp
+   !memory_region_init_ram(mr, owner, arg3, arg4, &errp)
 ) {
 ...
 return;
 }

and removing the local Error variable.

Signed-off-by: Philippe Mathieu-Daudé 
---
  hw/arm/aspeed_ast2400.c | 6 ++
  hw/arm/aspeed_ast2600.c | 6 ++
  hw/arm/fsl-imx25.c  | 6 ++
  hw/arm/fsl-imx31.c  | 6 ++
  hw/arm/fsl-imx6.c   | 6 ++
  hw/arm/integratorcp.c   | 7 ++-
  hw/arm/nrf51_soc.c  | 7 ++-
  hw/ppc/rs6000_mc.c  | 7 ++-
  8 files changed, 16 insertions(+), 35 deletions(-)



Reviewed-by: Gavin Shan

Re: [PATCH-for-9.0 20/25] hw: Simplify memory_region_init_ram() calls

2023-11-26 Thread Andrew Jeffery 
On Mon, 2023-11-20 at 22:32 +0100, Philippe Mathieu-Daudé wrote:
> Mechanical change using the following coccinelle script:
> 
> @@
> expression mr, owner, arg3, arg4, errp;
> @@
> -   memory_region_init_ram(mr, owner, arg3, arg4, &errp);
> if (
> -   errp
> +   !memory_region_init_ram(mr, owner, arg3, arg4, &errp)
> ) {
> ...
> return;
> }
> 
> and removing the local Error variable.
> 
> Signed-off-by: Philippe Mathieu-Daudé 
> ---
>  hw/arm/aspeed_ast2400.c | 6 ++
>  hw/arm/aspeed_ast2600.c | 6 ++

For my own benefit it looks like the motivating thread for this series
is: 

https://lore.kernel.org/qemu-devel/936e1ac4-cef8-08b4-c688-e5b1e0572...@linaro.org/

Anyway,

Reviewed-by: Andrew Jeffery  # aspeed

Re: [PATCH-for-9.0 20/25] hw: Simplify memory_region_init_ram() calls

2023-11-21 Thread Manos Pitsidianakis 

On Mon, 20 Nov 2023 23:32, Philippe Mathieu-Daudé  wrote:

Mechanical change using the following coccinelle script:

@@
expression mr, owner, arg3, arg4, errp;
@@
-   memory_region_init_ram(mr, owner, arg3, arg4, &errp);
   if (
-   errp
+   !memory_region_init_ram(mr, owner, arg3, arg4, &errp)
   ) {
   ...
   return;
   }

and removing the local Error variable.

Signed-off-by: Philippe Mathieu-Daudé 
---


Reviewed-by: Manos Pitsidianakis

[PATCH-for-9.0 20/25] hw: Simplify memory_region_init_ram() calls

2023-11-20 Thread Philippe Mathieu-Daudé 
Mechanical change using the following coccinelle script:

@@
expression mr, owner, arg3, arg4, errp;
@@
-   memory_region_init_ram(mr, owner, arg3, arg4, &errp);
if (
-   errp
+   !memory_region_init_ram(mr, owner, arg3, arg4, &errp)
) {
...
return;
}

and removing the local Error variable.

Signed-off-by: Philippe Mathieu-Daudé 
---
 hw/arm/aspeed_ast2400.c | 6 ++
 hw/arm/aspeed_ast2600.c | 6 ++
 hw/arm/fsl-imx25.c  | 6 ++
 hw/arm/fsl-imx31.c  | 6 ++
 hw/arm/fsl-imx6.c   | 6 ++
 hw/arm/integratorcp.c   | 7 ++-
 hw/arm/nrf51_soc.c  | 7 ++-
 hw/ppc/rs6000_mc.c  | 7 ++-
 8 files changed, 16 insertions(+), 35 deletions(-)

diff --git a/hw/arm/aspeed_ast2400.c b/hw/arm/aspeed_ast2400.c
index a4334c81b8..0baa2ff96e 100644
--- a/hw/arm/aspeed_ast2400.c
+++ b/hw/arm/aspeed_ast2400.c
@@ -247,7 +247,6 @@ static void aspeed_ast2400_soc_realize(DeviceState *dev, 
Error **errp)
 Aspeed2400SoCState *a = ASPEED2400_SOC(dev);
 AspeedSoCState *s = ASPEED_SOC(dev);
 AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s);
-Error *err = NULL;
 g_autofree char *sram_name = NULL;
 
 /* Default boot region (SPI memory or ROMs) */
@@ -276,9 +275,8 @@ static void aspeed_ast2400_soc_realize(DeviceState *dev, 
Error **errp)
 
 /* SRAM */
 sram_name = g_strdup_printf("aspeed.sram.%d", CPU(&a->cpu[0])->cpu_index);
-memory_region_init_ram(&s->sram, OBJECT(s), sram_name, sc->sram_size, 
&err);
-if (err) {
-error_propagate(errp, err);
+if (!memory_region_init_ram(&s->sram, OBJECT(s), sram_name, sc->sram_size,
+errp)) {
 return;
 }
 memory_region_add_subregion(s->memory,
diff --git a/hw/arm/aspeed_ast2600.c b/hw/arm/aspeed_ast2600.c
index b965fbab5e..3a9a303ab8 100644
--- a/hw/arm/aspeed_ast2600.c
+++ b/hw/arm/aspeed_ast2600.c
@@ -282,7 +282,6 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev, 
Error **errp)
 Aspeed2600SoCState *a = ASPEED2600_SOC(dev);
 AspeedSoCState *s = ASPEED_SOC(dev);
 AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s);
-Error *err = NULL;
 qemu_irq irq;
 g_autofree char *sram_name = NULL;
 
@@ -355,9 +354,8 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev, 
Error **errp)
 
 /* SRAM */
 sram_name = g_strdup_printf("aspeed.sram.%d", CPU(&a->cpu[0])->cpu_index);
-memory_region_init_ram(&s->sram, OBJECT(s), sram_name, sc->sram_size, 
&err);
-if (err) {
-error_propagate(errp, err);
+if (!memory_region_init_ram(&s->sram, OBJECT(s), sram_name, sc->sram_size,
+errp)) {
 return;
 }
 memory_region_add_subregion(s->memory,
diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c
index 9aabbf7f58..b15435ccaf 100644
--- a/hw/arm/fsl-imx25.c
+++ b/hw/arm/fsl-imx25.c
@@ -299,10 +299,8 @@ static void fsl_imx25_realize(DeviceState *dev, Error 
**errp)
 &s->rom[1]);
 
 /* initialize internal RAM (128 KB) */
-memory_region_init_ram(&s->iram, NULL, "imx25.iram", FSL_IMX25_IRAM_SIZE,
-   &err);
-if (err) {
-error_propagate(errp, err);
+if (!memory_region_init_ram(&s->iram, NULL, "imx25.iram",
+FSL_IMX25_IRAM_SIZE, errp)) {
 return;
 }
 memory_region_add_subregion(get_system_memory(), FSL_IMX25_IRAM_ADDR,
diff --git a/hw/arm/fsl-imx31.c b/hw/arm/fsl-imx31.c
index def27bb913..1d5dcd51e8 100644
--- a/hw/arm/fsl-imx31.c
+++ b/hw/arm/fsl-imx31.c
@@ -208,10 +208,8 @@ static void fsl_imx31_realize(DeviceState *dev, Error 
**errp)
 &s->rom);
 
 /* initialize internal RAM (16 KB) */
-memory_region_init_ram(&s->iram, NULL, "imx31.iram", FSL_IMX31_IRAM_SIZE,
-   &err);
-if (err) {
-error_propagate(errp, err);
+if (!memory_region_init_ram(&s->iram, NULL, "imx31.iram",
+FSL_IMX31_IRAM_SIZE, errp)) {
 return;
 }
 memory_region_add_subregion(get_system_memory(), FSL_IMX31_IRAM_ADDR,
diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c
index 7dc42cbfe6..58f37e7c11 100644
--- a/hw/arm/fsl-imx6.c
+++ b/hw/arm/fsl-imx6.c
@@ -443,10 +443,8 @@ static void fsl_imx6_realize(DeviceState *dev, Error 
**errp)
 &s->caam);
 
 /* OCRAM memory */
-memory_region_init_ram(&s->ocram, NULL, "imx6.ocram", FSL_IMX6_OCRAM_SIZE,
-   &err);
-if (err) {
-error_propagate(errp, err);
+if (!memory_region_init_ram(&s->ocram, NULL, "imx6.ocram",
+FSL_IMX6_OCRAM_SIZE, errp)) {
 return;
 }
 memory_region_add_subregion(get_system_memory(), FSL_IMX6_OCRAM_ADDR,
diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c
index d176e9af7e..bb722fd46f 100644
--- a/hw/arm/integratorcp.c
+++ b/hw/arm/integratorcp.c
@@ -291,12 +291,9