[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/10] oslib-posix: Fix new compiler error with -Wclo
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 08/10] oslib-posix: Fix new compiler error with -Wclobbered |
Date: |
Thu, 10 Jul 2014 18:04:11 +0200 |
From: Stefan Weil <address@hidden>
Newer versions of gcc report a warning (or an error with -Werror) when
compiler option -Wclobbered (or -Wextra) is active:
util/oslib-posix.c:372:12: error:
variable ‘hpagesize’ might be clobbered by ‘longjmp’ or ‘vfork’
[-Werror=clobbered]
The rewritten code fixes this warning: variable 'hpagesize' is now set and
used in a block without any call of sigsetjmp or similar functions.
Signed-off-by: Stefan Weil <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
util/oslib-posix.c | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/util/oslib-posix.c b/util/oslib-posix.c
index 1524ead..cdbfb2e 100644
--- a/util/oslib-posix.c
+++ b/util/oslib-posix.c
@@ -366,10 +366,9 @@ static size_t fd_getpagesize(int fd)
void os_mem_prealloc(int fd, char *area, size_t memory)
{
- int ret, i;
+ int ret;
struct sigaction act, oldact;
sigset_t set, oldset;
- size_t hpagesize = fd_getpagesize(fd);
memset(&act, 0, sizeof(act));
act.sa_handler = &sigbus_handler;
@@ -389,19 +388,22 @@ void os_mem_prealloc(int fd, char *area, size_t memory)
if (sigsetjmp(sigjump, 1)) {
fprintf(stderr, "os_mem_prealloc: failed to preallocate pages\n");
exit(1);
- }
+ } else {
+ int i;
+ size_t hpagesize = fd_getpagesize(fd);
- /* MAP_POPULATE silently ignores failures */
- memory = (memory + hpagesize - 1) & -hpagesize;
- for (i = 0; i < (memory/hpagesize); i++) {
- memset(area + (hpagesize*i), 0, 1);
- }
+ /* MAP_POPULATE silently ignores failures */
+ memory = (memory + hpagesize - 1) & -hpagesize;
+ for (i = 0; i < (memory / hpagesize); i++) {
+ memset(area + (hpagesize * i), 0, 1);
+ }
- ret = sigaction(SIGBUS, &oldact, NULL);
- if (ret) {
- perror("os_mem_prealloc: failed to reinstall signal handler");
- exit(1);
- }
+ ret = sigaction(SIGBUS, &oldact, NULL);
+ if (ret) {
+ perror("os_mem_prealloc: failed to reinstall signal handler");
+ exit(1);
+ }
- pthread_sigmask(SIG_SETMASK, &oldset, NULL);
+ pthread_sigmask(SIG_SETMASK, &oldset, NULL);
+ }
}
--
1.8.3.1
- [Qemu-devel] [PULL v3 00/10] KVM changes (+ misc small fixes) for 2.1, Paolo Bonzini, 2014/07/10
- [Qemu-devel] [PULL 02/10] mips/kvm: Disable FPU on reset with KVM, Paolo Bonzini, 2014/07/10
- [Qemu-devel] [PULL 01/10] mips/kvm: Init EBase to correct KSEG0, Paolo Bonzini, 2014/07/10
- [Qemu-devel] [PULL 03/10] mips_malta: Remove incorrect KVM T&E references, Paolo Bonzini, 2014/07/10
- [Qemu-devel] [PULL 04/10] mips_malta: Catch kernels linked at wrong address, Paolo Bonzini, 2014/07/10
- [Qemu-devel] [PULL 06/10] Enforce stack protector usage, Paolo Bonzini, 2014/07/10
- [Qemu-devel] [PULL 08/10] oslib-posix: Fix new compiler error with -Wclobbered,
Paolo Bonzini <=
- [Qemu-devel] [PULL 05/10] watchdog: fix deadlock with -watchdog-action pause, Paolo Bonzini, 2014/07/10
- [Qemu-devel] [PULL 09/10] mc146818rtc: register the clock reset notifier on the right clock, Paolo Bonzini, 2014/07/10
- [Qemu-devel] [PULL 07/10] target-i386: Add "kvmclock-stable-bit" feature bit name, Paolo Bonzini, 2014/07/10
- [Qemu-devel] [PULL 10/10] qtest: fix vhost-user-test compilation with old GLib, Paolo Bonzini, 2014/07/10
- Re: [Qemu-devel] [PULL v3 00/10] KVM changes (+ misc small fixes) for 2.1, Peter Maydell, 2014/07/11