diff options
| -rw-r--r-- | cutils.c | 41 | ||||
| -rw-r--r-- | iov.h | 18 | ||||
| -rw-r--r-- | qemu-common.h | 3 | ||||
| -rw-r--r-- | qemu-coroutine-io.c | 5 |
4 files changed, 34 insertions, 33 deletions
diff --git a/cutils.c b/cutils.c index 352bc521b1..2ad5fa3a9b 100644 --- a/cutils.c +++ b/cutils.c @@ -376,43 +376,28 @@ int qemu_parse_fd(const char *param) return fd; } -/* - * Send/recv data with iovec buffers - * - * This function send/recv data from/to the iovec buffer directly. - * The first `offset' bytes in the iovec buffer are skipped and next - * `len' bytes are used. - * - * For example, - * - * do_sendv_recvv(sockfd, iov, len, offset, 1); - * - * is equal to - * - * char *buf = malloc(size); - * iov_to_buf(iov, iovcnt, buf, offset, size); - * send(sockfd, buf, size, 0); - * free(buf); - */ -static int do_sendv_recvv(int sockfd, struct iovec *iov, int len, int offset, +static ssize_t do_sendv_recvv(int sockfd, struct iovec *iov, + size_t offset, size_t bytes, int do_sendv) { - int ret, diff, iovlen; + int iovlen; + ssize_t ret; + size_t diff; struct iovec *last_iov; /* last_iov is inclusive, so count from one. */ iovlen = 1; last_iov = iov; - len += offset; + bytes += offset; - while (last_iov->iov_len < len) { - len -= last_iov->iov_len; + while (last_iov->iov_len < bytes) { + bytes -= last_iov->iov_len; last_iov++; iovlen++; } - diff = last_iov->iov_len - len; + diff = last_iov->iov_len - bytes; last_iov->iov_len -= diff; while (iov->iov_len <= offset) { @@ -474,13 +459,13 @@ static int do_sendv_recvv(int sockfd, struct iovec *iov, int len, int offset, return ret; } -int qemu_recvv(int sockfd, struct iovec *iov, int len, int iov_offset) +ssize_t iov_recv(int sockfd, struct iovec *iov, size_t offset, size_t bytes) { - return do_sendv_recvv(sockfd, iov, len, iov_offset, 0); + return do_sendv_recvv(sockfd, iov, offset, bytes, 0); } -int qemu_sendv(int sockfd, struct iovec *iov, int len, int iov_offset) +ssize_t iov_send(int sockfd, struct iovec *iov, size_t offset, size_t bytes) { - return do_sendv_recvv(sockfd, iov, len, iov_offset, 1); + return do_sendv_recvv(sockfd, iov, offset, bytes, 1); } diff --git a/iov.h b/iov.h index 19ee3b3acd..5aa2f455de 100644 --- a/iov.h +++ b/iov.h @@ -54,6 +54,24 @@ size_t iov_to_buf(const struct iovec *iov, const unsigned int iov_cnt, size_t iov_memset(const struct iovec *iov, const unsigned int iov_cnt, size_t offset, int fillc, size_t bytes); +/* + * Send/recv data from/to iovec buffers directly + * + * `offset' bytes in the beginning of iovec buffer are skipped and + * next `bytes' bytes are used, which must be within data of iovec. + * + * r = iov_send(sockfd, iov, offset, bytes); + * + * is logically equivalent to + * + * char *buf = malloc(bytes); + * iov_to_buf(iov, iovcnt, offset, buf, bytes); + * r = send(sockfd, buf, bytes, 0); + * free(buf); + */ +ssize_t iov_recv(int sockfd, struct iovec *iov, size_t offset, size_t bytes); +ssize_t iov_send(int sockfd, struct iovec *iov, size_t offset, size_t bytes); + /** * Produce a text hexdump of iovec `iov' with `iov_cnt' number of elements * in file `fp', prefixing each line with `prefix' and processing not more diff --git a/qemu-common.h b/qemu-common.h index 056e495f30..41b8ae77cb 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -205,9 +205,6 @@ int qemu_pipe(int pipefd[2]); #define qemu_recv(sockfd, buf, len, flags) recv(sockfd, buf, len, flags) #endif -int qemu_recvv(int sockfd, struct iovec *iov, int len, int iov_offset); -int qemu_sendv(int sockfd, struct iovec *iov, int len, int iov_offset); - /* Error handling. */ void QEMU_NORETURN hw_error(const char *fmt, ...) GCC_FMT_ATTR(1, 2); diff --git a/qemu-coroutine-io.c b/qemu-coroutine-io.c index 40fd514395..0461a9aae6 100644 --- a/qemu-coroutine-io.c +++ b/qemu-coroutine-io.c @@ -25,6 +25,7 @@ #include "qemu-common.h" #include "qemu_socket.h" #include "qemu-coroutine.h" +#include "iov.h" int coroutine_fn qemu_co_recvv(int sockfd, struct iovec *iov, int len, int iov_offset) @@ -32,7 +33,7 @@ int coroutine_fn qemu_co_recvv(int sockfd, struct iovec *iov, int total = 0; int ret; while (len) { - ret = qemu_recvv(sockfd, iov, len, iov_offset + total); + ret = iov_recv(sockfd, iov, iov_offset + total, len); if (ret < 0) { if (errno == EAGAIN) { qemu_coroutine_yield(); @@ -58,7 +59,7 @@ int coroutine_fn qemu_co_sendv(int sockfd, struct iovec *iov, int total = 0; int ret; while (len) { - ret = qemu_sendv(sockfd, iov, len, iov_offset + total); + ret = iov_send(sockfd, iov, iov_offset + total, len); if (ret < 0) { if (errno == EAGAIN) { qemu_coroutine_yield(); |