diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-06-29 15:04:20 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-06-29 15:04:20 +0100 |
| commit | 75507f1aba6feb73ae43329922d51571550b9128 (patch) | |
| tree | afdc91cca05f534d22838da16dac63e13ace3307 /util | |
| parent | 109b25045b3651f9c5d02c3766c0b3ff63e6d193 (diff) | |
| parent | e71e8cc035558eabd6b3e19f6d3254c754c027ef (diff) | |
| download | qemu-75507f1aba6feb73ae43329922d51571550b9128.zip qemu-75507f1aba6feb73ae43329922d51571550b9128.tar.gz qemu-75507f1aba6feb73ae43329922d51571550b9128.tar.bz2 | |
Merge remote-tracking branch 'remotes/berrange/tags/min-glib-pull-request' into staging
glib: update the min required version
This updates the minimum required glib version to 2.40
# gpg: Signature made Fri 29 Jun 2018 12:24:58 BST
# gpg: using RSA key BE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg: aka "Daniel P. Berrange <berrange@redhat.com>"
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF
* remotes/berrange/tags/min-glib-pull-request:
glib: enforce the minimum required version and warn about old APIs
glib: bump min required glib library version to 2.40
util: remove redundant include of glib.h and add osdep.h
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'util')
| -rw-r--r-- | util/iova-tree.c | 2 | ||||
| -rw-r--r-- | util/osdep.c | 14 |
2 files changed, 1 insertions, 15 deletions
diff --git a/util/iova-tree.c b/util/iova-tree.c index 2d9cebf..7990692 100644 --- a/util/iova-tree.c +++ b/util/iova-tree.c @@ -9,7 +9,7 @@ * This work is licensed under the terms of the GNU GPL, version 2 or later. */ -#include <glib.h> +#include "qemu/osdep.h" #include "qemu/iova-tree.h" struct IOVATree { diff --git a/util/osdep.c b/util/osdep.c index ea51d50..1c8d1e2 100644 --- a/util/osdep.c +++ b/util/osdep.c @@ -504,20 +504,6 @@ int socket_init(void) return 0; } -#if !GLIB_CHECK_VERSION(2, 31, 0) -/* Ensure that glib is running in multi-threaded mode - * Old versions of glib require explicit initialization. Failure to do - * this results in the single-threaded code paths being taken inside - * glib. For example, the g_slice allocator will not be thread-safe - * and cause crashes. - */ -static void __attribute__((constructor)) thread_init(void) -{ - if (!g_thread_supported()) { - g_thread_init(NULL); - } -} -#endif #ifndef CONFIG_IOVEC /* helper function for iov_send_recv() */ |