[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/11] nbd/server: add errp to nbd_send_reply()
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PULL 05/11] nbd/server: add errp to nbd_send_reply() |
Date: |
Mon, 10 Jul 2017 07:14:28 -0500 |
From: Vladimir Sementsov-Ogievskiy <address@hidden>
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eric Blake <address@hidden>
---
nbd/server.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/nbd/server.c b/nbd/server.c
index 00a7c60..e3fd0ca 100644
--- a/nbd/server.c
+++ b/nbd/server.c
@@ -687,7 +687,7 @@ static int nbd_receive_request(QIOChannel *ioc, NBDRequest
*request,
return 0;
}
-static int nbd_send_reply(QIOChannel *ioc, NBDReply *reply)
+static int nbd_send_reply(QIOChannel *ioc, NBDReply *reply, Error **errp)
{
uint8_t buf[NBD_REPLY_SIZE];
@@ -706,7 +706,7 @@ static int nbd_send_reply(QIOChannel *ioc, NBDReply *reply)
stl_be_p(buf + 4, reply->error);
stq_be_p(buf + 8, reply->handle);
- return nbd_write(ioc, buf, sizeof(buf), NULL);
+ return nbd_write(ioc, buf, sizeof(buf), errp);
}
#define MAX_NBD_REQUESTS 16
@@ -993,7 +993,8 @@ void nbd_export_close_all(void)
}
}
-static int nbd_co_send_reply(NBDRequestData *req, NBDReply *reply, int len)
+static int nbd_co_send_reply(NBDRequestData *req, NBDReply *reply, int len,
+ Error **errp)
{
NBDClient *client = req->client;
int ret;
@@ -1003,12 +1004,12 @@ static int nbd_co_send_reply(NBDRequestData *req,
NBDReply *reply, int len)
client->send_coroutine = qemu_coroutine_self();
if (!len) {
- ret = nbd_send_reply(client->ioc, reply);
+ ret = nbd_send_reply(client->ioc, reply, errp);
} else {
qio_channel_set_cork(client->ioc, true);
- ret = nbd_send_reply(client->ioc, reply);
+ ret = nbd_send_reply(client->ioc, reply, errp);
if (ret == 0) {
- ret = nbd_write(client->ioc, req->data, len, NULL);
+ ret = nbd_write(client->ioc, req->data, len, errp);
if (ret < 0) {
ret = -EIO;
}
@@ -1260,8 +1261,8 @@ reply:
local_err = NULL;
}
- if (nbd_co_send_reply(req, &reply, reply_data_len) < 0) {
- error_setg(&local_err, "Failed to send reply");
+ if (nbd_co_send_reply(req, &reply, reply_data_len, &local_err) < 0) {
+ error_prepend(&local_err, "Failed to send reply: ");
goto disconnect;
}
--
2.9.4
- [Qemu-devel] [PULL 00/11] NBD patches, Eric Blake, 2017/07/10
- [Qemu-devel] [PULL 01/11] MAINTAINERS: Promote NBD to supported, with new maintainer, Eric Blake, 2017/07/10
- [Qemu-devel] [PULL 02/11] nbd/server: nbd_negotiate: return 1 on NBD_OPT_ABORT, Eric Blake, 2017/07/10
- [Qemu-devel] [PULL 05/11] nbd/server: add errp to nbd_send_reply(),
Eric Blake <=
- [Qemu-devel] [PULL 07/11] nbd/client: refactor TRACE of NBD_MAGIC, Eric Blake, 2017/07/10
- [Qemu-devel] [PULL 03/11] nbd/server: refactor nbd_negotiate, Eric Blake, 2017/07/10
- [Qemu-devel] [PULL 06/11] nbd/common: nbd_tls_handshake: remove extra TRACE, Eric Blake, 2017/07/10
- [Qemu-devel] [PULL 08/11] nbd/server: fix TRACE in nbd_negotiate_send_rep_len, Eric Blake, 2017/07/10
- [Qemu-devel] [PULL 09/11] nbd/server: rename clientflags var in nbd_negotiate_options, Eric Blake, 2017/07/10
- [Qemu-devel] [PULL 10/11] nbd: refactor tracing, Eric Blake, 2017/07/10
- [Qemu-devel] [PULL 04/11] nbd/server: use errp instead of LOG, Eric Blake, 2017/07/10
- [Qemu-devel] [PULL 11/11] nbd: use generic trace subsystem instead of TRACE macro, Eric Blake, 2017/07/10
- Re: [Qemu-devel] [PULL 00/11] NBD patches, Peter Maydell, 2017/07/10