all: Remove unnecessary glib.h includes

Remove glib.h includes, as it is provided by osdep.h.

This commit was created with scripts/clean-includes.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Tested-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>

diff --git a/block/dmg.c b/block/dmg.c
index 1ea5f22d8271468a4d6211a50aeb40690a966e36..06eb5138f373515ad35be19741784904693d2b56 100644 (file)
--- a/block/dmg.c
+++ b/block/dmg.c
@@ -32,7 +32,6 @@
 #ifdef CONFIG_BZIP2
 #include <bzlib.h>
 #endif
-#include <glib.h>
 
 enum {
     /* Limit chunk sizes to prevent unreasonable amounts of memory being used

diff --git a/block/vhdx.c b/block/vhdx.c
index c0d24a24ee829f81897279e3e69943e5d203c5b3..f5605a2ff4ce688dd36cc6a1361b974610eb1e14 100644 (file)
--- a/block/vhdx.c
+++ b/block/vhdx.c
@@ -27,7 +27,6 @@
 #include "migration/migration.h"
 
 #include <uuid/uuid.h>
-#include <glib.h>
 
 /* Options for VHDX creation */
 

diff --git a/block/vmdk.c b/block/vmdk.c
index 372e5edc1597579bb22e2afdad24a034c45ca99e..2205cc888fc1457842e4973a32944d15079fe929 100644 (file)
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -34,7 +34,6 @@
 #include "migration/migration.h"
 #include "qemu/cutils.h"
 #include <zlib.h>
-#include <glib.h>
 
 #define VMDK3_MAGIC (('C' << 24) | ('O' << 16) | ('W' << 8) | 'D')
 #define VMDK4_MAGIC (('K' << 24) | ('D' << 16) | ('M' << 8) | 'V')

diff --git a/fsdev/9p-iov-marshal.c b/fsdev/9p-iov-marshal.c
index fb40bdf0d5f62f3e1d1146b83f3f17ff6bfbbf30..fce1ee9e55319b935102919059c1acdaec4681bb 100644 (file)
--- a/fsdev/9p-iov-marshal.c
+++ b/fsdev/9p-iov-marshal.c
@@ -12,7 +12,6 @@
  */
 
 #include "qemu/osdep.h"
-#include <glib.h>
 #include <glib/gprintf.h>
 #include <utime.h>
 #include <sys/uio.h>

diff --git a/fsdev/9p-marshal.c b/fsdev/9p-marshal.c
index 183d3667c68170e2193367a7bcf02b032eda9aaa..f56ef0e60c0f223b47d935bb4dfe0048df7158c6 100644 (file)
--- a/fsdev/9p-marshal.c
+++ b/fsdev/9p-marshal.c
@@ -12,7 +12,6 @@
  */
 
 #include "qemu/osdep.h"
-#include <glib.h>
 #include <glib/gprintf.h>
 #include <dirent.h>
 #include <utime.h>

diff --git a/hw/9pfs/9p.h b/hw/9pfs/9p.h
index 46d787627a4cee507b5ddb6c5af224b8015b0f3d..d2030fdf56e9becd69f9336d79654bbee12d77a3 100644 (file)
--- a/hw/9pfs/9p.h
+++ b/hw/9pfs/9p.h
@@ -4,7 +4,6 @@
 #include <dirent.h>
 #include <utime.h>
 #include <sys/resource.h>
-#include <glib.h>
 #include "fsdev/file-op-9p.h"
 #include "fsdev/9p-iov-marshal.h"
 #include "qemu/thread.h"

diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 06d6204749432a43904cd8b6824b4c9b1d90d602..8ca203211adeffdde261af09fe2f625e3022206b 100644 (file)
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -23,7 +23,6 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "acpi-build.h"
-#include <glib.h>
 #include "qemu-common.h"
 #include "qemu/bitmap.h"
 #include "qemu/error-report.h"

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 24e7042680355c9afd0f0f3ddb4bbe53554e9c02..a6a6604722cc3d926498794c76db3c5f04c2a4c8 100644 (file)
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -23,7 +23,6 @@
  */
 
 #include "qemu/osdep.h"
-#include <glib.h>
 
 #include "hw/hw.h"
 #include "hw/loader.h"

diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h
index 3952f85eeb25a68d1815307465e28b26c6f4d7e6..10c09ca29f5c2060d704464382ad104b8507b623 100644 (file)
--- a/include/hw/acpi/aml-build.h
+++ b/include/hw/acpi/aml-build.h
@@ -1,7 +1,6 @@
 #ifndef HW_ACPI_GEN_UTILS_H
 #define HW_ACPI_GEN_UTILS_H
 
-#include <glib.h>
 #include "hw/acpi/acpi-defs.h"
 #include "hw/acpi/bios-linker-loader.h"
 

diff --git a/include/hw/acpi/bios-linker-loader.h b/include/hw/acpi/bios-linker-loader.h
index a05227eb30f2b4e2a7c756fc90f21a8f7bdc5bec..fa1e5d1a4e335f990fd6423ccc05c188db6737d6 100644 (file)
--- a/include/hw/acpi/bios-linker-loader.h
+++ b/include/hw/acpi/bios-linker-loader.h
@@ -1,7 +1,6 @@
 #ifndef BIOS_LINKER_LOADER_H
 #define BIOS_LINKER_LOADER_H
 
-#include <glib.h>
 
 typedef struct BIOSLinker {
     GArray *cmd_blob;

diff --git a/include/qemu/bitmap.h b/include/qemu/bitmap.h
index 0e33fa5d9d6090e007b18003eb1d35873385c6ab..ec5146f84e24f4f26ef775ec56220979f62b3a2c 100644 (file)
--- a/include/qemu/bitmap.h
+++ b/include/qemu/bitmap.h
@@ -12,7 +12,6 @@
 #ifndef BITMAP_H
 #define BITMAP_H
 
-#include <glib.h>
 
 #include "qemu/bitops.h"
 

diff --git a/include/qemu/rcu.h b/include/qemu/rcu.h
index 56d3a682a934d7a63faf93ea328fa0e9571a04b3..83ae2808be1917af846173c02d18734747501269 100644 (file)
--- a/include/qemu/rcu.h
+++ b/include/qemu/rcu.h
@@ -23,7 +23,6 @@
  * IBM's contributions to this file may be relicensed under LGPLv2 or later.
  */
 
-#include <glib.h>
 
 #include "qemu/thread.h"
 #include "qemu/queue.h"

diff --git a/include/qom/object.h b/include/qom/object.h
index 21bb5ff1495960bdc2b0c7e725b9ca6eee64c577..99de539e7c7d0145e40bbe6db76bab8b813ba8be 100644 (file)
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -14,7 +14,6 @@
 #ifndef QEMU_OBJECT_H
 #define QEMU_OBJECT_H
 
-#include <glib.h>
 #include "qapi-types.h"
 #include "qemu/queue.h"
 

diff --git a/include/sysemu/tpm_backend_int.h b/include/sysemu/tpm_backend_int.h
index 40f693a0ccc6d13ebc478a7e2f74f48adb740a74..cc0dcb3fd2474a67ead00878de7ccc8e12d0c3b6 100644 (file)
--- a/include/sysemu/tpm_backend_int.h
+++ b/include/sysemu/tpm_backend_int.h
@@ -22,7 +22,6 @@
 #ifndef TPM_TPM_BACKEND_H
 #define TPM_TPM_BACKEND_H
 
-#include <glib.h>
 
 typedef struct TPMBackendThread {
     GThreadPool *pool;

diff --git a/memory_mapping.c b/memory_mapping.c
index 2354b2b7f32b5ef8fd13f35271a652f0adee59fa..e3e0d951728040b3241ce966a9a9da7220d8112c 100644 (file)
--- a/memory_mapping.c
+++ b/memory_mapping.c
@@ -13,7 +13,6 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include <glib.h>
 
 #include "qemu-common.h"
 #include "cpu.h"

diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c
index cf7dcd25d4fa70b5eda4db895b3522b0f9065ec8..47250b675db0340941dc9926ff86dae2d4cd3cc3 100644 (file)
--- a/migration/postcopy-ram.c
+++ b/migration/postcopy-ram.c
@@ -17,7 +17,6 @@
  */
 
 #include "qemu/osdep.h"
-#include <glib.h>
 
 #include "qemu-common.h"
 #include "migration/migration.h"

diff --git a/page_cache.c b/page_cache.c
index 37a66e497b06cddbfafb25bbab22c8008484c9dc..a2809db2f545b8e8bea6e9a0dece340e484f7c6f 100644 (file)
--- a/page_cache.c
+++ b/page_cache.c
@@ -13,7 +13,6 @@
  */
 
 #include "qemu/osdep.h"
-#include <glib.h>
 
 #include "qemu-common.h"
 #include "qemu/host-utils.h"

diff --git a/qapi/qmp-registry.c b/qapi/qmp-registry.c
index 4332a6818d6acfd238d21ace7deb355a93a3c8f2..68b24c98b0ecf1586a4822afa6f700bd6f51921c 100644 (file)
--- a/qapi/qmp-registry.c
+++ b/qapi/qmp-registry.c
@@ -13,7 +13,6 @@
  */
 
 #include "qemu/osdep.h"
-#include <glib.h>
 #include "qapi/qmp/dispatch.h"
 
 static QTAILQ_HEAD(QmpCommandList, QmpCommand) qmp_commands =

diff --git a/qemu-bridge-helper.c b/qemu-bridge-helper.c
index 830fb9e269d913adaa9784c7a0c6e1858bf1c253..5396fbfbb6ca5d4415bd3165dc68bb4f5004a7a0 100644 (file)
--- a/qemu-bridge-helper.c
+++ b/qemu-bridge-helper.c
@@ -15,7 +15,6 @@
 
 #include "qemu/osdep.h"
 
-#include <glib.h>
 
 #include <sys/ioctl.h>
 #include <sys/socket.h>

diff --git a/slirp/dnssearch.c b/slirp/dnssearch.c
index aed2f13af50d0392b318267364d2369143fc4741..4c70a643598ad643179342458c34de1bb4005561 100644 (file)
--- a/slirp/dnssearch.c
+++ b/slirp/dnssearch.c
@@ -23,7 +23,6 @@
  */
 
 #include "qemu/osdep.h"
-#include <glib.h>
 #include "slirp.h"
 
 static const uint8_t RFC3397_OPT_DOMAIN_SEARCH = 119;

diff --git a/slirp/slirp.h b/slirp/slirp.h
index 5df755e6978c6d756edf243a87894a043a881fb8..e3641f9eba4a391a1df662999322beed08e73164 100644 (file)
--- a/slirp/slirp.h
+++ b/slirp/slirp.h
@@ -69,7 +69,6 @@ typedef char *caddr_t;
 #include <sys/stropts.h>
 #endif
 
-#include <glib.h>
 
 #include "debug.h"
 

diff --git a/ui/sdl_zoom.c b/ui/sdl_zoom.c
index 72622c2647a158189c77a3cb89b7cd15d5d97cf3..b96196bac53452ceb2bcfa362f892347ec575fbd 100644 (file)
--- a/ui/sdl_zoom.c
+++ b/ui/sdl_zoom.c
@@ -13,7 +13,6 @@
 
 #include "qemu/osdep.h"
 #include "sdl_zoom.h"
-#include <glib.h>
 
 static void sdl_zoom_rgb16(SDL_Surface *src, SDL_Surface *dst, int smooth,
                            SDL_Rect *dst_rect);

diff --git a/ui/vnc-palette.c b/ui/vnc-palette.c
index 3b89d1af25c049fd74f64d3689115d3b4cbe6479..dc7c0ba99724c91c39375629b86a4068940a4fc0 100644 (file)
--- a/ui/vnc-palette.c
+++ b/ui/vnc-palette.c
@@ -28,7 +28,6 @@
 
 #include "qemu/osdep.h"
 #include "vnc-palette.h"
-#include <glib.h>
 
 static VncPaletteEntry *palette_find(const VncPalette *palette,
                                      uint32_t color, unsigned int hash)

diff --git a/util/coroutine-gthread.c b/util/coroutine-gthread.c
index fb697eb0b7a09b1f157d56eeef45eaab69c2cd65..62bfb4015d2eff9d4b7decc07bbdc5b482b94b40 100644 (file)
--- 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 b22b87d0a68fd4be77af276fd12a0a1168a85195..7121b11c017f93860ce77ad917a924279fd55835 100644 (file)
--- 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 7c406914c592a422a026a363c00ce2977a7154ad..b374238a59c121d409b369a0c5930a1dccba0f7a 100644 (file)
--- 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 c926db4a5c44b4df5d8a6e99d155ce41bc547c65..6debc2b8a671d48b73c558e8eca0e387475e4f0e 100644 (file)
--- 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 d109d6c01dcfd32463e74e73e0f0fd5bb6cbd22e..70a9cbcbd2f12b694ece103779b9b2f6eb0a1f78 100644 (file)
--- a/util/uri.c
+++ b/util/uri.c
@@ -52,7 +52,6 @@
  */
 
 #include "qemu/osdep.h"
-#include <glib.h>
 
 #include "qemu/uri.h"
 

diff --git a/vl.c b/vl.c
index 2f74fe8fb61fbc3e00db63bfe38f09a39ddc8912..fafc7dff07c489e2a0632239fc11a0db24b2f1da 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -51,7 +51,6 @@ int main(int argc, char **argv)
 #define main qemu_main
 #endif /* CONFIG_COCOA */
 
-#include <glib.h>
 
 #include "qemu/error-report.h"
 #include "qemu/sockets.h"