Include qapi/qmp/qobject.h exactly where needed

Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20180201111846.21846-11-armbru@redhat.com>

diff --git a/include/block/block.h b/include/block/block.h
index c67ea818215d42a1032d1c8009f2f613ca20c917..549e4c46183039e934c4d0bfabc7b343681d3072 100644 (file)
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -8,7 +8,6 @@
 #include "block/accounting.h"
 #include "block/dirty-bitmap.h"
 #include "block/blockjob.h"
-#include "qapi/qmp/qobject.h"
 #include "qemu/hbitmap.h"
 
 /* block.c */

diff --git a/include/qapi/qmp/dispatch.h b/include/qapi/qmp/dispatch.h
index 20578dcd48a0d378627eca9625a7a61f38d755bb..47a0ff348bb934957a48e06455961369935188d8 100644 (file)
--- a/include/qapi/qmp/dispatch.h
+++ b/include/qapi/qmp/dispatch.h
@@ -14,7 +14,6 @@
 #ifndef QAPI_QMP_DISPATCH_H
 #define QAPI_QMP_DISPATCH_H
 
-#include "qapi/qmp/qobject.h"
 #include "qapi/qmp/qdict.h"
 
 typedef void (QmpCommandFunc)(QDict *, QObject **, Error **);

diff --git a/include/qapi/qmp/qjson.h b/include/qapi/qmp/qjson.h
index 6e84082d5f1d55900c6ab622a4e0e441029bfa6a..6b38b0f07406e7d37a079afa337cb8748847c469 100644 (file)
--- a/include/qapi/qmp/qjson.h
+++ b/include/qapi/qmp/qjson.h
@@ -14,7 +14,6 @@
 #ifndef QJSON_H
 #define QJSON_H
 
-#include "qapi/qmp/qobject.h"
 #include "qapi/qmp/qstring.h"
 
 QObject *qobject_from_json(const char *string, Error **errp);

diff --git a/include/qapi/qobject-input-visitor.h b/include/qapi/qobject-input-visitor.h
index daee18c6ac10d956931edeb14320c7d04f168236..95985e25e521fcb5759fb985c9aaa2bbceaf0a28 100644 (file)
--- a/include/qapi/qobject-input-visitor.h
+++ b/include/qapi/qobject-input-visitor.h
@@ -16,7 +16,6 @@
 #define QOBJECT_INPUT_VISITOR_H
 
 #include "qapi/visitor.h"
-#include "qapi/qmp/qobject.h"
 
 typedef struct QObjectInputVisitor QObjectInputVisitor;
 

diff --git a/include/qapi/qobject-output-visitor.h b/include/qapi/qobject-output-visitor.h
index e5a349081256120ff5a238ebe564164e12649e82..2b1726baf5526b97663d0b04a512e2fa1dc50b6a 100644 (file)
--- a/include/qapi/qobject-output-visitor.h
+++ b/include/qapi/qobject-output-visitor.h
@@ -15,7 +15,6 @@
 #define QOBJECT_OUTPUT_VISITOR_H
 
 #include "qapi/visitor.h"
-#include "qapi/qmp/qobject.h"
 
 typedef struct QObjectOutputVisitor QObjectOutputVisitor;
 

diff --git a/include/qapi/visitor.h b/include/qapi/visitor.h
index 62a51a54cb3c9af50536db1079abba2582a28659..ecff296c11a0f8014e451aa68e1a219c2d18de3f 100644 (file)
--- a/include/qapi/visitor.h
+++ b/include/qapi/visitor.h
@@ -15,7 +15,7 @@
 #ifndef QAPI_VISITOR_H
 #define QAPI_VISITOR_H
 
