[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/12] nbd: Move nbd_read() to common header
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PULL 11/12] nbd: Move nbd_read() to common header |
Date: |
Mon, 30 Oct 2017 21:56:35 +0100 |
An upcoming change to block/nbd-client.c will want to read the
tail of a structured reply chunk directly from the wire. Move
this function to make it easier.
Based on a patch from Vladimir Sementsov-Ogievskiy.
Signed-off-by: Eric Blake <address@hidden>
Reviewed-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Message-Id: <address@hidden>
---
include/block/nbd.h | 10 ++++++++++
nbd/nbd-internal.h | 9 ---------
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/include/block/nbd.h b/include/block/nbd.h
index 2ee1578420..da6e305dd5 100644
--- a/include/block/nbd.h
+++ b/include/block/nbd.h
@@ -264,6 +264,16 @@ void nbd_client_put(NBDClient *client);
void nbd_server_start(SocketAddress *addr, const char *tls_creds,
Error **errp);
+
+/* nbd_read
+ * Reads @size bytes from @ioc. Returns 0 on success.
+ */
+static inline int nbd_read(QIOChannel *ioc, void *buffer, size_t size,
+ Error **errp)
+{
+ return qio_channel_read_all(ioc, buffer, size, errp) < 0 ? -EIO : 0;
+}
+
static inline bool nbd_reply_is_simple(NBDReply *reply)
{
return reply->magic == NBD_SIMPLE_REPLY_MAGIC;
diff --git a/nbd/nbd-internal.h b/nbd/nbd-internal.h
index 4f24d6e57d..b64eb1cc9b 100644
--- a/nbd/nbd-internal.h
+++ b/nbd/nbd-internal.h
@@ -82,15 +82,6 @@ static inline int nbd_read_eof(QIOChannel *ioc, void
*buffer, size_t size,
return ret;
}
-/* nbd_read
- * Reads @size bytes from @ioc. Returns 0 on success.
- */
-static inline int nbd_read(QIOChannel *ioc, void *buffer, size_t size,
- Error **errp)
-{
- return qio_channel_read_all(ioc, buffer, size, errp) < 0 ? -EIO : 0;
-}
-
/* nbd_write
* Writes @size bytes to @ioc. Returns 0 on success.
*/
--
2.13.6
- [Qemu-devel] [PULL 01/12] nbd: Include error names in trace messages, (continued)
- [Qemu-devel] [PULL 01/12] nbd: Include error names in trace messages, Eric Blake, 2017/10/30
- [Qemu-devel] [PULL 02/12] nbd: Move nbd_errno_to_system_errno() to public header, Eric Blake, 2017/10/30
- [Qemu-devel] [PULL 04/12] nbd/server: Report error for write to read-only export, Eric Blake, 2017/10/30
- [Qemu-devel] [PULL 03/12] nbd: Expose constants and structs for structured read, Eric Blake, 2017/10/30
- [Qemu-devel] [PULL 05/12] nbd/server: Simplify nbd_negotiate_options loop, Eric Blake, 2017/10/30
- [Qemu-devel] [PULL 06/12] nbd/server: Refactor zero-length option check, Eric Blake, 2017/10/30
- [Qemu-devel] [PULL 07/12] nbd: Minimal structured read for server, Eric Blake, 2017/10/30
- [Qemu-devel] [PULL 08/12] nbd/server: Include human-readable message in structured errors, Eric Blake, 2017/10/30
- [Qemu-devel] [PULL 09/12] nbd/client: refactor nbd_receive_starttls, Eric Blake, 2017/10/30
- [Qemu-devel] [PULL 10/12] nbd/client: prepare nbd_receive_reply for structured reply, Eric Blake, 2017/10/30
- [Qemu-devel] [PULL 11/12] nbd: Move nbd_read() to common header,
Eric Blake <=
- [Qemu-devel] [PULL 12/12] nbd: Minimal structured read for client, Eric Blake, 2017/10/30
- Re: [Qemu-devel] [PULL 00/12] NBD patches prior to 2.11 soft freeze, Peter Maydell, 2017/10/31