Commit bbfb89e3 authored by Fam Zheng's avatar Fam Zheng Committed by Markus Armbruster
Browse files

migration: Make errp the last parameter of local functions 



Signed-off-by: default avatarFam Zheng <famz@redhat.com>
Message-Id: <20170421122710.15373-13-famz@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent bf46e67d

migration/rdma.c

+6 −6
Original line number Diff line number Diff line
@@ -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.

 */

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;
@@ -950,7 +950,7 @@ static int qemu_rdma_resolve_host(RDMAContext *rdma, Error **errp) 
                RDMA_RESOLVE_TIMEOUT_MS);

        if (!ret) {

            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) {

                    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;

    Error *local_err = NULL, **temp = &local_err;
@@ -2469,7 +2469,7 @@ static int qemu_rdma_dest_init(RDMAContext *rdma, Error **errp) 
            continue;

        }

        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) {

                continue;

            }
@@ -3676,8 +3676,8 @@ void rdma_start_outgoing_migration(void *opaque, 
        goto err;

    }



    ret = qemu_rdma_source_init(rdma, errp,

        s->enabled_capabilities[MIGRATION_CAPABILITY_RDMA_PIN_ALL]);

    ret = qemu_rdma_source_init(rdma,

        s->enabled_capabilities[MIGRATION_CAPABILITY_RDMA_PIN_ALL], errp);



    if (ret) {

        goto err;