From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41778) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YS3Lv-0002jb-29 for qemu-devel@nongnu.org; Sun, 01 Mar 2015 07:52:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YS3Lu-0006WT-3i for qemu-devel@nongnu.org; Sun, 01 Mar 2015 07:52:11 -0500 From: Stefan Weil Date: Sun, 1 Mar 2015 13:52:06 +0100 Message-Id: <1425214326-25326-1-git-send-email-sw@weilnetz.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH] oslib-posix: Fix compiler warning (-Wclobbered) and simplify the code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU Trivial Cc: Paolo Bonzini , QEMU Developer , Stefan Weil gcc reports this warning with -Wclobbered: util/oslib-posix.c: In function =E2=80=98os_mem_prealloc=E2=80=99: util/oslib-posix.c:374:49: error: argument =E2=80=98memory=E2=80=99 might= be clobbered by =E2=80=98longjmp=E2=80=99 or =E2=80=98vfork=E2=80=99 [-Werror=3Dclobbere= d] Fix this and simplify the code by using an existing macro. Signed-off-by: Stefan Weil --- util/oslib-posix.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/oslib-posix.c b/util/oslib-posix.c index 16fcec2..37ffd96 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -399,10 +399,10 @@ void os_mem_prealloc(int fd, char *area, size_t mem= ory) } else { int i; size_t hpagesize =3D fd_getpagesize(fd); + size_t numpages =3D DIV_ROUND_UP(memory, hpagesize); =20 /* MAP_POPULATE silently ignores failures */ - memory =3D (memory + hpagesize - 1) & -hpagesize; - for (i =3D 0; i < (memory / hpagesize); i++) { + for (i =3D 0; i < numpages; i++) { memset(area + (hpagesize * i), 0, 1); } =20 --=20 1.7.10.4