[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 60/71] backends: Reduce variable scope in host_memory_backend_memo
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 60/71] backends: Reduce variable scope in host_memory_backend_memory_complete |
Date: |
Fri, 5 Jan 2024 16:42:53 +0100 |
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 | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/backends/hostmem.c b/backends/hostmem.c
index 3f8eb936d7..1b0043a0d9 100644
--- a/backends/hostmem.c
+++ b/backends/hostmem.c
@@ -324,7 +324,6 @@ host_memory_backend_memory_complete(UserCreatable *uc,
Error **errp)
{
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 @@ host_memory_backend_memory_complete(UserCreatable *uc,
Error **errp)
* 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
--
2.41.0
- [PULL 49/71] memory: Have memory_region_init_ram() handler return a boolean, (continued)
- [PULL 49/71] memory: Have memory_region_init_ram() handler return a boolean, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 50/71] memory: Have memory_region_init_rom() handler return a boolean, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 51/71] memory: Have memory_region_init_rom_device_nomigrate() return a boolean, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 52/71] memory: Simplify memory_region_init_rom_device_nomigrate() calls, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 53/71] memory: Have memory_region_init_rom_device() handler return a boolean, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 54/71] memory: Have memory_region_init_resizeable_ram() return a boolean, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 55/71] memory: Have memory_region_init_ram_from_file() handler return a boolean, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 56/71] memory: Have memory_region_init_ram_from_fd() handler return a boolean, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 57/71] backends: Use g_autofree in HostMemoryBackendClass::alloc() handlers, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 58/71] backends: Simplify host_memory_backend_memory_complete(), Philippe Mathieu-Daudé, 2024/01/05
- [PULL 60/71] backends: Reduce variable scope in host_memory_backend_memory_complete,
Philippe Mathieu-Daudé <=
- [PULL 59/71] backends: Have HostMemoryBackendClass::alloc() handler return a boolean, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 61/71] util/oslib: Have qemu_prealloc_mem() handler return a boolean, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 62/71] misc: Simplify qemu_prealloc_mem() calls, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 63/71] hw: Simplify memory_region_init_ram() calls, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 64/71] hw/arm: Simplify memory_region_init_rom() calls, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 66/71] hw/misc: Simplify memory_region_init_ram_from_fd() calls, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 67/71] hw/nvram: Simplify memory_region_init_rom_device() calls, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 65/71] hw/sparc: Simplify memory_region_init_ram_nomigrate() calls, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 68/71] hw/pci-host/raven: Propagate error in raven_realize(), Philippe Mathieu-Daudé, 2024/01/05
- [PULL 69/71] hw/m68k/mcf5206: Embed m5206_timer_state in m5206_mbar_state, Philippe Mathieu-Daudé, 2024/01/05