[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 1/2] tests: Use real size for iov tests
From: |
Peter Xu |
Subject: |
Re: [Qemu-devel] [PATCH 1/2] tests: Use real size for iov tests |
Date: |
Wed, 23 Aug 2017 19:18:32 +0800 |
User-agent: |
Mutt/1.5.24 (2015-08-30) |
On Wed, Aug 23, 2017 at 10:39:00AM +0200, Juan Quintela wrote:
> We were using -1 instead of the real size because the functions check
> what is bigger, size in bytes or the size of the iov. Recent gcc's
> barf at this.
>
> Signed-off-by: Juan Quintela <address@hidden>
> ---
> tests/test-iov.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/tests/test-iov.c b/tests/test-iov.c
> index a22d71fd2c..819c410a51 100644
> --- a/tests/test-iov.c
> +++ b/tests/test-iov.c
> @@ -81,17 +81,17 @@ static void test_to_from_buf_1(void)
> * skip whole vector and process exactly 0 bytes */
>
> /* first set bytes [i..sz) to some "random" value */
> - n = iov_memset(iov, niov, 0, 0xff, -1);
> + n = iov_memset(iov, niov, 0, 0xff, sz);
This one is not needed?
> g_assert(n == sz);
>
> /* next copy bytes [i..sz) from ibuf to iovec */
> - n = iov_from_buf(iov, niov, i, ibuf + i, -1);
> + n = iov_from_buf(iov, niov, i, ibuf + i, sz - i);
> g_assert(n == sz - i);
>
> /* clear part of obuf */
> memset(obuf + i, 0, sz - i);
> /* and set this part of obuf to values from iovec */
> - n = iov_to_buf(iov, niov, i, obuf + i, -1);
> + n = iov_to_buf(iov, niov, i, obuf + i, sz - i);
> g_assert(n == sz - i);
>
> /* now compare resulting buffers */
> @@ -109,7 +109,7 @@ static void test_to_from_buf_1(void)
> * with j in [i..sz]. */
>
> /* clear iovec */
> - n = iov_memset(iov, niov, 0, 0xff, -1);
> + n = iov_memset(iov, niov, 0, 0xff, sz);
This one as well?
Actually I think we can keep the two places above, but there seems to
be a 3rd one below which is untouched. If we do change the two, maybe
we'd better change the 3rd one as well.
Besides:
Reviewed-by: Peter Xu <address@hidden>
> g_assert(n == sz);
>
> /* copy bytes [i..j) from ibuf to iovec */
> --
> 2.13.5
>
--
Peter Xu
[Qemu-devel] [PATCH 1/2] tests: Use real size for iov tests, Juan Quintela, 2017/08/23