ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

migration/rdma: Eliminate error_propagate() 

When all we do with an Error we receive into a local variable is
propagating to somewhere else, we can just as well receive it there
right away.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Li Zhijian <lizhijian@fujitsu.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-ID: <20230928132019.2544702-12-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2023-09-28 15:19:37 +02:00 committed by Juan Quintela
parent 3c03f21cb5
commit b16defbbfe
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
migration/rdma.c
View File

@ -2465,7 +2465,6 @@ static void qemu_rdma_cleanup(RDMAContext *rdma)
static int qemu_rdma_source_init(RDMAContext *rdma, bool pin_all, Error **errp) static int qemu_rdma_source_init(RDMAContext *rdma, bool pin_all, Error **errp)
{ {
int ret, idx; int ret, idx;
Error *local_err = NULL, **temp = &local_err;
/* /*
* Will be validated against destination's actual capabilities * Will be validated against destination's actual capabilities
@ -2473,14 +2472,14 @@ static int qemu_rdma_source_init(RDMAContext *rdma, bool pin_all, Error **errp)
*/ */
rdma->pin_all = pin_all; rdma->pin_all = pin_all;
ret = qemu_rdma_resolve_host(rdma, temp); ret = qemu_rdma_resolve_host(rdma, errp);
if (ret) { if (ret) {
goto err_rdma_source_init; goto err_rdma_source_init;
} }
ret = qemu_rdma_alloc_pd_cq(rdma); ret = qemu_rdma_alloc_pd_cq(rdma);
if (ret) { if (ret) {
ERROR(temp, "rdma migration: error allocating pd and cq! Your mlock()" ERROR(errp, "rdma migration: error allocating pd and cq! Your mlock()"
" limits may be too low. Please check $ ulimit -a # and " " limits may be too low. Please check $ ulimit -a # and "
"search for 'ulimit -l' in the output"); "search for 'ulimit -l' in the output");
goto err_rdma_source_init; goto err_rdma_source_init;
@ -2488,13 +2487,13 @@ static int qemu_rdma_source_init(RDMAContext *rdma, bool pin_all, Error **errp)
ret = qemu_rdma_alloc_qp(rdma); ret = qemu_rdma_alloc_qp(rdma);
if (ret) { if (ret) {
ERROR(temp, "rdma migration: error allocating qp!"); ERROR(errp, "rdma migration: error allocating qp!");
goto err_rdma_source_init; goto err_rdma_source_init;
} }
ret = qemu_rdma_init_ram_blocks(rdma); ret = qemu_rdma_init_ram_blocks(rdma);
if (ret) { if (ret) {
ERROR(temp, "rdma migration: error initializing ram blocks!"); ERROR(errp, "rdma migration: error initializing ram blocks!");
goto err_rdma_source_init; goto err_rdma_source_init;
} }
@ -2509,7 +2508,7 @@ static int qemu_rdma_source_init(RDMAContext *rdma, bool pin_all, Error **errp)
for (idx = 0; idx < RDMA_WRID_MAX; idx++) { for (idx = 0; idx < RDMA_WRID_MAX; idx++) {
ret = qemu_rdma_reg_control(rdma, idx); ret = qemu_rdma_reg_control(rdma, idx);
if (ret) { if (ret) {
ERROR(temp, "rdma migration: error registering %d control!", ERROR(errp, "rdma migration: error registering %d control!",
idx); idx);
goto err_rdma_source_init; goto err_rdma_source_init;
} }
@ -2518,7 +2517,6 @@ static int qemu_rdma_source_init(RDMAContext *rdma, bool pin_all, Error **errp)
return 0; return 0;
err_rdma_source_init: err_rdma_source_init:
error_propagate(errp, local_err);
qemu_rdma_cleanup(rdma); qemu_rdma_cleanup(rdma);
return -1; return -1;
} }
@ -4111,7 +4109,6 @@ void rdma_start_incoming_migration(const char *host_port, Error **errp)
{ {
int ret; int ret;
RDMAContext *rdma; RDMAContext *rdma;
Error *local_err = NULL;
trace_rdma_start_incoming_migration(); trace_rdma_start_incoming_migration();
@ -4121,13 +4118,12 @@ void rdma_start_incoming_migration(const char *host_port, Error **errp)
return; return;
} }
rdma = qemu_rdma_data_init(host_port, &local_err); rdma = qemu_rdma_data_init(host_port, errp);
if (rdma == NULL) { if (rdma == NULL) {
goto err; goto err;
} }
ret = qemu_rdma_dest_init(rdma, &local_err); ret = qemu_rdma_dest_init(rdma, errp);
if (ret) { if (ret) {
goto err; goto err;
} }
@ -4150,7 +4146,6 @@ void rdma_start_incoming_migration(const char *host_port, Error **errp)
cleanup_rdma: cleanup_rdma:
qemu_rdma_cleanup(rdma); qemu_rdma_cleanup(rdma);
err: err:
error_propagate(errp, local_err);
if (rdma) { if (rdma) {
g_free(rdma->host); g_free(rdma->host);
g_free(rdma->host_port); g_free(rdma->host_port);