Re: [PATCH-for-9.0 17/25] backends: Reduce variable scope in host_memory_backend_memory_complete

2023-12-03 Thread Gavin Shan

On 11/21/23 07:32, Philippe Mathieu-Daudé wrote:

Reduce the _err variable use and remove the 'out:' label.

Signed-off-by: Philippe Mathieu-Daudé 
---
  backends/hostmem.c | 8 
  1 file changed, 4 insertions(+), 4 deletions(-)



Reviewed-by: Gavin Shan 




Re: [PATCH-for-9.0 17/25] backends: Reduce variable scope in host_memory_backend_memory_complete

2023-11-21 Thread Manos Pitsidianakis

On Mon, 20 Nov 2023 23:32, Philippe Mathieu-Daudé  wrote:

Reduce the _err variable use and remove the 'out:' label.

Signed-off-by: Philippe Mathieu-Daudé 
---
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(>mr), ptr, sz,
  backend->prealloc_threads,
  backend->prealloc_context, _err);
if (local_err) {
-goto out;
+error_propagate(errp, local_err);
+return;
}
}
-out:
-error_propagate(errp, local_err);
}

static bool
--


Reviewed-by: Manos Pitsidianakis