[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 11/17] nbd/client: Plumb errp through nbd_receive_replies
From: |
Eric Blake |
Subject: |
[PATCH v6 11/17] nbd/client: Plumb errp through nbd_receive_replies |
Date: |
Tue, 29 Aug 2023 12:58:38 -0500 |
Instead of ignoring the low-level error just to refabricate our own
message to pass to the caller, we can just plumb the caller's errp
down to the low level.
Signed-off-by: Eric Blake <eblake@redhat.com>
---
v5: set errp on more failure cases [Vladimir], typo fix
v4: new patch [Vladimir]
---
block/nbd.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/block/nbd.c b/block/nbd.c
index 57123c17f94..4b60b832b70 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -417,7 +417,8 @@ static void coroutine_fn GRAPH_RDLOCK
nbd_reconnect_attempt(BDRVNBDState *s)
reconnect_delay_timer_del(s);
}
-static coroutine_fn int nbd_receive_replies(BDRVNBDState *s, uint64_t cookie)
+static coroutine_fn int nbd_receive_replies(BDRVNBDState *s, uint64_t cookie,
+ Error **errp)
{
int ret;
uint64_t ind = COOKIE_TO_INDEX(cookie), ind2;
@@ -458,20 +459,25 @@ static coroutine_fn int nbd_receive_replies(BDRVNBDState
*s, uint64_t cookie)
/* We are under mutex and cookie is 0. We have to do the dirty work. */
assert(s->reply.cookie == 0);
- ret = nbd_receive_reply(s->bs, s->ioc, &s->reply, NULL);
- if (ret <= 0) {
- ret = ret ? ret : -EIO;
+ ret = nbd_receive_reply(s->bs, s->ioc, &s->reply, errp);
+ if (ret == 0) {
+ ret = -EIO;
+ error_setg(errp, "server dropped connection");
+ }
+ if (ret < 0) {
nbd_channel_error(s, ret);
return ret;
}
if (nbd_reply_is_structured(&s->reply) &&
s->info.mode < NBD_MODE_STRUCTURED) {
nbd_channel_error(s, -EINVAL);
+ error_setg(errp, "unexpected structured reply");
return -EINVAL;
}
ind2 = COOKIE_TO_INDEX(s->reply.cookie);
if (ind2 >= MAX_NBD_REQUESTS || !s->requests[ind2].coroutine) {
nbd_channel_error(s, -EINVAL);
+ error_setg(errp, "unexpected cookie value");
return -EINVAL;
}
if (s->reply.cookie == cookie) {
@@ -843,9 +849,9 @@ static coroutine_fn int nbd_co_do_receive_one_chunk(
}
*request_ret = 0;
- ret = nbd_receive_replies(s, cookie);
+ ret = nbd_receive_replies(s, cookie, errp);
if (ret < 0) {
- error_setg(errp, "Connection closed");
+ error_prepend(errp, "Connection closed: ");
return -EIO;
}
assert(s->ioc);
--
2.41.0
- [PATCH v6 00/17] qemu patches for 64-bit NBD extensions, Eric Blake, 2023/08/29
- [PATCH v6 02/17] nbd/client: Pass mode through to nbd_send_request, Eric Blake, 2023/08/29
- [PATCH v6 08/17] nbd/server: Prepare to send extended header replies, Eric Blake, 2023/08/29
- [PATCH v6 05/17] nbd/server: Refactor handling of command sanity checks, Eric Blake, 2023/08/29
- [PATCH v6 03/17] nbd: Add types for extended headers, Eric Blake, 2023/08/29
- [PATCH v6 07/17] nbd/server: Prepare to receive extended header requests, Eric Blake, 2023/08/29
- [PATCH v6 06/17] nbd/server: Support a request payload, Eric Blake, 2023/08/29
- [PATCH v6 14/17] nbd/client: Request extended headers during negotiation, Eric Blake, 2023/08/29
- [PATCH v6 09/17] nbd/server: Support 64-bit block status, Eric Blake, 2023/08/29
- [PATCH v6 10/17] nbd/server: Enable initial support for extended headers, Eric Blake, 2023/08/29
- [PATCH v6 11/17] nbd/client: Plumb errp through nbd_receive_replies,
Eric Blake <=
- [PATCH v6 17/17] nbd/server: Add FLAG_PAYLOAD support to CMD_BLOCK_STATUS, Eric Blake, 2023/08/29
- [PATCH v6 04/17] nbd: Prepare for 64-bit request effect lengths, Eric Blake, 2023/08/29
- [PATCH v6 13/17] nbd/client: Accept 64-bit block status chunks, Eric Blake, 2023/08/29
- [PATCH v6 16/17] nbd/server: Prepare for per-request filtering of BLOCK_STATUS, Eric Blake, 2023/08/29
- [PATCH v6 15/17] nbd/server: Refactor list of negotiated meta contexts, Eric Blake, 2023/08/29
- [PATCH v6 12/17] nbd/client: Initial support for extended headers, Eric Blake, 2023/08/29
- [PATCH v6 01/17] nbd: Replace bool structured_reply with mode enum, Eric Blake, 2023/08/29