diff options
| author | Dr. David Alan Gilbert <dgilbert@redhat.com> | 2017-07-17 12:09:33 +0100 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2017-07-18 17:36:16 +0200 |
| commit | 0b3c15f09715acd78063e720444cc86ac357bab4 (patch) | |
| tree | d738f34d068fd48aa9002b73ac0b06d6f1e86ef6 /migration | |
| parent | 3a0f2ceaedcf70ff79b671f7fb3b7ec8e71f6e1e (diff) | |
| download | qemu-0b3c15f09715acd78063e720444cc86ac357bab4.zip | |
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: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Message-Id: <20170717110936.23314-4-dgilbert@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Diffstat (limited to 'migration')
| -rw-r--r-- | migration/rdma.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/migration/rdma.c b/migration/rdma.c index 6111e10c70..59810aec2e 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -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; } |