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

iov: don't touch iov in iov_send_recv()

Browse Source 
Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
Message-id: 555D39D2.4000705@cn.fujitsu.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Wen Congyang 2015-05-21 09:50:10 +08:00 committed by Stefan Hajnoczi
parent 3307ed7b3f
commit 6b64640dd2
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/qemu/iov.h
View File

@ -75,7 +75,7 @@ size_t iov_memset(const struct iovec *iov, const unsigned int iov_cnt,
* For iov_send_recv() _whole_ area being sent or received * For iov_send_recv() _whole_ area being sent or received
* should be within the iovec, not only beginning of it. * should be within the iovec, not only beginning of it.
*/ */
ssize_t iov_send_recv(int sockfd, struct iovec *iov, unsigned iov_cnt, ssize_t iov_send_recv(int sockfd, const struct iovec *iov, unsigned iov_cnt,
size_t offset, size_t bytes, bool do_send); size_t offset, size_t bytes, bool do_send);
#define iov_recv(sockfd, iov, iov_cnt, offset, bytes) \ #define iov_recv(sockfd, iov, iov_cnt, offset, bytes) \
iov_send_recv(sockfd, iov, iov_cnt, offset, bytes, false) iov_send_recv(sockfd, iov, iov_cnt, offset, bytes, false)

14
util/iov.c
View File

@ -133,7 +133,7 @@ do_send_recv(int sockfd, struct iovec *iov, unsigned iov_cnt, bool do_send)
#endif #endif
} }
ssize_t iov_send_recv(int sockfd, struct iovec *iov, unsigned iov_cnt, ssize_t iov_send_recv(int sockfd, const struct iovec *_iov, unsigned iov_cnt,
size_t offset, size_t bytes, size_t offset, size_t bytes,
bool do_send) bool do_send)
{ {
@ -141,6 +141,16 @@ ssize_t iov_send_recv(int sockfd, struct iovec *iov, unsigned iov_cnt,
ssize_t ret; ssize_t ret;
size_t orig_len, tail; size_t orig_len, tail;
unsigned niov; unsigned niov;
struct iovec *local_iov, *iov;
if (bytes <= 0) {
return 0;
}
local_iov = g_new0(struct iovec, iov_cnt);
iov_copy(local_iov, iov_cnt, _iov, iov_cnt, offset, bytes);
offset = 0;
iov = local_iov;
while (bytes > 0) { while (bytes > 0) {
/* Find the start position, skipping `offset' bytes: /* Find the start position, skipping `offset' bytes:
@ -187,6 +197,7 @@ ssize_t iov_send_recv(int sockfd, struct iovec *iov, unsigned iov_cnt,
if (ret < 0) { if (ret < 0) {
assert(errno != EINTR); assert(errno != EINTR);
g_free(local_iov);
if (errno == EAGAIN && total > 0) { if (errno == EAGAIN && total > 0) {
return total; return total;
} }
@ -205,6 +216,7 @@ ssize_t iov_send_recv(int sockfd, struct iovec *iov, unsigned iov_cnt,
bytes -= ret; bytes -= ret;
} }
g_free(local_iov);
return total; return total;
} }