[Qemu-devel] [PATCH] osdep.h: Include glib-compat.h in osdep.h rather than qemu-common.h

[Qemu-devel] [PATCH] osdep.h: Include glib-compat.h in osdep.h rather than qemu-common.h

[Peter Maydell]

Our use of glib is now pervasive across QEMU. Move the include of glib-compat.h
from qemu-common.h to osdep.h so that it is more widely accessible and doesn't
get forgotten by accident. (Failure to include it will result in build failure
on old versions of glib which is likely to be unnoticed by most developers.)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 include/qemu-common.h | 1 -
 include/qemu/osdep.h  | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/qemu-common.h b/include/qemu-common.h
index 405364f..22b010c 100644
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -22,7 +22,6 @@
 
 #define TFR(expr) do { if ((expr) != -1) break; } while (errno == EINTR)
 
-#include "glib-compat.h"
 #include "qemu/option.h"
 #include "qemu/host-utils.h"
 
diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
index 84e84ac..59a7f8d 100644
--- a/include/qemu/osdep.h
+++ b/include/qemu/osdep.h
@@ -69,6 +69,8 @@
 #include "sysemu/os-posix.h"
 #endif
 
+#include "glib-compat.h"
+
 #include "qapi/error.h"
 
 #if defined(CONFIG_SOLARIS) && CONFIG_SOLARIS_VERSION < 10
-- 
1.9.1

Re: [Qemu-devel] [PATCH] osdep.h: Include glib-compat.h in osdep.h rather than qemu-common.h

[Michael Tokarev]

04.12.2015 20:34, Peter Maydell wrote:
> Our use of glib is now pervasive across QEMU. Move the include of glib-compat.h
> from qemu-common.h to osdep.h so that it is more widely accessible and doesn't
> get forgotten by accident. (Failure to include it will result in build failure
> on old versions of glib which is likely to be unnoticed by most developers.)

Applied to -trivial, thanks!

/mjt