{"id":807598,"url":"http://patchwork.ozlabs.org/api/1.0/patches/807598/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20170830113319.6749-2-quintela@redhat.com>","date":"2017-08-30T11:33:18","name":"[v2,1/2] tests: Use real size for iov tests","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"ef38e3338bd997405db6ed365df5ac59756c46c3","submitter":{"id":2643,"url":"http://patchwork.ozlabs.org/api/1.0/people/2643/?format=json","name":"Juan Quintela","email":"quintela@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830113319.6749-2-quintela@redhat.com/mbox/","series":[{"id":593,"url":"http://patchwork.ozlabs.org/api/1.0/series/593/?format=json","date":"2017-08-30T11:33:17","name":"Fix tests on recent gcc","version":2,"mbox":"http://patchwork.ozlabs.org/series/593/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807598/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=quintela@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xj3Lr19lXz9t1t\n\tfor ;\n\tWed, 30 Aug 2017 21:34:28 +1000 (AEST)","from localhost ([::1]:49786 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dn1GL-0006qF-SW\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 07:34:25 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:52878)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dn1Fh-0006nW-Ng\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 07:33:47 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dn1Fg-0007zL-M7\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 07:33:45 -0400","from mx1.redhat.com ([209.132.183.28]:42934)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dn1Fg-0007yt-Ch\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 07:33:44 -0400","from smtp.corp.redhat.com\n\t(int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 64C4920B17\n\tfor ; Wed, 30 Aug 2017 11:33:43 +0000 (UTC)","from secure.mitica (ovpn-117-188.ams2.redhat.com [10.36.117.188])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id A9D41708F6;\n\tWed, 30 Aug 2017 11:33:37 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 64C4920B17","From":"Juan Quintela ","To":"qemu-devel@nongnu.org","Date":"Wed, 30 Aug 2017 13:33:18 +0200","Message-Id":"<20170830113319.6749-2-quintela@redhat.com>","In-Reply-To":"<20170830113319.6749-1-quintela@redhat.com>","References":"<20170830113319.6749-1-quintela@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.13","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.30]);\n\tWed, 30 Aug 2017 11:33:43 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH v2 1/2] tests: Use real size for iov tests","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"lvivier@redhat.com, pbonzini@redhat.com, dgilbert@redhat.com,\n\tpeterx@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"We were using -1 instead of the real size because the functions check\nwhat is bigger, size in bytes or the size of the iov. Recent gcc's\nbarf at this.\n\nSigned-off-by: Juan Quintela \n\n--\n\nRemove comments about this feature.\nFix missing -1.\n---\n include/qemu/iov.h | 6 ------\n tests/test-iov.c | 10 +++++-----\n 2 files changed, 5 insertions(+), 11 deletions(-)","diff":"diff --git a/include/qemu/iov.h b/include/qemu/iov.h\nindex bd9fd55b0a..72d4c559b4 100644\n--- a/include/qemu/iov.h\n+++ b/include/qemu/iov.h\n@@ -31,11 +31,6 @@ size_t iov_size(const struct iovec *iov, const unsigned int iov_cnt);\n * Number of bytes actually copied will be returned, which is\n * min(bytes, iov_size(iov)-offset)\n * `Offset' must point to the inside of iovec.\n- * It is okay to use very large value for `bytes' since we're\n- * limited by the size of the iovec anyway, provided that the\n- * buffer pointed to by buf has enough space. One possible\n- * such \"large\" value is -1 (sinice size_t is unsigned),\n- * so specifying `-1' as `bytes' means 'up to the end of iovec'.\n */\n size_t iov_from_buf_full(const struct iovec *iov, unsigned int iov_cnt,\n size_t offset, const void *buf, size_t bytes);\n@@ -76,7 +71,6 @@ iov_to_buf(const struct iovec *iov, const unsigned int iov_cnt,\n * up to the end of it, will be filled with the specified value.\n * Function return actual number of bytes processed, which is\n * min(size, iov_size(iov) - offset).\n- * Again, it is okay to use large value for `bytes' to mean \"up to the end\".\n */\n size_t iov_memset(const struct iovec *iov, const unsigned int iov_cnt,\n size_t offset, int fillc, size_t bytes);\ndiff --git a/tests/test-iov.c b/tests/test-iov.c\nindex a22d71fd2c..f40f8f5260 100644\n--- a/tests/test-iov.c\n+++ b/tests/test-iov.c\n@@ -81,17 +81,17 @@ static void test_to_from_buf_1(void)\n * skip whole vector and process exactly 0 bytes */\n \n /* first set bytes [i..sz) to some \"random\" value */\n- n = iov_memset(iov, niov, 0, 0xff, -1);\n+ n = iov_memset(iov, niov, 0, 0xff, sz);\n g_assert(n == sz);\n \n /* next copy bytes [i..sz) from ibuf to iovec */\n- n = iov_from_buf(iov, niov, i, ibuf + i, -1);\n+ n = iov_from_buf(iov, niov, i, ibuf + i, sz - i);\n g_assert(n == sz - i);\n \n /* clear part of obuf */\n memset(obuf + i, 0, sz - i);\n /* and set this part of obuf to values from iovec */\n- n = iov_to_buf(iov, niov, i, obuf + i, -1);\n+ n = iov_to_buf(iov, niov, i, obuf + i, sz - i);\n g_assert(n == sz - i);\n \n /* now compare resulting buffers */\n@@ -109,7 +109,7 @@ static void test_to_from_buf_1(void)\n * with j in [i..sz]. */\n \n /* clear iovec */\n- n = iov_memset(iov, niov, 0, 0xff, -1);\n+ n = iov_memset(iov, niov, 0, 0xff, sz);\n g_assert(n == sz);\n \n /* copy bytes [i..j) from ibuf to iovec */\n@@ -226,7 +226,7 @@ static void test_io(void)\n for (i = 0; i <= sz; ++i) {\n for (j = i; j <= sz; ++j) {\n k = i;\n- iov_memset(iov, niov, 0, 0xff, -1);\n+ iov_memset(iov, niov, 0, 0xff, sz);\n do {\n s = g_test_rand_int_range(0, j - k + 1);\n r = iov_recv(sv[0], iov, niov, k, s);\n","prefixes":["v2","1/2"]}