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 /include/qemu | |
| parent | 109b25045b3651f9c5d02c3766c0b3ff63e6d193 (diff) | |
| parent | e71e8cc035558eabd6b3e19f6d3254c754c027ef (diff) | |
| download | focaccia-qemu-75507f1aba6feb73ae43329922d51571550b9128.tar.gz focaccia-qemu-75507f1aba6feb73ae43329922d51571550b9128.zip | |
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 'include/qemu')
| -rw-r--r-- | include/qemu/iova-tree.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/qemu/iova-tree.h b/include/qemu/iova-tree.h index b061932097..b66cf93c4b 100644 --- a/include/qemu/iova-tree.h +++ b/include/qemu/iova-tree.h @@ -23,7 +23,6 @@ * for the thread safety issue. */ -#include "qemu/osdep.h" #include "exec/memory.h" #include "exec/hwaddr.h" |