diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-11-16 14:42:54 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-11-16 14:42:54 +0000 |
| commit | 62955e101e4bdc113e3205174567c9c8e12ec1b4 (patch) | |
| tree | a0b1aae9f11f65501f9096720bd652bb1171cfa0 /include | |
| parent | 6a7cb8c3d674815cab08d884740d203fded12249 (diff) | |
| parent | 4950b1a766a16bd3feef4c9471b9794e6fe0e1b2 (diff) | |
| download | qemu-62955e101e4bdc113e3205174567c9c8e12ec1b4.zip qemu-62955e101e4bdc113e3205174567c9c8e12ec1b4.tar.gz qemu-62955e101e4bdc113e3205174567c9c8e12ec1b4.tar.bz2 | |
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
Miscellaneous bugfixes
# gpg: Signature made Wed 15 Nov 2017 15:27:25 GMT
# gpg: using RSA key 0xBFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>"
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1
# Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83
* remotes/bonzini/tags/for-upstream:
fix scripts/update-linux-headers.sh here document
exec: Do not resolve subpage in mru_section
util/stats64: Fix min/max comparisons
cpu-exec: avoid cpu_exec_nocache infinite loop with record/replay
cpu-exec: don't overwrite exception_index
vhost-user-scsi: add missing virtqueue_size param
target-i386: adds PV_TLB_FLUSH CPUID feature bit
thread-posix: fix qemu_rec_mutex_trylock macro
Makefile: simpler/faster "make help"
ioapic/tracing: Remove last DPRINTFs
Enable 8-byte wide MMIO for 16550 serial devices
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/qemu/thread-posix.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/qemu/thread-posix.h b/include/qemu/thread-posix.h index f4296d3..f3f47e4 100644 --- a/include/qemu/thread-posix.h +++ b/include/qemu/thread-posix.h @@ -7,7 +7,7 @@ typedef QemuMutex QemuRecMutex; #define qemu_rec_mutex_destroy qemu_mutex_destroy #define qemu_rec_mutex_lock qemu_mutex_lock -#define qemu_rec_mutex_try_lock qemu_mutex_try_lock +#define qemu_rec_mutex_trylock qemu_mutex_trylock #define qemu_rec_mutex_unlock qemu_mutex_unlock struct QemuMutex { |