commit bd3aa06950a17a7ff5acf231bcafe59b25cc0ff9
author Philippe Mathieu-Daudé <philmd@linaro.org> Mon Nov 20 13:39:59 2023 +0100
committer Philippe Mathieu-Daudé <philmd@linaro.org> Fri Jan 05 16:20:15 2024 +0100
tree edaf88c05e326e99faa2bf0e9dc255bcbc359348
parent ae076b6c39bfd2027e35ca5be922dc8f1b18b901

memory: Simplify memory_region_init_rom_device_nomigrate() calls

Mechanical change using the following coccinelle script:

@@
expression mr, owner, arg3, arg4, arg5, arg6, errp;
@@
-   memory_region_init_rom_device_nomigrate(mr, owner, arg3, arg4, arg5, arg6, &errp);
    if (
-       errp
+       !memory_region_init_rom_device_nomigrate(mr, owner, arg3, arg4, arg5, arg6, &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: Gavin Shan <gshan@redhat.com>
Message-Id: <20231120213301.24349-10-philmd@linaro.org>

system/memory.c

diff --git a/system/memory.c b/system/memory.c
index 8db271c..c6562f5 100644
--- a/system/memory.c
+++ b/system/memory.c
@@ -3627,12 +3627,9 @@
                                    Error **errp)
 {
     DeviceState *owner_dev;
-    Error *err = NULL;
 
-    memory_region_init_rom_device_nomigrate(mr, owner, ops, opaque,
-                                            name, size, &err);
-    if (err) {
-        error_propagate(errp, err);
+    if (!memory_region_init_rom_device_nomigrate(mr, owner, ops, opaque,
+                                                 name, size, errp)) {
         return;
     }
     /* This will assert if owner is neither NULL nor a DeviceState.