qobject: Clean up includes

Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.

This commit was created with scripts/clean-includes.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 1454089805-5470-12-git-send-email-peter.maydell@linaro.org

diff --git a/qobject/json-lexer.c b/qobject/json-lexer.c
index 92798ae3a4d8d633302f670d9dcee0b381618d4c..496374d9ab95546cd260e731b7d1a3a48f835add 100644 (file)
--- a/qobject/json-lexer.c
+++ b/qobject/json-lexer.c
@@ -11,9 +11,9 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qapi/qmp/json-lexer.h"
-#include <stdint.h>
 
 #define MAX_TOKEN_SIZE (64ULL << 20)
 

diff --git a/qobject/json-parser.c b/qobject/json-parser.c
index 3c5d35d7b01d942e0e0ea4fc37631c84d187c6ae..77c9382c5e277ec164ca91482c49ce6ec67a0dc0 100644 (file)
--- a/qobject/json-parser.c
+++ b/qobject/json-parser.c
@@ -11,7 +11,7 @@
  *
  */
 
-#include <stdarg.h>
+#include "qemu/osdep.h"
 
 #include "qemu-common.h"
 #include "qapi/qmp/qstring.h"

diff --git a/qobject/json-streamer.c b/qobject/json-streamer.c
index a4db4b832e0898c15f49952cfc0409dce4d5e392..02516853a13d50a1287af5e48d7774f80e945d19 100644 (file)
--- a/qobject/json-streamer.c
+++ b/qobject/json-streamer.c
@@ -11,6 +11,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qapi/qmp/json-lexer.h"
 #include "qapi/qmp/json-streamer.h"

diff --git a/qobject/qbool.c b/qobject/qbool.c
index 856c7433577041982950b6ca14cbbefed9b42696..0606bbd2a337e4b202669e02c7d0967b9d3f4f50 100644 (file)
--- a/qobject/qbool.c
+++ b/qobject/qbool.c
@@ -11,6 +11,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qapi/qmp/qbool.h"
 #include "qapi/qmp/qobject.h"
 #include "qemu-common.h"

diff --git a/qobject/qdict.c b/qobject/qdict.c
index 19df837c552d0cc668a5f0e51af1907b9896a432..9833bd0730b201e475e94ac9689e0bf3c44e3366 100644 (file)
--- a/qobject/qdict.c
+++ b/qobject/qdict.c
@@ -10,6 +10,7 @@
  * See the COPYING.LIB file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "qapi/qmp/qint.h"
 #include "qapi/qmp/qfloat.h"
 #include "qapi/qmp/qdict.h"

diff --git a/qobject/qfloat.c b/qobject/qfloat.c
index 87d89a772122eeed4cafb5f6f7899f44a8fffdfd..d5da847701d269d2922f3aae23e62e911ed667ca 100644 (file)
--- a/qobject/qfloat.c
+++ b/qobject/qfloat.c
@@ -11,6 +11,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qapi/qmp/qfloat.h"
 #include "qapi/qmp/qobject.h"
 #include "qemu-common.h"

diff --git a/qobject/qint.c b/qobject/qint.c
index 7cba9adf40c0b85570ec89f5c07e78e2d65db5f3..d7d1b3021fa39778130412e51dd52c07bf9a8614 100644 (file)
--- a/qobject/qint.c
+++ b/qobject/qint.c
@@ -10,6 +10,7 @@
  * See the COPYING.LIB file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "qapi/qmp/qint.h"
 #include "qapi/qmp/qobject.h"
 #include "qemu-common.h"

diff --git a/qobject/qjson.c b/qobject/qjson.c
index a3e6a7ca422680874a967baae60823960784b879..b8cc4ca9641aa2ea37365769c591b91dd980f894 100644 (file)
--- a/qobject/qjson.c
+++ b/qobject/qjson.c
@@ -11,6 +11,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qapi/qmp/json-lexer.h"
 #include "qapi/qmp/json-parser.h"
 #include "qapi/qmp/json-streamer.h"

diff --git a/qobject/qlist.c b/qobject/qlist.c
index 3c045aed11e95b3b4af9662b34c5e38c1b572cd7..1ec74de2b39434fef249bb18a8f8c8015c2bb558 100644 (file)
--- a/qobject/qlist.c
+++ b/qobject/qlist.c
@@ -10,6 +10,7 @@
  * See the COPYING.LIB file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "qapi/qmp/qlist.h"
 #include "qapi/qmp/qobject.h"
 #include "qemu/queue.h"

diff --git a/qobject/qnull.c b/qobject/qnull.c
index 5f7ba4d01a9dafef9ce5f93a0c9561ffffaa4ab7..c124d0585eb9edcc8e63b32dde5189e0613d0edd 100644 (file)
--- a/qobject/qnull.c
+++ b/qobject/qnull.c
@@ -10,6 +10,7 @@
  * or later.  See the COPYING.LIB file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qapi/qmp/qobject.h"
 

diff --git a/qobject/qobject.c b/qobject/qobject.c
index a3ef14eb55a158083e95d87a3f24eb4f50e574b4..cd41fb940b9b4469acee01bb72d19a16ac8b4da7 100644 (file)
--- a/qobject/qobject.c
+++ b/qobject/qobject.c
@@ -7,6 +7,7 @@
  * or later.  See the COPYING.LIB file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qapi/qmp/qbool.h"
 #include "qapi/qmp/qdict.h"

diff --git a/qobject/qstring.c b/qobject/qstring.c
index f44c5c424d1ed9cbb0b343b0647a74ea991f24f0..5da7b5f37c3a1ef4ed077f0adc641a1090019724 100644 (file)
--- a/qobject/qstring.c
+++ b/qobject/qstring.c
@@ -10,6 +10,7 @@
  * See the COPYING.LIB file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "qapi/qmp/qobject.h"
 #include "qapi/qmp/qstring.h"
 #include "qemu-common.h"