diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-09-26 19:49:08 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-09-26 19:49:08 +0100 |
| commit | 31bc1d8481af414cfa2857f905e40f7d8e6d5b2e (patch) | |
| tree | 4f7198397d7f32c8880490f69b91e5d50731e678 /include | |
| parent | 2509dda283d438970028864dd89871bfe0263c3a (diff) | |
| parent | 35deebb2327227d8c5f4816476befb06f6329de6 (diff) | |
Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-fetch' into staging
trivial patches for 2017-09-26
# gpg: Signature made Tue 26 Sep 2017 07:13:16 BST
# gpg: using RSA key 0x701B4F6B1A693E59
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg: aka "Michael Tokarev <mjt@corpit.ru>"
# gpg: aka "Michael Tokarev <mjt@debian.org>"
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D 4324 457C E0A0 8044 65C5
# Subkey fingerprint: 7B73 BAD6 8BE7 A2C2 8931 4B22 701B 4F6B 1A69 3E59
* remotes/mjt/tags/trivial-patches-fetch: (29 commits)
hw/isa/pc87312: Mark the device with user_creatable = false
Drop gld linker usage on SunOS
tests/boot-sector: Increase timeout to 600 seconds
nbd-client: Use correct macro parenthesization
hw/display/virtio-gpu: Put the virtio-gpu-device into the display category
osdep: Fix ROUND_UP(64-bit, 32-bit)
target/xtensa: Use the pre-defined MEMTXATTRS_UNSPECIFIED macro
trivial: Add missing "-m" parameter in docs/memory-hotplug.txt
chardev/baum: fix baum that releases brlapi twice
remove trailing whitespace from qemu-options.hx
hw/display/xenfb.c: Add trace_xenfb_key_event
aux-to-i2c-bridge: don't allow user to create one
util/qemu-thread-posix.c: Replace OS ifdefs with CONFIG_HAVE_SEM_TIMEDWAIT
MAINTAINERS: update docs/interop/ entries
MAINTAINERS: update docs/devel/ entries
MAINTAINERS: add missing Cryptography entry
MAINTAINERS: add missing entry for Generic Loader
MAINTAINERS: add missing AIO entry
MAINTAINERS: add missing entries for throttling infra
MAINTAINERS: add missing SSI entries
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/qemu/osdep.h | 6 | ||||
| -rw-r--r-- | include/qemu/thread-posix.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 72b75bf044..9dd318a7dd 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -205,13 +205,13 @@ extern int daemon(int, int); /* Round number up to multiple. Requires that d be a power of 2 (see * QEMU_ALIGN_UP for a safer but slower version on arbitrary - * numbers) */ + * numbers); works even if d is a smaller type than n. */ #ifndef ROUND_UP -#define ROUND_UP(n,d) (((n) + (d) - 1) & -(d)) +#define ROUND_UP(n, d) (((n) + (d) - 1) & -(0 ? (n) : (d))) #endif #ifndef DIV_ROUND_UP -#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d)) +#define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) #endif /* diff --git a/include/qemu/thread-posix.h b/include/qemu/thread-posix.h index e5e3a0ff97..f4296d31c4 100644 --- a/include/qemu/thread-posix.h +++ b/include/qemu/thread-posix.h @@ -21,7 +21,7 @@ struct QemuCond { }; struct QemuSemaphore { -#if defined(__APPLE__) || defined(__NetBSD__) +#ifndef CONFIG_SEM_TIMEDWAIT pthread_mutex_t lock; pthread_cond_t cond; unsigned int count; |