dfaggioli/qemu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hw/sparc: Simplify memory_region_init_ram_nomigrate() calls

Browse Source 
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é <philmd@linaro.org>
Reviewed-by: Gavin Shan <gshan@redhat.com>
Message-Id: <20231120213301.24349-23-philmd@linaro.org>
(cherry picked from commit 02e0ecb42c)
Signed-off-by: Dario Faggioli <dfaggioli@suse.com>
This commit is contained in:
Philippe Mathieu-Daudé
2023-11-20 13:23:33 +01:00
committed by Dario Faggioli
parent a577ef502b
commit b310e8bee1
2 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
hw/sparc/sun4m.c
View File

@@ -577,12 +577,9 @@ static void idreg_realize(DeviceState *ds, Error **errp)
{ {
IDRegState *s = MACIO_ID_REGISTER(ds); IDRegState *s = MACIO_ID_REGISTER(ds);
SysBusDevice *dev = SYS_BUS_DEVICE(ds); SysBusDevice *dev = SYS_BUS_DEVICE(ds);
Error *local_err = NULL;
memory_region_init_ram_nomigrate(&s->mem, OBJECT(ds), "sun4m.idreg", if (!memory_region_init_ram_nomigrate(&s->mem, OBJECT(ds), "sun4m.idreg",
sizeof(idreg_data), &local_err); sizeof(idreg_data), errp)) {
if (local_err) {
error_propagate(errp, local_err);
return; return;
} }
@@ -631,12 +628,9 @@ static void afx_realize(DeviceState *ds, Error **errp)
{ {
AFXState *s = TCX_AFX(ds); AFXState *s = TCX_AFX(ds);
SysBusDevice *dev = SYS_BUS_DEVICE(ds); SysBusDevice *dev = SYS_BUS_DEVICE(ds);
Error *local_err = NULL;
memory_region_init_ram_nomigrate(&s->mem, OBJECT(ds), "sun4m.afx", 4, if (!memory_region_init_ram_nomigrate(&s->mem, OBJECT(ds), "sun4m.afx",
&local_err); 4, errp)) {
if (local_err) {
error_propagate(errp, local_err);
return; return;
} }
@@ -715,12 +709,9 @@ static void prom_realize(DeviceState *ds, Error **errp)
{ {
PROMState *s = OPENPROM(ds); PROMState *s = OPENPROM(ds);
SysBusDevice *dev = SYS_BUS_DEVICE(ds); SysBusDevice *dev = SYS_BUS_DEVICE(ds);
Error *local_err = NULL;
memory_region_init_ram_nomigrate(&s->prom, OBJECT(ds), "sun4m.prom", if (!memory_region_init_ram_nomigrate(&s->prom, OBJECT(ds), "sun4m.prom",
PROM_SIZE_MAX, &local_err); PROM_SIZE_MAX, errp)) {
if (local_err) {
error_propagate(errp, local_err);
return; return;
} }

7
hw/sparc64/sun4u.c
View File

@@ -454,12 +454,9 @@ static void prom_realize(DeviceState *ds, Error **errp)
{ {
PROMState *s = OPENPROM(ds); PROMState *s = OPENPROM(ds);
SysBusDevice *dev = SYS_BUS_DEVICE(ds); SysBusDevice *dev = SYS_BUS_DEVICE(ds);
Error *local_err = NULL;
memory_region_init_ram_nomigrate(&s->prom, OBJECT(ds), "sun4u.prom", if (!memory_region_init_ram_nomigrate(&s->prom, OBJECT(ds), "sun4u.prom",
PROM_SIZE_MAX, &local_err); PROM_SIZE_MAX, errp)) {
if (local_err) {
error_propagate(errp, local_err);
return; return;
} }