david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

migration: Make errp the last parameter of local functions

Browse Source 
Signed-off-by: Fam Zheng <famz@redhat.com>
Message-Id: <20170421122710.15373-13-famz@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Fam Zheng 2017-04-21 20:27:08 +08:00 committed by Markus Armbruster
parent bf46e67ddb
commit bbfb89e38c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
migration/rdma.c
View File

@ -809,7 +809,7 @@ static void qemu_rdma_dump_gid(const char *who, struct rdma_cm_id *id)
* *
* Patches are being reviewed on linux-rdma. * Patches are being reviewed on linux-rdma.
*/ */
static int qemu_rdma_broken_ipv6_kernel(Error **errp, struct ibv_context *verbs) static int qemu_rdma_broken_ipv6_kernel(struct ibv_context *verbs, Error **errp)
{ {
struct ibv_port_attr port_attr; struct ibv_port_attr port_attr;
@ -950,7 +950,7 @@ static int qemu_rdma_resolve_host(RDMAContext *rdma, Error **errp)
RDMA_RESOLVE_TIMEOUT_MS); RDMA_RESOLVE_TIMEOUT_MS);
if (!ret) { if (!ret) {
if (e->ai_family == AF_INET6) { if (e->ai_family == AF_INET6) {
ret = qemu_rdma_broken_ipv6_kernel(errp, rdma->cm_id->verbs); ret = qemu_rdma_broken_ipv6_kernel(rdma->cm_id->verbs, errp);
if (ret) { if (ret) {
continue; continue;
} }
@ -2277,7 +2277,7 @@ static void qemu_rdma_cleanup(RDMAContext *rdma)
} }
static int qemu_rdma_source_init(RDMAContext *rdma, Error **errp, bool pin_all) 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; Error *local_err = NULL, **temp = &local_err;
@ -2469,7 +2469,7 @@ static int qemu_rdma_dest_init(RDMAContext *rdma, Error **errp)
continue; continue;
} }
if (e->ai_family == AF_INET6) { if (e->ai_family == AF_INET6) {
ret = qemu_rdma_broken_ipv6_kernel(errp, listen_id->verbs); ret = qemu_rdma_broken_ipv6_kernel(listen_id->verbs, errp);
if (ret) { if (ret) {
continue; continue;
} }
@ -3676,8 +3676,8 @@ void rdma_start_outgoing_migration(void *opaque,
goto err; goto err;
} }
ret = qemu_rdma_source_init(rdma, errp, ret = qemu_rdma_source_init(rdma,
s->enabled_capabilities[MIGRATION_CAPABILITY_RDMA_PIN_ALL]); s->enabled_capabilities[MIGRATION_CAPABILITY_RDMA_PIN_ALL], errp);
if (ret) { if (ret) {
goto err; goto err;