Re: [PATCH-for-9.0 22/25] hw/sparc: Simplify memory_region_init_ram_nomigrate() calls

[Philippe Mathieu-Daudé]

On 20/11/23 22:32, Philippe Mathieu-Daudé wrote:

Mechanical change using the following coccinelle script:

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

and removing the local Error variable.

Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org>
---
  hw/sparc/sun4m.c   | 20 ++++++--------------
  hw/sparc64/sun4u.c |  7 ++-----
  2 files changed, 8 insertions(+), 19 deletions(-)

@@ -631,11 +628,9 @@ static void afx_realize(DeviceState *ds, Error **errp)
  {
      AFXState *s = TCX_AFX(ds);
      SysBusDevice *dev = SYS_BUS_DEVICE(ds);
-    Error *local_err = NULL;

- memory_region_init_ram_nomigrate(&s->mem, OBJECT(ds), "sun4m.afx", 4,

-                                     &local_err);
-    if (local_err) {
+    if (!memory_region_init_ram_nomigrate(&s->mem, OBJECT(ds), "sun4m.afx",
+                                          4, errp)) {
          error_propagate(errp, local_err);

I forgot to remove this error_propagate() line.

          return;
      }
@@ -715,12 +710,9 @@ static void prom_realize(DeviceState *ds, Error **errp)
  {
      PROMState *s = OPENPROM(ds);
      SysBusDevice *dev = SYS_BUS_DEVICE(ds);
-    Error *local_err = NULL;

- memory_region_init_ram_nomigrate(&s->prom, OBJECT(ds), "sun4m.prom",

-                                     PROM_SIZE_MAX, &local_err);
-    if (local_err) {
-        error_propagate(errp, local_err);
+    if (!memory_region_init_ram_nomigrate(&s->prom, OBJECT(ds), "sun4m.prom",
+                                          PROM_SIZE_MAX, errp)) {
          return;
      }