Commit 0b3c15f0 authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Juan Quintela
Browse files

migration/rdma: fix qemu_rdma_block_for_wrid error paths 



The two places that 'goto err_block_for_wrid' weren't setting ret
and so would end up returning 0 even though we've failed.

Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: default avatarPeter Xu <peterx@redhat.com>
Message-Id: <20170717110936.23314-4-dgilbert@redhat.com>
Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
parent 3a0f2cea

migration/rdma.c

+6 −2
Original line number Diff line number Diff line
@@ -1521,14 +1521,16 @@ static int qemu_rdma_block_for_wrid(RDMAContext *rdma, int wrid_requested, 
            yield_until_fd_readable(rdma->comp_channel->fd);

        }



        if (ibv_get_cq_event(rdma->comp_channel, &cq, &cq_ctx)) {

        ret = ibv_get_cq_event(rdma->comp_channel, &cq, &cq_ctx);

        if (ret) {

            perror("ibv_get_cq_event");

            goto err_block_for_wrid;

        }



        num_cq_events++;



        if (ibv_req_notify_cq(cq, 0)) {

        ret = -ibv_req_notify_cq(cq, 0);

        if (ret) {

            goto err_block_for_wrid;

        }
@@ -1564,6 +1566,8 @@ err_block_for_wrid: 
    if (num_cq_events) {

        ibv_ack_cq_events(cq, num_cq_events);

    }



    rdma->error_state = ret;

    return ret;

}