jcs.org / qemu
qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio
fork atom

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>

Markus Armbruster 5ee9d2fe 15280c36

+1 -15
-1
include/block/block.h
··· 8 8 #include "block/accounting.h" 9 9 #include "block/dirty-bitmap.h" 10 10 #include "block/blockjob.h" 11 - #include "qapi/qmp/qobject.h" 12 11 #include "qemu/hbitmap.h" 13 12 14 13 /* block.c */
-1
include/qapi/qmp/dispatch.h
··· 14 14 #ifndef QAPI_QMP_DISPATCH_H 15 15 #define QAPI_QMP_DISPATCH_H 16 16 17 - #include "qapi/qmp/qobject.h" 18 17 #include "qapi/qmp/qdict.h" 19 18 20 19 typedef void (QmpCommandFunc)(QDict *, QObject **, Error **);
-1
include/qapi/qmp/qjson.h
··· 14 14 #ifndef QJSON_H 15 15 #define QJSON_H 16 16 17 - #include "qapi/qmp/qobject.h" 18 17 #include "qapi/qmp/qstring.h" 19 18 20 19 QObject *qobject_from_json(const char *string, Error **errp);
-1
include/qapi/qobject-input-visitor.h
··· 16 16 #define QOBJECT_INPUT_VISITOR_H 17 17 18 18 #include "qapi/visitor.h" 19 - #include "qapi/qmp/qobject.h" 20 19 21 20 typedef struct QObjectInputVisitor QObjectInputVisitor; 22 21
-1
include/qapi/qobject-output-visitor.h
··· 15 15 #define QOBJECT_OUTPUT_VISITOR_H 16 16 17 17 #include "qapi/visitor.h" 18 - #include "qapi/qmp/qobject.h" 19 18 20 19 typedef struct QObjectOutputVisitor QObjectOutputVisitor; 21 20
+1 -1
include/qapi/visitor.h
··· 15 15 #ifndef QAPI_VISITOR_H 16 16 #define QAPI_VISITOR_H 17 17 18 - #include "qapi/qmp/qobject.h" 18 + #include "qapi-types.h" 19 19 20 20 /* 21 21 * The QAPI schema defines both a set of C data types, and a QMP wire
-1
qapi/qapi-visit-core.c
··· 15 15 #include "qemu/osdep.h" 16 16 #include "qapi/error.h" 17 17 #include "qemu-common.h" 18 - #include "qapi/qmp/qobject.h" 19 18 #include "qapi/qmp/qerror.h" 20 19 #include "qapi/visitor.h" 21 20 #include "qapi/visitor-impl.h"
-1
qmp.c
··· 32 32 #include "qom/qom-qobject.h" 33 33 #include "qapi/error.h" 34 34 #include "qapi/qmp/qerror.h" 35 - #include "qapi/qmp/qobject.h" 36 35 #include "qapi/qobject-input-visitor.h" 37 36 #include "hw/boards.h" 38 37 #include "qom/object_interfaces.h"
-1
qobject/qbool.c
··· 13 13 14 14 #include "qemu/osdep.h" 15 15 #include "qapi/qmp/qbool.h" 16 - #include "qapi/qmp/qobject.h" 17 16 #include "qemu-common.h" 18 17 19 18 /**
-1
qobject/qdict.c
··· 16 16 #include "qapi/qmp/qbool.h" 17 17 #include "qapi/qmp/qnull.h" 18 18 #include "qapi/qmp/qstring.h" 19 - #include "qapi/qmp/qobject.h" 20 19 #include "qapi/error.h" 21 20 #include "qemu/queue.h" 22 21 #include "qemu-common.h"
-1
qobject/qlist.c
··· 15 15 #include "qapi/qmp/qlist.h" 16 16 #include "qapi/qmp/qnull.h" 17 17 #include "qapi/qmp/qnum.h" 18 - #include "qapi/qmp/qobject.h" 19 18 #include "qapi/qmp/qstring.h" 20 19 #include "qemu/queue.h" 21 20 #include "qemu-common.h"
-1
qobject/qnum.c
··· 14 14 15 15 #include "qemu/osdep.h" 16 16 #include "qapi/qmp/qnum.h" 17 - #include "qapi/qmp/qobject.h" 18 17 #include "qemu-common.h" 19 18 20 19 /**
-1
qobject/qstring.c
··· 11 11 */ 12 12 13 13 #include "qemu/osdep.h" 14 - #include "qapi/qmp/qobject.h" 15 14 #include "qapi/qmp/qstring.h" 16 15 #include "qemu-common.h" 17 16
-1
qom/object.c
··· 25 25 /* TODO: replace QObject with a simpler visitor to avoid a dependency 26 26 * of the QOM core on QObject? */ 27 27 #include "qom/qom-qobject.h" 28 - #include "qapi/qmp/qobject.h" 29 28 #include "qapi/qmp/qbool.h" 30 29 #include "qapi/qmp/qnum.h" 31 30 #include "qapi/qmp/qstring.h"
-1
tests/test-qmp-event.c
··· 19 19 #include "qapi/error.h" 20 20 #include "qapi/qmp/qbool.h" 21 21 #include "qapi/qmp/qnum.h" 22 - #include "qapi/qmp/qobject.h" 23 22 #include "qapi/qmp/qstring.h" 24 23 #include "qapi/qmp-event.h" 25 24