[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/11] nbd/client: fix nbd_send_request to return int
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PULL 08/11] nbd/client: fix nbd_send_request to return int |
Date: |
Wed, 30 Aug 2017 13:07:08 -0500 |
From: Vladimir Sementsov-Ogievskiy <address@hidden>
Fix nbd_send_request to return int, as it returns a return value
of nbd_write (which is int), and the only user of nbd_send_request's
return value (nbd_co_send_request) consider it as int too.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eric Blake <address@hidden>
---
include/block/nbd.h | 2 +-
nbd/client.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/block/nbd.h b/include/block/nbd.h
index f7450608b4..040cdd2e60 100644
--- a/include/block/nbd.h
+++ b/include/block/nbd.h
@@ -163,7 +163,7 @@ int nbd_receive_negotiate(QIOChannel *ioc, const char *name,
Error **errp);
int nbd_init(int fd, QIOChannelSocket *sioc, NBDExportInfo *info,
Error **errp);
-ssize_t nbd_send_request(QIOChannel *ioc, NBDRequest *request);
+int nbd_send_request(QIOChannel *ioc, NBDRequest *request);
int nbd_receive_reply(QIOChannel *ioc, NBDReply *reply, Error **errp);
int nbd_client(int fd);
int nbd_disconnect(int fd);
diff --git a/nbd/client.c b/nbd/client.c
index f8c213bc96..68a0bc1ffc 100644
--- a/nbd/client.c
+++ b/nbd/client.c
@@ -896,7 +896,7 @@ int nbd_disconnect(int fd)
}
#endif
-ssize_t nbd_send_request(QIOChannel *ioc, NBDRequest *request)
+int nbd_send_request(QIOChannel *ioc, NBDRequest *request)
{
uint8_t buf[NBD_REQUEST_SIZE];
--
2.13.5
- [Qemu-devel] [PULL 00/11] NBD patches for 2.11, Eric Blake, 2017/08/30
- [Qemu-devel] [PULL 01/11] qemu-iotests: Extend non-shared storage migration test (194), Eric Blake, 2017/08/30
- [Qemu-devel] [PULL 03/11] qemu-iotests: improve nbd-fault-injector.py startup protocol, Eric Blake, 2017/08/30
- [Qemu-devel] [PULL 02/11] nbd-client: avoid read_reply_co entry if send failed, Eric Blake, 2017/08/30
- [Qemu-devel] [PULL 05/11] nbd/client: fix nbd_opt_go, Eric Blake, 2017/08/30
- [Qemu-devel] [PULL 06/11] nbd/client: refactor nbd_read_eof, Eric Blake, 2017/08/30
- [Qemu-devel] [PULL 08/11] nbd/client: fix nbd_send_request to return int,
Eric Blake <=
- [Qemu-devel] [PULL 04/11] qemu-iotests: test NBD over UNIX domain sockets in 083, Eric Blake, 2017/08/30
- [Qemu-devel] [PULL 09/11] block/nbd-client: get rid of ssize_t, Eric Blake, 2017/08/30
- [Qemu-devel] [PULL 07/11] nbd/client: refactor nbd_receive_reply, Eric Blake, 2017/08/30
- [Qemu-devel] [PULL 11/11] block/nbd-client: refactor request send/receive, Eric Blake, 2017/08/30
- [Qemu-devel] [PULL 10/11] block/nbd-client: rename nbd_recv_coroutines_enter_all, Eric Blake, 2017/08/30
- Re: [Qemu-devel] [PULL 00/11] NBD patches for 2.11, Peter Maydell, 2017/08/31