qapi: 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 <[email protected]>
Reviewed-by: Eric Blake <[email protected]>
Message-id: 1454089805[email protected]

diff --git a/qapi/opts-visitor.c b/qapi/opts-visitor.c
index ef5fb8b8152bb01b144b2d55c058a83e13935352..eb7d85b0ec72d12a201b490532115520b86a3308 100644 (file)
--- a/qapi/opts-visitor.c
+++ b/qapi/opts-visitor.c
@@ -10,6 +10,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/opts-visitor.h"

diff --git a/qapi/qapi-dealloc-visitor.c b/qapi/qapi-dealloc-visitor.c
index 737deab9e562abbe7448b6682fcd1f7d215e2468..9340446633c7aa6f2583c4f5951b10124e9c9b25 100644 (file)
--- a/qapi/qapi-dealloc-visitor.c
+++ b/qapi/qapi-dealloc-visitor.c
@@ -11,6 +11,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qapi/dealloc-visitor.h"
 #include "qemu/queue.h"
 #include "qemu-common.h"

diff --git a/qapi/qapi-util.c b/qapi/qapi-util.c
index bcdc94d5a9808f1d031549d1255195c08679ff99..8afb12eb43e97f2c8484115befa50559a32b38f8 100644 (file)
--- a/qapi/qapi-util.c
+++ b/qapi/qapi-util.c
@@ -10,8 +10,8 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
-#include "qapi/error.h"
 #include "qapi/util.h"
 
 int qapi_enum_parse(const char * const lookup[], const char *buf,

diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c
index 6d63e40234ad98b178976d3e4fb00f8deb7b7b3d..8473d3c571b13ea688ff20453b8d1d2f6a1d85ef 100644 (file)
--- a/qapi/qapi-visit-core.c
+++ b/qapi/qapi-visit-core.c
@@ -11,6 +11,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qapi/qmp/qobject.h"
 #include "qapi/qmp/qerror.h"

diff --git a/qapi/qmp-dispatch.c b/qapi/qmp-dispatch.c
index f36933de6499a85b01f866e6739c12a339242b21..8f27c3456d3a39eea271d393b286c51a74b3dcb0 100644 (file)
--- a/qapi/qmp-dispatch.c
+++ b/qapi/qmp-dispatch.c
@@ -11,11 +11,11 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qapi/qmp/types.h"
 #include "qapi/qmp/dispatch.h"
 #include "qapi/qmp/json-parser.h"
 #include "qapi-types.h"
-#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 
 static QDict *qmp_dispatch_check_obj(const QObject *request, Error **errp)

diff --git a/qapi/qmp-event.c b/qapi/qmp-event.c
index c0e435f994866601c96f9b19d9f3414e954ebf9d..8bba165bfb770985df55b67ca46e1f785d8caf3b 100644 (file)
--- a/qapi/qmp-event.c
+++ b/qapi/qmp-event.c
@@ -11,7 +11,7 @@
  *
  */
 
-#include <inttypes.h>
+#include "qemu/osdep.h"
 
 #include "qemu-common.h"
 #include "qapi/qmp-event.h"

diff --git a/qapi/qmp-input-visitor.c b/qapi/qmp-input-visitor.c
index 932b5f3cedd48f581646f26e307c529f0dcf3e47..edb8bd2d68c26de09a9e729f4cd119baaa05e92d 100644 (file)
--- a/qapi/qmp-input-visitor.c
+++ b/qapi/qmp-input-visitor.c
@@ -11,6 +11,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qapi/qmp-input-visitor.h"
 #include "qapi/visitor-impl.h"
 #include "qemu/queue.h"

diff --git a/qapi/qmp-output-visitor.c b/qapi/qmp-output-visitor.c
index 29899acd4637c2fd46ae9478f216f652302684e9..b064fb5a91d09094dbc216153bf2db1e2a483931 100644 (file)
--- a/qapi/qmp-output-visitor.c
+++ b/qapi/qmp-output-visitor.c
@@ -11,6 +11,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qapi/qmp-output-visitor.h"
 #include "qapi/visitor-impl.h"
 #include "qemu/queue.h"

diff --git a/qapi/qmp-registry.c b/qapi/qmp-registry.c
index 3e4498a3f6b88980f3c6194a1f7db501270fa111..4ebfbccd46ff84aeda9cdf02a23e49c502a1ede6 100644 (file)
--- a/qapi/qmp-registry.c
+++ b/qapi/qmp-registry.c
@@ -12,8 +12,8 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
-#include <string.h>
 #include "qapi/qmp/dispatch.h"
 
 static QTAILQ_HEAD(QmpCommandList, QmpCommand) qmp_commands =

diff --git a/qapi/string-input-visitor.c b/qapi/string-input-visitor.c
index dee780a2da3ca0c0126c8ac728f1e14f82cd0a98..8c5ff7e1d2e8ba55197fc80bcd4d20a0ca995b01 100644 (file)
--- a/qapi/string-input-visitor.c
+++ b/qapi/string-input-visitor.c
@@ -10,6 +10,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qapi/string-input-visitor.h"
 #include "qapi/visitor-impl.h"

diff --git a/qapi/string-output-visitor.c b/qapi/string-output-visitor.c
index b86ce2cd0723e121c032dc6ee6736a1f820c9b17..b04cec4cf7a110cd4095ad0785f6f7b3ea366d2c 100644 (file)
--- a/qapi/string-output-visitor.c
+++ b/qapi/string-output-visitor.c
@@ -10,6 +10,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qapi/string-output-visitor.h"
 #include "qapi/visitor-impl.h"