qapi: remove qapi/qapi-types-core.h

The file is only including error.h and qerror.h.  Prefer explicit
inclusion of whatever files are needed.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/qapi/opts-visitor.c b/qapi/opts-visitor.c
index e3fd25446dfe9629193bae4c8cb6a0a14fe91e65..6ccb8a1c338941a2fdecc03049c596e5c8395437 100644 (file)
--- a/qapi/opts-visitor.c
+++ b/qapi/opts-visitor.c
@@ -11,6 +11,7 @@
  */
 
 #include "qemu-common.h"
  */
 
 #include "qemu-common.h"

+#include "qerror.h"

 #include "opts-visitor.h"
 #include "qemu-queue.h"
 #include "qemu-option-internal.h"
 #include "opts-visitor.h"
 #include "qemu-queue.h"
 #include "qemu-option-internal.h"

diff --git a/qapi/qapi-dealloc-visitor.c b/qapi/qapi-dealloc-visitor.c
index 75214e7daaa95b741ae4397ac1b0b16143cb2fdf..7c44042619789d0dfabef9ef95280258612e16aa 100644 (file)
--- a/qapi/qapi-dealloc-visitor.c
+++ b/qapi/qapi-dealloc-visitor.c
@@ -15,6 +15,7 @@
 #include "qemu-queue.h"
 #include "qemu-common.h"
 #include "qemu-objects.h"
 #include "qemu-queue.h"
 #include "qemu-common.h"
 #include "qemu-objects.h"

+#include "qapi-visit-impl.h"

 
 typedef struct StackEntry
 {
 
 typedef struct StackEntry
 {

diff --git a/qapi/qapi-types-core.h b/qapi/qapi-types-core.h
deleted file mode 100644 (file)
index 831df21..0000000
--- a/qapi/qapi-types-core.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Core Definitions for QAPI-generated Types
- *
- * Copyright IBM, Corp. 2011
- *
- * Authors:
- *  Anthony Liguori   <aliguori@us.ibm.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
- * See the COPYING.LIB file in the top-level directory.
- *
- */
-
-#ifndef QAPI_TYPES_CORE_H
-#define QAPI_TYPES_CORE_H
-
-#include "error.h"
-#include "qerror.h"
-
-#endif

diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c
index 300293999d6cb76ee70b84df9c92799f10fc44f6..4649fb71b7af496b38b730cce2bd84fde2d399e5 100644 (file)
--- a/qapi/qapi-visit-core.c
+++ b/qapi/qapi-visit-core.c
@@ -12,6 +12,7 @@
  */
 
 #include "qemu-common.h"
  */
 
 #include "qemu-common.h"

+#include "qerror.h"

 #include "qapi/qapi-visit-core.h"
 #include "qapi/qapi-visit-impl.h"
 
 #include "qapi/qapi-visit-core.h"
 #include "qapi/qapi-visit-impl.h"
 

diff --git a/qapi/qapi-visit-core.h b/qapi/qapi-visit-core.h
index 60acedac77e03f921f15f53fb6c12e8f14f45868..00ce678d0a416345bdc2370046783a2d1cebb683 100644 (file)
--- a/qapi/qapi-visit-core.h
+++ b/qapi/qapi-visit-core.h
@@ -13,7 +13,7 @@
 #ifndef QAPI_VISITOR_CORE_H
 #define QAPI_VISITOR_CORE_H
 
 #ifndef QAPI_VISITOR_CORE_H
 #define QAPI_VISITOR_CORE_H
 

-#include "qapi/qapi-types-core.h"
+#include "error.h"

 #include <stdlib.h>
 
 typedef struct GenericList
 #include <stdlib.h>
 
 typedef struct GenericList

diff --git a/qapi/qapi-visit-impl.h b/qapi/qapi-visit-impl.h
index 0f3a1898fe1e65cab2b9bd6bc2161d92fd1c0b45..efd4271d40971170c86d721e4260824440095d5e 100644 (file)
--- a/qapi/qapi-visit-impl.h
+++ b/qapi/qapi-visit-impl.h
@@ -12,7 +12,7 @@
 #ifndef QAPI_VISITOR_IMPL_H
 #define QAPI_VISITOR_IMPL_H
 
 #ifndef QAPI_VISITOR_IMPL_H
 #define QAPI_VISITOR_IMPL_H
 

-#include "qapi/qapi-types-core.h"
+#include "error.h"

 #include "qapi/qapi-visit-core.h"
 
 void input_type_enum(Visitor *v, int *obj, const char *strings[],
 #include "qapi/qapi-visit-core.h"
 
 void input_type_enum(Visitor *v, int *obj, const char *strings[],

diff --git a/qemu-option-internal.h b/qemu-option-internal.h
index 19fdc1ca8557b2a787fbce75c600c5cb320ca4dd..77899b082df80e9906cdef97dba3468fd24bece3 100644 (file)
--- a/qemu-option-internal.h
+++ b/qemu-option-internal.h
@@ -27,6 +27,7 @@
 #define QEMU_OPTIONS_INTERNAL_H
 
 #include "qemu-option.h"
 #define QEMU_OPTIONS_INTERNAL_H
 
 #include "qemu-option.h"

+#include "qemu-error.h"

 
 struct QemuOpt {
     const char   *name;
 
 struct QemuOpt {
     const char   *name;

diff --git a/qom/object.c b/qom/object.c
index 0739aa29431accdaa8c92e860318eb56452d2260..8d3036dcf448f13d6a32059f0b3b9c55057b2ba8 100644 (file)
--- a/qom/object.c
+++ b/qom/object.c
@@ -15,6 +15,7 @@
 #include "qapi/qapi-visit-core.h"
 #include "qapi/string-input-visitor.h"
 #include "qapi/string-output-visitor.h"
 #include "qapi/qapi-visit-core.h"
 #include "qapi/string-input-visitor.h"
 #include "qapi/string-output-visitor.h"

+#include "qerror.h"

 
 /* TODO: replace QObject with a simpler visitor to avoid a dependency
  * of the QOM core on QObject?  */
 
 /* TODO: replace QObject with a simpler visitor to avoid a dependency
  * of the QOM core on QObject?  */

diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py
index 2db0bf1e5603615da0b1af5c6a0add0c0221f0b4..5d034c2c213233ec1e6a1f0e2921c69136477261 100644 (file)
--- a/scripts/qapi-commands.py
+++ b/scripts/qapi-commands.py
@@ -367,6 +367,8 @@ def gen_command_def_prologue(prefix="", proxy=False):
  */
 
 #include "qemu-common.h"
  */
 
 #include "qemu-common.h"

+#include "module.h"
+#include "qerror.h"

 #include "qemu-objects.h"
 #include "qapi/qmp-core.h"
 #include "qapi/qapi-visit-core.h"
 #include "qemu-objects.h"
 #include "qapi/qmp-core.h"
 #include "qapi/qapi-visit-core.h"

diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 7be3ad82cbb4ae1e6bd074ea5d75325b4f6ae500..e968006ed0cb6f82fec3a811e9f386f183b6da8a 100644 (file)
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -26,6 +26,7 @@
 
 #include "qemu-option.h"
 #include "qemu-config.h"
 
 #include "qemu-option.h"
 #include "qemu-config.h"

+#include "qerror.h"

 
 #include "qapi/qapi-visit-core.h"
 #include "arch_init.h"
 
 #include "qapi/qapi-visit-core.h"
 #include "arch_init.h"