[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 42/52] migration/rdma: Convert qemu_rdma_post_recv_control() to E
From: |
Markus Armbruster |
Subject: |
[PATCH 42/52] migration/rdma: Convert qemu_rdma_post_recv_control() to Error |
Date: |
Mon, 18 Sep 2023 16:41:56 +0200 |
Just for symmetry with qemu_rdma_post_send_control(). Error messages
lose detail I consider of no use to users.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
migration/rdma.c | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/migration/rdma.c b/migration/rdma.c
index 25caf67aac..a727aa35d1 100644
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -1778,7 +1778,8 @@ static int qemu_rdma_post_send_control(RDMAContext *rdma,
uint8_t *buf,
* Post a RECV work request in anticipation of some future receipt
* of data on the control channel.
*/
-static int qemu_rdma_post_recv_control(RDMAContext *rdma, int idx)
+static int qemu_rdma_post_recv_control(RDMAContext *rdma, int idx,
+ Error **errp)
{
struct ibv_recv_wr *bad_wr;
struct ibv_sge sge = {
@@ -1795,6 +1796,7 @@ static int qemu_rdma_post_recv_control(RDMAContext *rdma,
int idx)
if (ibv_post_recv(rdma->qp, &recv_wr, &bad_wr)) {
+ error_setg(errp, "error posting control recv");
return -1;
}
@@ -1904,10 +1906,8 @@ static int qemu_rdma_exchange_send(RDMAContext *rdma,
RDMAControlHeader *head,
* If the user is expecting a response, post a WR in anticipation of it.
*/
if (resp) {
- ret = qemu_rdma_post_recv_control(rdma, RDMA_WRID_DATA);
+ ret = qemu_rdma_post_recv_control(rdma, RDMA_WRID_DATA, errp);
if (ret < 0) {
- error_setg(errp, "rdma migration: error posting"
- " extra control recv for anticipated result!");
return -1;
}
}
@@ -1915,9 +1915,8 @@ static int qemu_rdma_exchange_send(RDMAContext *rdma,
RDMAControlHeader *head,
/*
* Post a WR to replace the one we just consumed for the READY message.
*/
- ret = qemu_rdma_post_recv_control(rdma, RDMA_WRID_READY);
+ ret = qemu_rdma_post_recv_control(rdma, RDMA_WRID_READY, errp);
if (ret < 0) {
- error_setg(errp, "rdma migration: error posting first control recv!");
return -1;
}
@@ -2001,9 +2000,8 @@ static int qemu_rdma_exchange_recv(RDMAContext *rdma,
RDMAControlHeader *head,
/*
* Post a new RECV work request to replace the one we just consumed.
*/
- ret = qemu_rdma_post_recv_control(rdma, RDMA_WRID_READY);
+ ret = qemu_rdma_post_recv_control(rdma, RDMA_WRID_READY, errp);
if (ret < 0) {
- error_setg(errp, "rdma migration: error posting second control recv!");
return -1;
}
@@ -2569,9 +2567,8 @@ static int qemu_rdma_connect(RDMAContext *rdma, bool
return_path,
caps_to_network(&cap);
- ret = qemu_rdma_post_recv_control(rdma, RDMA_WRID_READY);
+ ret = qemu_rdma_post_recv_control(rdma, RDMA_WRID_READY, errp);
if (ret < 0) {
- error_setg(errp, "RDMA ERROR: posting second control recv");
goto err_rdma_source_connect;
}
@@ -3370,6 +3367,7 @@ static void rdma_cm_poll_handler(void *opaque)
static int qemu_rdma_accept(RDMAContext *rdma)
{
+ Error *err = NULL;
RDMACapabilities cap;
struct rdma_conn_param conn_param = {
.responder_resources = 2,
@@ -3506,9 +3504,9 @@ static int qemu_rdma_accept(RDMAContext *rdma)
rdma_ack_cm_event(cm_event);
rdma->connected = true;
- ret = qemu_rdma_post_recv_control(rdma, RDMA_WRID_READY);
+ ret = qemu_rdma_post_recv_control(rdma, RDMA_WRID_READY, &err);
if (ret < 0) {
- error_report("rdma migration: error posting second control recv");
+ error_report_err(err);
goto err_rdma_dest_wait;
}
--
2.41.0
- Re: [PATCH 31/52] migration/rdma: Retire macro ERROR(), (continued)
- [PATCH 44/52] migration/rdma: Silence qemu_rdma_resolve_host(), Markus Armbruster, 2023/09/18
- [PATCH 29/52] migration/rdma: Plug a memory leak and improve a message, Markus Armbruster, 2023/09/18
- [PATCH 08/52] migration/rdma: Fix qemu_rdma_accept() to return failure on errors, Markus Armbruster, 2023/09/18
- [PATCH 24/52] migration/rdma: Return -1 instead of negative errno code, Markus Armbruster, 2023/09/18
- [PATCH 42/52] migration/rdma: Convert qemu_rdma_post_recv_control() to Error,
Markus Armbruster <=
- [PATCH 35/52] migration/rdma: Convert qemu_rdma_exchange_send() to Error, Markus Armbruster, 2023/09/18
- [PATCH 50/52] migration/rdma: Silence qemu_rdma_cleanup(), Markus Armbruster, 2023/09/18
[PATCH 36/52] migration/rdma: Convert qemu_rdma_exchange_get_response() to Error, Markus Armbruster, 2023/09/18