Skip to content

Commit

Permalink
migration/rdma: Put @errp parameter last
Browse files Browse the repository at this point in the history
include/qapi/error.h demands:

 * - Functions that use Error to report errors have an Error **errp
 *   parameter.  It should be the last parameter, except for functions
 *   taking variable arguments.

qemu_rdma_connect() does not conform.  Clean it up.

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-11-armbru@redhat.com>
  • Loading branch information
Markus Armbruster authored and Juan Quintela committed Oct 11, 2023
1 parent 9a6afb1 commit 3c03f21
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions migration/rdma.c
Original file line number Diff line number Diff line change
Expand Up @@ -2552,7 +2552,8 @@ static int qemu_get_cm_event_timeout(RDMAContext *rdma,
}
}

static int qemu_rdma_connect(RDMAContext *rdma, Error **errp, bool return_path)
static int qemu_rdma_connect(RDMAContext *rdma, bool return_path,
Error **errp)
{
RDMACapabilities cap = {
.version = RDMA_CONTROL_VERSION_CURRENT,
Expand Down Expand Up @@ -4183,7 +4184,7 @@ void rdma_start_outgoing_migration(void *opaque,
}

trace_rdma_start_outgoing_migration_after_rdma_source_init();
ret = qemu_rdma_connect(rdma, errp, false);
ret = qemu_rdma_connect(rdma, false, errp);

if (ret) {
goto err;
Expand All @@ -4204,7 +4205,7 @@ void rdma_start_outgoing_migration(void *opaque,
goto return_path_err;
}

ret = qemu_rdma_connect(rdma_return_path, errp, true);
ret = qemu_rdma_connect(rdma_return_path, true, errp);

if (ret) {
goto return_path_err;
Expand Down

0 comments on commit 3c03f21

Please sign in to comment.