From patchwork Wed Mar 4 17:06:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 446394 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46FC71401AF for ; Thu, 5 Mar 2015 06:38:49 +1100 (AEDT) Received: from localhost ([::1]:46535 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YTF83-00016d-H4 for incoming@patchwork.ozlabs.org; Wed, 04 Mar 2015 14:38:47 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43149) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YTF60-0006dH-AR for qemu-devel@nongnu.org; Wed, 04 Mar 2015 14:36:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YTF5u-0001Sy-Nq for qemu-devel@nongnu.org; Wed, 04 Mar 2015 14:36:40 -0500 Received: from isrv.corpit.ru ([86.62.121.231]:60357) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YTF5u-0001SG-G4; Wed, 04 Mar 2015 14:36:34 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 99BE5408F6; Wed, 4 Mar 2015 22:36:31 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.corpit.ru (Postfix) with SMTP id 6C637978; Wed, 4 Mar 2015 20:07:11 +0300 (MSK) Received: (nullmailer pid 17569 invoked by uid 1000); Wed, 04 Mar 2015 17:07:05 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Wed, 4 Mar 2015 20:06:59 +0300 Message-Id: <976e6ed5bb1eadeaf6977b4eb57fc35715e47022.1425488753.git.mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 86.62.121.231 Cc: qemu-trivial@nongnu.org, Stefan Weil , Michael Tokarev Subject: [Qemu-devel] [PULL 42/47] oslib-posix: Fix compiler warning (-Wclobbered) and simplify the code X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Stefan Weil gcc reports this warning with -Wclobbered: util/oslib-posix.c: In function ‘os_mem_prealloc’: util/oslib-posix.c:374:49: error: argument ‘memory’ might be clobbered by ‘longjmp’ or ‘vfork’ [-Werror=clobbered] Fix this and simplify the code by using an existing macro. Signed-off-by: Stefan Weil Signed-off-by: Michael Tokarev --- 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 memory) } else { int i; size_t hpagesize = fd_getpagesize(fd); + size_t numpages = DIV_ROUND_UP(memory, hpagesize); /* MAP_POPULATE silently ignores failures */ - memory = (memory + hpagesize - 1) & -hpagesize; - for (i = 0; i < (memory / hpagesize); i++) { + for (i = 0; i < numpages; i++) { memset(area + (hpagesize * i), 0, 1); }