diff options
| author | Eric Blake | 2017-10-27 12:40:36 +0200 |
|---|---|---|
| committer | Eric Blake | 2017-10-30 21:48:36 +0100 |
| commit | 56dc682bf5e3a64b64a658c0aeec37570719c929 (patch) | |
| tree | 7b33c490a834eea42905e4875dfc3de0b3ac653c | |
| parent | nbd/client: prepare nbd_receive_reply for structured reply (diff) | |
| download | qemu-56dc682bf5e3a64b64a658c0aeec37570719c929.tar.gz qemu-56dc682bf5e3a64b64a658c0aeec37570719c929.tar.xz qemu-56dc682bf5e3a64b64a658c0aeec37570719c929.zip | |
nbd: Move nbd_read() to common header
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 <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20171027104037.8319-12-eblake@redhat.com>
| -rw-r--r-- | include/block/nbd.h | 10 | ||||
| -rw-r--r-- | 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. */ |