@@ -11,6 +11,7 @@
*/
#include "qemu-common.h"
+#include "qerror.h"
#include "opts-visitor.h"
#include "qemu-queue.h"
#include "qemu-option-internal.h"
@@ -15,6 +15,7 @@
#include "qemu-queue.h"
#include "qemu-common.h"
#include "qemu-objects.h"
+#include "qapi-visit-impl.h"
typedef struct StackEntry
{
deleted file mode 100644
@@ -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
@@ -12,6 +12,7 @@
*/
#include "qemu-common.h"
+#include "qerror.h"
#include "qapi/qapi-visit-core.h"
#include "qapi/qapi-visit-impl.h"
@@ -13,7 +13,7 @@
#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
@@ -12,7 +12,7 @@
#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[],
@@ -27,6 +27,7 @@
#define QEMU_OPTIONS_INTERNAL_H
#include "qemu-option.h"
+#include "qemu-error.h"
struct QemuOpt {
const char *name;
@@ -15,6 +15,7 @@
#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? */
@@ -367,6 +367,8 @@ def gen_command_def_prologue(prefix="", proxy=False):
*/
#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"
@@ -26,6 +26,7 @@
#include "qemu-option.h"
#include "qemu-config.h"
+#include "qerror.h"
#include "qapi/qapi-visit-core.h"
#include "arch_init.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> --- qapi/opts-visitor.c | 1 + qapi/qapi-dealloc-visitor.c | 1 + qapi/qapi-types-core.h | 20 -------------------- qapi/qapi-visit-core.c | 1 + qapi/qapi-visit-core.h | 2 +- qapi/qapi-visit-impl.h | 2 +- qemu-option-internal.h | 1 + qom/object.c | 1 + scripts/qapi-commands.py | 2 ++ target-i386/cpu.c | 1 + 10 files changed, 10 insertions(+), 22 deletions(-) delete mode 100644 qapi/qapi-types-core.h