commit 3961613a760766921cdd6423ced0f801c2a6f1fc
author Philippe Mathieu-Daudé <philmd@linaro.org> Mon Nov 20 15:16:38 2023 +0100
committer Philippe Mathieu-Daudé <philmd@linaro.org> Fri Jan 05 16:20:15 2024 +0100
tree c4198060f32ee555a5b572898601777e558bc38c
parent fdb63cf3b57a230f4cc530ea2515229aeada0998

backends: Reduce variable scope in host_memory_backend_memory_complete

Reduce the &local_err variable use and remove the 'out:' label.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
Reviewed-by: Gavin Shan <gshan@redhat.com>
Message-Id: <20231120213301.24349-18-philmd@linaro.org>

backends/hostmem.c

diff --git a/backends/hostmem.c b/backends/hostmem.c
index 3f8eb93..1b0043a 100644
--- a/backends/hostmem.c
+++ b/backends/hostmem.c
@@ -324,7 +324,6 @@
 {
     HostMemoryBackend *backend = MEMORY_BACKEND(uc);
     HostMemoryBackendClass *bc = MEMORY_BACKEND_GET_CLASS(uc);
-    Error *local_err = NULL;
     void *ptr;
     uint64_t sz;
 
@@ -400,15 +399,16 @@
      * specified NUMA policy in place.
      */
     if (backend->prealloc) {
+        Error *local_err = NULL;
+
         qemu_prealloc_mem(memory_region_get_fd(&backend->mr), ptr, sz,
                           backend->prealloc_threads,
                           backend->prealloc_context, &local_err);
         if (local_err) {
-            goto out;
+            error_propagate(errp, local_err);
+            return;
         }
     }
-out:
-    error_propagate(errp, local_err);
 }
 
 static bool