diff options
author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2017-06-02 12:15:19 +0400 |
---|---|---|
committer | Michael S. Tsirkin <mst@redhat.com> | 2017-06-08 22:02:36 +0300 |
commit | 277238f9f41e0a429a24b05c03f3010b35c3e9d0 (patch) | |
tree | 49836de6e617ae77f10ac9cd7d35f3b424dbd4b4 /tests | |
parent | 64175afc695c0672876fbbfc31b299c86d562cb4 (diff) | |
download | qemu-277238f9f41e0a429a24b05c03f3010b35c3e9d0.zip qemu-277238f9f41e0a429a24b05c03f3010b35c3e9d0.tar.gz qemu-277238f9f41e0a429a24b05c03f3010b35c3e9d0.tar.bz2 |
vhost-user-bridge: fix iov_restore_front() warning
CC tests/vhost-user-bridge.o
/home/dgilbert/git/qemu-world3/tests/vhost-user-bridge.c:228:23: warning: variables 'front' and 'iov' used in loop condition not modified in loop body [-Wfor-loop-analysis]
for (cur = front; front != iov; cur++) {
^~~~~ ~~~
1 warning generated.
Fix the loop, document the function, and fix some related assert().
In practice, the loop bug was harmless because the front sg buffer is
enough to discard/restore the header size.
Reported-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Tested-by: Jens Freimann <jfreiman@redhat.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/vhost-user-bridge.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/tests/vhost-user-bridge.c b/tests/vhost-user-bridge.c index 8618c20..1e5b5ca 100644 --- a/tests/vhost-user-bridge.c +++ b/tests/vhost-user-bridge.c @@ -220,12 +220,18 @@ vubr_handle_tx(VuDev *dev, int qidx) free(elem); } + +/* this function reverse the effect of iov_discard_front() it must be + * called with 'front' being the original struct iovec and 'bytes' + * being the number of bytes you shaved off + */ static void iov_restore_front(struct iovec *front, struct iovec *iov, size_t bytes) { struct iovec *cur; - for (cur = front; front != iov; cur++) { + for (cur = front; cur != iov; cur++) { + assert(bytes >= cur->iov_len); bytes -= cur->iov_len; } @@ -302,7 +308,8 @@ vubr_backend_recv_cb(int sock, void *ctx) } iov_from_buf(sg, elem->in_num, 0, &hdr, sizeof hdr); total += hdrlen; - assert(iov_discard_front(&sg, &num, hdrlen) == hdrlen); + ret = iov_discard_front(&sg, &num, hdrlen); + assert(ret == hdrlen); } struct msghdr msg = { |