-#include "qapi/qmp/qobject.h"
+#include "qapi-types.h"
 
 /*
  * The QAPI schema defines both a set of C data types, and a QMP wire

diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c
index 3dcb9688674d84dadd77fa28b3edad9baebf0ae9..d9a113726f740e60b228820ff0b96f504d615688 100644 (file)
--- a/qapi/qapi-visit-core.c
+++ b/qapi/qapi-visit-core.c
@@ -15,7 +15,6 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu-common.h"
-#include "qapi/qmp/qobject.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/visitor.h"
 #include "qapi/visitor-impl.h"

diff --git a/qmp.c b/qmp.c
index a56faf1b9ac2a89c6913bbc96c729a9dfc208276..f87de2bc26a81051c3c9a3a7feb41fc08693b47a 100644 (file)
--- a/qmp.c
+++ b/qmp.c
@@ -32,7 +32,6 @@
 #include "qom/qom-qobject.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
-#include "qapi/qmp/qobject.h"
 #include "qapi/qobject-input-visitor.h"
 #include "hw/boards.h"
 #include "qom/object_interfaces.h"

diff --git a/qobject/qbool.c b/qobject/qbool.c
index ac825fc5a2e65cffa19bdb7a9f525a21e4626d2c..e5a7a538793277dc8bcf9a53dc79becafa88e08d 100644 (file)
--- a/qobject/qbool.c
+++ b/qobject/qbool.c
@@ -13,7 +13,6 @@
 
 #include "qemu/osdep.h"
 #include "qapi/qmp/qbool.h"
-#include "qapi/qmp/qobject.h"
 #include "qemu-common.h"
 
 /**

diff --git a/qobject/qdict.c b/qobject/qdict.c
index 7e7ac24cf7e8eb046f1fc56efad30a4ca87900d0..88f87d25272b8a3783068a1591f5aedf3349419e 100644 (file)
--- a/qobject/qdict.c
+++ b/qobject/qdict.c
@@ -16,7 +16,6 @@
 #include "qapi/qmp/qbool.h"
 #include "qapi/qmp/qnull.h"
 #include "qapi/qmp/qstring.h"
-#include "qapi/qmp/qobject.h"
 #include "qapi/error.h"
 #include "qemu/queue.h"
 #include "qemu-common.h"

diff --git a/qobject/qlist.c b/qobject/qlist.c
index 268e46c8f09ff1a9bb9084baf6af15626d3ff34e..613a95c12b931b3bdcec5b2d2506634ef4df8c93 100644 (file)
--- a/qobject/qlist.c
+++ b/qobject/qlist.c
@@ -15,7 +15,6 @@
 #include "qapi/qmp/qlist.h"
 #include "qapi/qmp/qnull.h"
 #include "qapi/qmp/qnum.h"
-#include "qapi/qmp/qobject.h"
 #include "qapi/qmp/qstring.h"
 #include "qemu/queue.h"
 #include "qemu-common.h"

diff --git a/qobject/qnum.c b/qobject/qnum.c
index 517610d9da94069f469c2e124b38e40841a75ee9..60c395c1bce8a8fc17d3d9fa7c593a1f8a727bb2 100644 (file)
--- a/qobject/qnum.c
+++ b/qobject/qnum.c
@@ -14,7 +14,6 @@
 
 #include "qemu/osdep.h"
 #include "qapi/qmp/qnum.h"
-#include "qapi/qmp/qobject.h"
 #include "qemu-common.h"
 
 /**

diff --git a/qobject/qstring.c b/qobject/qstring.c
index 74182a1c029a9fa8747366ec069fc76497392df2..05b4bbc2d628d2afeab58c5871ee7ba8e8099048 100644 (file)
--- a/qobject/qstring.c
+++ b/qobject/qstring.c
@@ -11,7 +11,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "qapi/qmp/qobject.h"
 #include "qapi/qmp/qstring.h"
 #include "qemu-common.h"
 

diff --git a/qom/object.c b/qom/object.c
index d97f09c1fb5f2567c7659dbe726fd50b67ff8e8a..5dcee4683ce4eab5a5daefe6fff62ad2d0f2cbda 100644 (file)
--- a/qom/object.c
+++ b/qom/object.c
@@ -25,7 +25,6 @@
 /* TODO: replace QObject with a simpler visitor to avoid a dependency
  * of the QOM core on QObject?  */
 #include "qom/qom-qobject.h"
-#include "qapi/qmp/qobject.h"
 #include "qapi/qmp/qbool.h"
 #include "qapi/qmp/qnum.h"
 #include "qapi/qmp/qstring.h"

diff --git a/tests/test-qmp-event.c b/tests/test-qmp-event.c
index cad94778c7b56c25e47d17a140e3c0b9a04e9992..e5ee69e9af9fe3fa5adc4930ba134cc060a52c95 100644 (file)
--- a/tests/test-qmp-event.c
+++ b/tests/test-qmp-event.c
@@ -19,7 +19,6 @@
 #include "qapi/error.h"
 #include "qapi/qmp/qbool.h"
 #include "qapi/qmp/qnum.h"
-#include "qapi/qmp/qobject.h"
 #include "qapi/qmp/qstring.h"
 #include "qapi/qmp-event.h"