From 4167c42c5eb79add9252547efe92df7e5c2d1abd Mon Sep 17 00:00:00 2001
From: Paolo Bonzini
Date: Thu, 6 Dec 2012 11:51:59 +0100
Subject: 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>
---
 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 +-
 6 files changed, 5 insertions(+), 22 deletions(-)
 delete mode 100644 qapi/qapi-types-core.h

(limited to 'qapi')

diff --git a/qapi/opts-visitor.c b/qapi/opts-visitor.c
index e3fd25446d..6ccb8a1c33 100644
--- a/qapi/opts-visitor.c
+++ b/qapi/opts-visitor.c
@@ -11,6 +11,7 @@
  */
 
 #include "qemu-common.h"
+#include "qerror.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 75214e7daa..7c44042619 100644
--- 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 "qapi-visit-impl.h"
 
 typedef struct StackEntry
 {
diff --git a/qapi/qapi-types-core.h b/qapi/qapi-types-core.h
deleted file mode 100644
index 831df21ea7..0000000000
--- 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 300293999d..4649fb71b7 100644
--- a/qapi/qapi-visit-core.c
+++ b/qapi/qapi-visit-core.c
@@ -12,6 +12,7 @@
  */
 
 #include "qemu-common.h"
+#include "qerror.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 60acedac77..00ce678d0a 100644
--- 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
 
-#include "qapi/qapi-types-core.h"
+#include "error.h"
 #include <stdlib.h>
 
 typedef struct GenericList
diff --git a/qapi/qapi-visit-impl.h b/qapi/qapi-visit-impl.h
index 0f3a1898fe..efd4271d40 100644
--- 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
 
-#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[],
-- 
cgit v1.2.3-55-g7522