diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-03-10 11:44:59 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-03-10 11:44:59 +0000 |
| commit | 8437f7be3b1c49631e435c652707f2cee477149d (patch) | |
| tree | 0ee51a4ec9a966a780e414f823599aa183865ae7 /util | |
| parent | 277263e1b320d759a760ba6c5ea75ec268f929e5 (diff) | |
| parent | 438940cbc2eabbe9e403e5249dfa0be6c792c93b (diff) | |
| download | qemu-8437f7be3b1c49631e435c652707f2cee477149d.zip qemu-8437f7be3b1c49631e435c652707f2cee477149d.tar.gz qemu-8437f7be3b1c49631e435c652707f2cee477149d.tar.bz2 | |
Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2015-03-04' into staging
trivial patches for 2015-03-04
# gpg: Signature made Tue Mar 10 05:16:59 2015 GMT using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg: aka "Michael Tokarev <mjt@corpit.ru>"
# gpg: aka "Michael Tokarev <mjt@debian.org>"
* remotes/mjt/tags/pull-trivial-patches-2015-03-04: (44 commits)
9pfs: remove useless return
gdbstub: avoid possible NULL pointer dereference
milkymist-pfpu: fix GCC 5.0.0 aggressive-loop-optimizations warning
fix GCC 5.0.0 logical-not-parentheses warnings
migration: Fix coding style (whitespace issues)
oslib-posix: Fix compiler warning (-Wclobbered) and simplify the code
disas/microblaze: Fix warnings caused by missing 'static' attribute
disas/arm: Fix warnings caused by missing 'static' attribute
vhost_net: Add missing 'static' attribute
e500: fix memory leak
gitignore: Ignore new tests
gitignore: Track common.env in iotests gitignore
sysbus: fix memory leak
milkymist.c: fix memory leak
macio: fix possible memory leak
sparc/leon3.c: fix memory leak
nbd: fix resource leak
qemu-char: add cyrillic key 'numerosign' to Russian keymap
qemu-char: add cyrillic characters 'numerosign' to VNC keysyms
qapi-schema: Fix SpiceChannel docs
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'util')
| -rw-r--r-- | util/cutils.c | 5 | ||||
| -rw-r--r-- | util/oslib-posix.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/util/cutils.c b/util/cutils.c index c2250d1..144b25c 100644 --- a/util/cutils.c +++ b/util/cutils.c @@ -537,16 +537,17 @@ int parse_debug_env(const char *name, int max, int initial) { char *debug_env = getenv(name); char *inv = NULL; - int debug; + long debug; if (!debug_env) { return initial; } + errno = 0; debug = strtol(debug_env, &inv, 10); if (inv == debug_env) { return initial; } - if (debug < 0 || debug > max) { + if (debug < 0 || debug > max || errno != 0) { fprintf(stderr, "warning: %s not in [0, %d]", name, max); return initial; } 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); } |