commit fd7549ee1396fc8051aac5e4cfc81458591ceafe
author Philippe Mathieu-Daudé <philmd@linaro.org> Mon Nov 20 13:26:39 2023 +0100
committer Philippe Mathieu-Daudé <philmd@linaro.org> Fri Jan 05 16:20:15 2024 +0100
tree dcbcd2b216dbe1a889ccd1123f578288e1939800
parent 197faa7006313407ade82de8bc49d52da610da46

memory: Simplify memory_region_init_rom_nomigrate() calls

Mechanical change using the following coccinelle script:

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

and removing the local Error variable.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Gavin Shan <gshan@redhat.com>
Message-Id: <20231120213301.24349-5-philmd@linaro.org>

system/memory.c

diff --git a/system/memory.c b/system/memory.c
index 72c6441..3997ac5 100644
--- a/system/memory.c
+++ b/system/memory.c
@@ -3601,11 +3601,8 @@
                             Error **errp)
 {
     DeviceState *owner_dev;
-    Error *err = NULL;
 
-    memory_region_init_rom_nomigrate(mr, owner, name, size, &err);
-    if (err) {
-        error_propagate(errp, err);
+    if (!memory_region_init_rom_nomigrate(mr, owner, name, size, errp)) {
         return;
     }
     /* This will assert if owner is neither NULL nor a DeviceState.