[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 42/47] oslib-posix: Fix compiler warning (-Wclobber
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 42/47] oslib-posix: Fix compiler warning (-Wclobbered) and simplify the code |
Date: |
Wed, 4 Mar 2015 20:06:59 +0300 |
From: Stefan Weil <address@hidden>
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 <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
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);
}
--
2.1.4
- [Qemu-trivial] [PULL 47/47] 9pfs: remove useless return, (continued)
- [Qemu-trivial] [PULL 47/47] 9pfs: remove useless return, Michael Tokarev, 2015/03/04
- [Qemu-trivial] [PULL 08/47] cutils: refine strtol error handling in parse_debug_env, Michael Tokarev, 2015/03/04
- [Qemu-trivial] [PULL 28/47] qemu-char: add cyrillic key 'numerosign' to Russian keymap, Michael Tokarev, 2015/03/04
- [Qemu-trivial] [PULL 13/47] a9gtimer: remove superfluous '\n' around error_setg, Michael Tokarev, 2015/03/04
- [Qemu-trivial] [PULL 43/47] migration: Fix coding style (whitespace issues), Michael Tokarev, 2015/03/04
- [Qemu-trivial] [PULL 16/47] Remove superfluous '\n' around error_report(), Michael Tokarev, 2015/03/04
- [Qemu-trivial] [PULL 21/47] arm/digic_boards: Remove superfluous '\n' around error_report(), Michael Tokarev, 2015/03/04
- [Qemu-trivial] [PULL 09/47] Add copyright and author after file split, Michael Tokarev, 2015/03/04
- [Qemu-trivial] [PULL 20/47] tpm: Remove superfluous '\n' around error_report(), Michael Tokarev, 2015/03/04
- [Qemu-trivial] [PULL 26/47] qapi-schema: Fix SpiceChannel docs, Michael Tokarev, 2015/03/04
- [Qemu-trivial] [PULL 42/47] oslib-posix: Fix compiler warning (-Wclobbered) and simplify the code,
Michael Tokarev <=
- [Qemu-trivial] [PULL 01/47] xen-pt: fix Negative array index read, Michael Tokarev, 2015/03/04
- [Qemu-trivial] [PULL 30/47] sparc/leon3.c: fix memory leak, Michael Tokarev, 2015/03/04
- [Qemu-trivial] [PULL 14/47] pl330.c: remove superfluous '\n' around error_setg, Michael Tokarev, 2015/03/04
- [Qemu-trivial] [PULL 07/47] qemu-options: fix/document -incoming options, Michael Tokarev, 2015/03/04
- [Qemu-trivial] [PULL 22/47] vhost: Remove superfluous '\n' around error_report(), Michael Tokarev, 2015/03/04
- [Qemu-trivial] [PULL 18/47] vfio: Remove superfluous '\n' around error_report(), Michael Tokarev, 2015/03/04
- [Qemu-trivial] [PULL 33/47] sysbus: fix memory leak, Michael Tokarev, 2015/03/04
- [Qemu-trivial] [PULL 45/47] milkymist-pfpu: fix GCC 5.0.0 aggressive-loop-optimizations warning, Michael Tokarev, 2015/03/04
- [Qemu-trivial] [PULL 31/47] macio: fix possible memory leak, Michael Tokarev, 2015/03/04
- [Qemu-trivial] [PULL 44/47] fix GCC 5.0.0 logical-not-parentheses warnings, Michael Tokarev, 2015/03/04