[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 19/52] migration/rdma: Fix qemu_get_cm_event_timeout() to always
From: |
Markus Armbruster |
Subject: |
[PATCH 19/52] migration/rdma: Fix qemu_get_cm_event_timeout() to always set error |
Date: |
Mon, 18 Sep 2023 16:41:33 +0200 |
qemu_get_cm_event_timeout() neglects to set an error when it fails
because rdma_get_cm_event() fails. Harmless, as its caller
qemu_rdma_connect() substitutes a generic error then. Fix it anyway.
qemu_rdma_connect() also sets the generic error when its own call of
rdma_get_cm_event() fails. Make the error handling more obvious: set
a specific error right after rdma_get_cm_event() fails. Delete the
generic error.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
migration/rdma.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/migration/rdma.c b/migration/rdma.c
index 08cd186385..d3dc162363 100644
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -2509,7 +2509,11 @@ static int qemu_get_cm_event_timeout(RDMAContext *rdma,
ERROR(errp, "failed to poll cm event, errno=%i", errno);
return -1;
} else if (poll_fd.revents & POLLIN) {
- return rdma_get_cm_event(rdma->channel, cm_event);
+ if (rdma_get_cm_event(rdma->channel, cm_event) < 0) {
+ ERROR(errp, "failed to get cm event");
+ return -1;
+ }
+ return 0;
} else {
ERROR(errp, "no POLLIN event, revent=%x", poll_fd.revents);
return -1;
@@ -2559,10 +2563,12 @@ static int qemu_rdma_connect(RDMAContext *rdma, bool
return_path,
ret = qemu_get_cm_event_timeout(rdma, &cm_event, 5000, errp);
} else {
ret = rdma_get_cm_event(rdma->channel, &cm_event);
+ if (ret < 0) {
+ ERROR(errp, "failed to get cm event");
+ }
}
if (ret) {
perror("rdma_get_cm_event after rdma_connect");
- ERROR(errp, "connecting to destination!");
goto err_rdma_source_connect;
}
--
2.41.0
- [PATCH 28/52] migration/rdma: Check negative error values the same way everywhere, (continued)
- [PATCH 28/52] migration/rdma: Check negative error values the same way everywhere, Markus Armbruster, 2023/09/18
- [PATCH 37/52] migration/rdma: Convert qemu_rdma_reg_whole_ram_blocks() to Error, Markus Armbruster, 2023/09/18
- [PATCH 07/52] migration/rdma: Give qio_channel_rdma_source_funcs internal linkage, Markus Armbruster, 2023/09/18
- [PATCH 47/52] migration/rdma: Don't report received completion events as error, Markus Armbruster, 2023/09/18
- [PATCH 19/52] migration/rdma: Fix qemu_get_cm_event_timeout() to always set error,
Markus Armbruster <=
- [PATCH 33/52] migration/rdma: Drop "@errp is clear" guards around error_setg(), Markus Armbruster, 2023/09/18
- [PATCH 10/52] migration/rdma: Eliminate error_propagate(), Markus Armbruster, 2023/09/18
- [PATCH 13/52] migration/rdma: Make qemu_rdma_buffer_mergable() return bool, Markus Armbruster, 2023/09/18