Commit 1dbd2fd9 authored by Michael Tokarev's avatar Michael Tokarev Committed by Juan Quintela
Browse files

migration/rdma: clean up qemu_rdma_dest_init a bit 



Do not check for rdma->host being empty twice.  This removes a large
"if" block, so code indentation is changed.  While at it, remove an
ugly goto from the loop, replacing it with a cleaner if logic.  And
finally, there's no need to initialize `ret' variable since is always
has a value.

Signed-off-by: default avatarMichael Tokarev <mjt@tls.msk.ru>
Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Tested-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>

--

fixed space detected by Dave
Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
parent 97baf9d9

migration/rdma.c

+22 −29
Original line number Diff line number Diff line
@@ -2364,10 +2364,10 @@ err_rdma_source_connect: 


static int qemu_rdma_dest_init(RDMAContext *rdma, Error **errp)

{

    int ret = -EINVAL, idx;

    int ret, idx;

    struct rdma_cm_id *listen_id;

    char ip[40] = "unknown";

    struct rdma_addrinfo *res;

    struct rdma_addrinfo *res, *e;

    char port_str[16];



    for (idx = 0; idx < RDMA_WRID_MAX; idx++) {
@@ -2375,7 +2375,7 @@ static int qemu_rdma_dest_init(RDMAContext *rdma, Error **errp) 
        rdma->wr_data[idx].control_curr = NULL;

    }



    if (rdma->host == NULL) {

    if (!rdma->host || !rdma->host[0]) {

        ERROR(errp, "RDMA host is not set!");

        rdma->error_state = -EINVAL;

        return -1;
@@ -2398,9 +2398,6 @@ static int qemu_rdma_dest_init(RDMAContext *rdma, Error **errp) 
    snprintf(port_str, 16, "%d", rdma->port);

    port_str[15] = '\0';



    if (rdma->host && strcmp("", rdma->host)) {

        struct rdma_addrinfo *e;



    ret = rdma_getaddrinfo(rdma->host, port_str, NULL, &res);

    if (ret < 0) {

        ERROR(errp, "could not rdma_getaddrinfo address %s", rdma->host);
@@ -2412,26 +2409,22 @@ static int qemu_rdma_dest_init(RDMAContext *rdma, Error **errp) 
            &((struct sockaddr_in *) e->ai_dst_addr)->sin_addr, ip, sizeof ip);

        trace_qemu_rdma_dest_init_trying(rdma->host, ip);

        ret = rdma_bind_addr(listen_id, e->ai_dst_addr);

            if (!ret) {

        if (ret) {

            continue;

        }

        if (e->ai_family == AF_INET6) {

            ret = qemu_rdma_broken_ipv6_kernel(errp, listen_id->verbs);

            if (ret) {

                continue;

            }

        }

                    

                goto listen;

            }

        break;

    }



    if (!e) {

        ERROR(errp, "Error: could not rdma_bind_addr!");

        goto err_dest_init_bind_addr;

    } else {

        ERROR(errp, "migration host and port not specified!");

        ret = -EINVAL;

        goto err_dest_init_bind_addr;

    }

listen:



    rdma->listen_id = listen_id;

    qemu_rdma_dump_gid("dest_init", listen_id);