[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/16] migration/rdma: fix qemu_rdma_block_for_wrid e
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 03/16] migration/rdma: fix qemu_rdma_block_for_wrid error paths |
Date: |
Tue, 18 Jul 2017 17:41:14 +0200 |
From: "Dr. David Alan Gilbert" <address@hidden>
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 <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
migration/rdma.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/migration/rdma.c b/migration/rdma.c
index 6111e10..59810ae 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;
}
--
2.9.4
- [Qemu-devel] [PULL 00/16] Migration, Juan Quintela, 2017/07/18
- [Qemu-devel] [PULL 02/16] migration: Close file on failed migration load, Juan Quintela, 2017/07/18
- [Qemu-devel] [PULL 01/16] migration/rdma: Fix race on source, Juan Quintela, 2017/07/18
- [Qemu-devel] [PULL 03/16] migration/rdma: fix qemu_rdma_block_for_wrid error paths,
Juan Quintela <=
- [Qemu-devel] [PULL 04/16] migration/rdma: Allow cancelling while waiting for wrid, Juan Quintela, 2017/07/18
- [Qemu-devel] [PULL 05/16] migration/rdma: Safely convert control types, Juan Quintela, 2017/07/18
- [Qemu-devel] [PULL 06/16] migration/rdma: Send error during cancelling, Juan Quintela, 2017/07/18
- [Qemu-devel] [PULL 07/16] qdev: provide DEFINE_PROP_INT64(), Juan Quintela, 2017/07/18
- [Qemu-devel] [PULL 09/16] migration: export capabilities to props, Juan Quintela, 2017/07/18
- [Qemu-devel] [PULL 08/16] migration: export parameters to props, Juan Quintela, 2017/07/18
- [Qemu-devel] [PULL 10/16] migration: introduce migrate_params_check(), Juan Quintela, 2017/07/18
- [Qemu-devel] [PULL 11/16] migration: provide migrate_params_apply(), Juan Quintela, 2017/07/18
- [Qemu-devel] [PULL 13/16] migration: remove check against colo support, Juan Quintela, 2017/07/18
- [Qemu-devel] [PULL 12/16] migration: check global params for validity, Juan Quintela, 2017/07/18