diff options
| -rw-r--r-- | include/block/block.h | 1 | ||||
| -rw-r--r-- | include/qapi/qmp/dispatch.h | 1 | ||||
| -rw-r--r-- | include/qapi/qmp/qjson.h | 1 | ||||
| -rw-r--r-- | include/qapi/qobject-input-visitor.h | 1 | ||||
| -rw-r--r-- | include/qapi/qobject-output-visitor.h | 1 | ||||
| -rw-r--r-- | include/qapi/visitor.h | 2 | ||||
| -rw-r--r-- | qapi/qapi-visit-core.c | 1 | ||||
| -rw-r--r-- | qmp.c | 1 | ||||
| -rw-r--r-- | qobject/qbool.c | 1 | ||||
| -rw-r--r-- | qobject/qdict.c | 1 | ||||
| -rw-r--r-- | qobject/qlist.c | 1 | ||||
| -rw-r--r-- | qobject/qnum.c | 1 | ||||
| -rw-r--r-- | qobject/qstring.c | 1 | ||||
| -rw-r--r-- | qom/object.c | 1 | ||||
| -rw-r--r-- | tests/test-qmp-event.c | 1 |
15 files changed, 1 insertions, 15 deletions
diff --git a/include/block/block.h b/include/block/block.h index c67ea81821..549e4c4618 100644 --- 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 20578dcd48..47a0ff348b 100644 --- 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 6e84082d5f..6b38b0f074 100644 --- 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 daee18c6ac..95985e25e5 100644 --- 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 e5a3490812..2b1726baf5 100644 --- 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 62a51a54cb..ecff296c11 100644 --- 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 3dcb968867..d9a113726f 100644 --- 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" @@ -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 ac825fc5a2..e5a7a53879 100644 --- 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 7e7ac24cf7..88f87d2527 100644 --- 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 268e46c8f0..613a95c12b 100644 --- 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 517610d9da..60c395c1bc 100644 --- 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 74182a1c02..05b4bbc2d6 100644 --- 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 d97f09c1fb..5dcee4683c 100644 --- 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 cad94778c7..e5ee69e9af 100644 --- 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" |