[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 1/5] nbd/server: move nbd_co_send_structured_error u
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-block] [PATCH 1/5] nbd/server: move nbd_co_send_structured_error up |
Date: |
Thu, 8 Mar 2018 21:46:32 +0300 |
To be reused in nbd_co_send_sparse_read() in the following patch.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
nbd/server.c | 48 ++++++++++++++++++++++++------------------------
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/nbd/server.c b/nbd/server.c
index 4990a5826e..c406b0656d 100644
--- a/nbd/server.c
+++ b/nbd/server.c
@@ -1341,6 +1341,30 @@ static int coroutine_fn
nbd_co_send_structured_read(NBDClient *client,
return nbd_co_send_iov(client, iov, 2, errp);
}
+static int coroutine_fn nbd_co_send_structured_error(NBDClient *client,
+ uint64_t handle,
+ uint32_t error,
+ const char *msg,
+ Error **errp)
+{
+ NBDStructuredError chunk;
+ int nbd_err = system_errno_to_nbd_errno(error);
+ struct iovec iov[] = {
+ {.iov_base = &chunk, .iov_len = sizeof(chunk)},
+ {.iov_base = (char *)msg, .iov_len = msg ? strlen(msg) : 0},
+ };
+
+ assert(nbd_err);
+ trace_nbd_co_send_structured_error(handle, nbd_err,
+ nbd_err_lookup(nbd_err), msg ? msg :
"");
+ set_be_chunk(&chunk.h, NBD_REPLY_FLAG_DONE, NBD_REPLY_TYPE_ERROR, handle,
+ sizeof(chunk) - sizeof(chunk.h) + iov[1].iov_len);
+ stl_be_p(&chunk.error, nbd_err);
+ stw_be_p(&chunk.message_length, iov[1].iov_len);
+
+ return nbd_co_send_iov(client, iov, 1 + !!iov[1].iov_len, errp);
+}
+
static int coroutine_fn nbd_co_send_sparse_read(NBDClient *client,
uint64_t handle,
uint64_t offset,
@@ -1400,30 +1424,6 @@ static int coroutine_fn
nbd_co_send_sparse_read(NBDClient *client,
return ret;
}
-static int coroutine_fn nbd_co_send_structured_error(NBDClient *client,
- uint64_t handle,
- uint32_t error,
- const char *msg,
- Error **errp)
-{
- NBDStructuredError chunk;
- int nbd_err = system_errno_to_nbd_errno(error);
- struct iovec iov[] = {
- {.iov_base = &chunk, .iov_len = sizeof(chunk)},
- {.iov_base = (char *)msg, .iov_len = msg ? strlen(msg) : 0},
- };
-
- assert(nbd_err);
- trace_nbd_co_send_structured_error(handle, nbd_err,
- nbd_err_lookup(nbd_err), msg ? msg :
"");
- set_be_chunk(&chunk.h, NBD_REPLY_FLAG_DONE, NBD_REPLY_TYPE_ERROR, handle,
- sizeof(chunk) - sizeof(chunk.h) + iov[1].iov_len);
- stl_be_p(&chunk.error, nbd_err);
- stw_be_p(&chunk.message_length, iov[1].iov_len);
-
- return nbd_co_send_iov(client, iov, 1 + !!iov[1].iov_len, errp);
-}
-
/* nbd_co_receive_request
* Collect a client request. Return 0 if request looks valid, -EIO to drop
* connection right away, and any other negative value to report an error to
--
2.11.1
- [Qemu-block] [PATCH 0/5] nbd server fixing and refactoring before BLOCK_STATUS, Vladimir Sementsov-Ogievskiy, 2018/03/08
- [Qemu-block] [PATCH 4/5] nbd/server: refactor nbd_trip: cmd_read and generic reply, Vladimir Sementsov-Ogievskiy, 2018/03/08
- [Qemu-block] [PATCH 3/5] nbd/server: fix: check client->closing before reply sending, Vladimir Sementsov-Ogievskiy, 2018/03/08
- [Qemu-block] [PATCH 1/5] nbd/server: move nbd_co_send_structured_error up,
Vladimir Sementsov-Ogievskiy <=
- [Qemu-block] [PATCH v2 2/5] nbd/server: fix sparse read, Vladimir Sementsov-Ogievskiy, 2018/03/08
- [Qemu-block] [PATCH 5/5] nbd/server: refactor nbd_trip: split out nbd_handle_request, Vladimir Sementsov-Ogievskiy, 2018/03/08
- Re: [Qemu-block] [PATCH 0/5] nbd server fixing and refactoring before BLOCK_STATUS, Eric Blake, 2018/03/09
- Re: [Qemu-block] [PATCH 0/5] nbd server fixing and refactoring before BLOCK_STATUS, Eric Blake, 2018/03/12