Commit 56dc682b authored by Eric Blake's avatar Eric Blake
Browse files

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: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20171027104037.8319-12-eblake@redhat.com>
parent d2febedb

include/block/nbd.h

+10 −0
Original line number Diff line number Diff line
@@ -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;

nbd/nbd-internal.h

+0 −9
Original line number Diff line number Diff line
@@ -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.

 */