mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nbd: Move nbd_read() to common header

Browse Source 
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>
This commit is contained in:
Eric Blake 2017-10-27 12:40:36 +02:00
parent d2febedb45
commit 56dc682bf5
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/block/nbd.h
View File

@ -264,6 +264,16 @@ void nbd_client_put(NBDClient *client);
void nbd_server_start(SocketAddress *addr, const char *tls_creds, void nbd_server_start(SocketAddress *addr, const char *tls_creds,
Error **errp); 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) static inline bool nbd_reply_is_simple(NBDReply *reply)
{ {
return reply->magic == NBD_SIMPLE_REPLY_MAGIC; return reply->magic == NBD_SIMPLE_REPLY_MAGIC;

9
nbd/nbd-internal.h
View File

@ -82,15 +82,6 @@ static inline int nbd_read_eof(QIOChannel *ioc, void *buffer, size_t size,
return ret; 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 /* nbd_write
* Writes @size bytes to @ioc. Returns 0 on success. * Writes @size bytes to @ioc. Returns 0 on success.
*/ */