qapi: move inclusions of qemu-common.h from headers to .c files

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
freemyipod · Dec 19, 2012 · 79ee7df · 79ee7df
1 parent 28ecbae
commit 79ee7df
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 1 deletion.
diff --git a/qapi/opts-visitor.c b/qapi/opts-visitor.c
@@ -10,6 +10,7 @@
  *
  */
 
+#include "qemu-common.h"
 #include "opts-visitor.h"
 #include "qemu-queue.h"
 #include "qemu-option-internal.h"

diff --git a/qapi/qapi-types-core.h b/qapi/qapi-types-core.h
@@ -14,7 +14,6 @@
 #ifndef QAPI_TYPES_CORE_H
 #define QAPI_TYPES_CORE_H
 
-#include "qemu-common.h"
 #include "error.h"
 #include "qerror.h"
 

diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c
@@ -11,6 +11,7 @@
  *
  */
 
+#include "qemu-common.h"
 #include "qapi/qapi-visit-core.h"
 #include "qapi/qapi-visit-impl.h"
 

diff --git a/qemu-error.h b/qemu-error.h
@@ -13,6 +13,8 @@
 #ifndef QEMU_ERROR_H
 #define QEMU_ERROR_H
 
+#include <stdarg.h>
+
 typedef struct Location {
     /* all members are private to qemu-error.c */
     enum { LOC_NONE, LOC_CMDLINE, LOC_FILE } kind;

diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py
@@ -366,6 +366,7 @@ def gen_command_def_prologue(prefix="", proxy=False):
  *
  */
 
+#include "qemu-common.h"
 #include "qemu-objects.h"
 #include "qapi/qmp-core.h"
 #include "qapi/qapi-visit-core.h"

diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py
@@ -298,6 +298,7 @@ def maybe_open(really, name, opt):
  *
  */
 
+#include "qemu-common.h"
 #include "%(header)s"
 ''',
                  header=basename(h_file)))

diff --git a/tests/test-qmp-commands.c b/tests/test-qmp-commands.c
@@ -1,4 +1,5 @@
 #include <glib.h>
+#include "qemu-common.h"
 #include "qemu-objects.h"
 #include "test-qmp-commands.h"
 #include "qapi/qmp-core.h"

diff --git a/tests/test-qmp-input-strict.c b/tests/test-qmp-input-strict.c
@@ -14,6 +14,7 @@
 #include <glib.h>
 #include <stdarg.h>
 
+#include "qemu-common.h"
 #include "qapi/qmp-input-visitor.h"
 #include "test-qapi-types.h"
 #include "test-qapi-visit.h"

diff --git a/tests/test-qmp-input-visitor.c b/tests/test-qmp-input-visitor.c
@@ -13,6 +13,7 @@
 #include <glib.h>
 #include <stdarg.h>
 
+#include "qemu-common.h"
 #include "qapi/qmp-input-visitor.h"
 #include "test-qapi-types.h"
 #include "test-qapi-visit.h"

diff --git a/tests/test-qmp-output-visitor.c b/tests/test-qmp-output-visitor.c
@@ -12,6 +12,7 @@
 
 #include <glib.h>
 
+#include "qemu-common.h"
 #include "qapi/qmp-output-visitor.h"
 #include "test-qapi-types.h"
 #include "test-qapi-visit.h"

diff --git a/tests/test-string-input-visitor.c b/tests/test-string-input-visitor.c
@@ -13,6 +13,7 @@
 #include <glib.h>
 #include <stdarg.h>
 
+#include "qemu-common.h"
 #include "qapi/string-input-visitor.h"
 #include "test-qapi-types.h"
 #include "test-qapi-visit.h"

diff --git a/tests/test-string-output-visitor.c b/tests/test-string-output-visitor.c
@@ -12,6 +12,7 @@
 
 #include <glib.h>
 
+#include "qemu-common.h"
 #include "qapi/string-output-visitor.h"
 #include "test-qapi-types.h"
 #include "test-qapi-visit.h"

diff --git a/tests/test-visitor-serialization.c b/tests/test-visitor-serialization.c
@@ -14,6 +14,8 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include <float.h>
+
+#include "qemu-common.h"
 #include "test-qapi-types.h"
 #include "test-qapi-visit.h"
 #include "qemu-objects.h"
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,6 +11,7 @@ @@
      *
      */
+    #include "qemu-common.h"
     #include "qapi/qapi-visit-core.h"
     #include "qapi/qapi-visit-impl.h"
@@ Expand Down @@