[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/3] vhost-user-bridge: fix iov_restore_front() warni
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 1/3] vhost-user-bridge: fix iov_restore_front() warning |
Date: |
Thu, 8 Jun 2017 22:36:24 +0300 |
From: Marc-André Lureau <address@hidden>
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 <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Tested-by: Jens Freimann <address@hidden>
---
tests/vhost-user-bridge.c | 11 +++++++++--
1 file 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 = {
--
MST