diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-06-07 16:34:45 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-06-07 16:34:45 +0100 |
| commit | 6ed5546fa7bf12c5b87ef76bafb86e1d77ed6e85 (patch) | |
| tree | 856364b55688b61a141f32b6617aaa786177b258 /util | |
| parent | 40eeb397c8b8008aa13bca3a8cb25d152eb5ab44 (diff) | |
| parent | 30f549c2f30de65c7cbb30614b838d5478d6221b (diff) | |
| download | focaccia-qemu-6ed5546fa7bf12c5b87ef76bafb86e1d77ed6e85.tar.gz focaccia-qemu-6ed5546fa7bf12c5b87ef76bafb86e1d77ed6e85.zip | |
Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2016-06-07' into staging
trivial patches for 2016-06-07 # gpg: Signature made Tue 07 Jun 2016 16:20:52 BST # gpg: using RSA key 0xBEE59D74A4C3D7DB # 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-2016-06-07: (51 commits) hbitmap: Use DIV_ROUND_UP qemu-timer: Use DIV_ROUND_UP linux-user: Use DIV_ROUND_UP slirp: Use DIV_ROUND_UP usb: Use DIV_ROUND_UP rocker: Use DIV_ROUND_UP SPICE: Use DIV_ROUND_UP audio: Use DIV_ROUND_UP xen: Use DIV_ROUND_UP crypto: Use DIV_ROUND_UP block: Use DIV_ROUND_UP qed: Use DIV_ROUND_UP qcow/qcow2: Use DIV_ROUND_UP parallels: Use DIV_ROUND_UP coccinelle: use macro DIV_ROUND_UP instead of (((n) + (d) - 1) /(d)) thunk: Rename args and fields in host-target bitmask conversion code thunk: Drop unused NO_THUNK_TYPE_SIZE guards qemu-common.h: Drop WORDS_ALIGNED define host-utils: Prefer 'false' for bool type docs/multi-thread-compression: Fix wrong command string ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'util')
| -rw-r--r-- | util/coroutine-gthread.c | 1 | ||||
| -rw-r--r-- | util/hbitmap.c | 1 | ||||
| -rw-r--r-- | util/memfd.c | 1 | ||||
| -rw-r--r-- | util/oslib-win32.c | 1 | ||||
| -rw-r--r-- | util/uri.c | 1 |
5 files changed, 0 insertions, 5 deletions
diff --git a/util/coroutine-gthread.c b/util/coroutine-gthread.c index fb697eb0b7..62bfb4015d 100644 --- a/util/coroutine-gthread.c +++ b/util/coroutine-gthread.c @@ -19,7 +19,6 @@ */ #include "qemu/osdep.h" -#include <glib.h> #include "qemu-common.h" #include "qemu/coroutine_int.h" diff --git a/util/hbitmap.c b/util/hbitmap.c index b22b87d0a6..7121b11c01 100644 --- a/util/hbitmap.c +++ b/util/hbitmap.c @@ -10,7 +10,6 @@ */ #include "qemu/osdep.h" -#include <glib.h> #include "qemu/hbitmap.h" #include "qemu/host-utils.h" #include "trace.h" diff --git a/util/memfd.c b/util/memfd.c index 7c406914c5..b374238a59 100644 --- a/util/memfd.c +++ b/util/memfd.c @@ -27,7 +27,6 @@ #include "qemu/osdep.h" -#include <glib.h> #include <glib/gprintf.h> #include <sys/mman.h> diff --git a/util/oslib-win32.c b/util/oslib-win32.c index c926db4a5c..6debc2b8a6 100644 --- a/util/oslib-win32.c +++ b/util/oslib-win32.c @@ -31,7 +31,6 @@ */ #include "qemu/osdep.h" #include <windows.h> -#include <glib.h> #include "qapi/error.h" #include "sysemu/sysemu.h" #include "qemu/main-loop.h" diff --git a/util/uri.c b/util/uri.c index d109d6c01d..70a9cbcbd2 100644 --- a/util/uri.c +++ b/util/uri.c @@ -52,7 +52,6 @@ */ #include "qemu/osdep.h" -#include <glib.h> #include "qemu/uri.h" |