diff options
| author | Markus Armbruster <armbru@redhat.com> | 2018-02-01 12:18:35 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2018-02-09 13:52:15 +0100 |
| commit | 6b67395762a4c8b6ca94364e0a0f616a6470c46a (patch) | |
| tree | 6ca3237d7c98a02499507f9c3c01ed09a764be7c /qobject | |
| parent | 9f5c734d591e26186a71f9e36d752f4798df3672 (diff) | |
Eliminate qapi/qmp/types.h
qapi/qmp/types.h is a convenience header to include a number of
qapi/qmp/ headers. Since we rarely need all of the headers
qapi/qmp/types.h includes, we bypass it most of the time. Most of the
places that use it don't need all the headers, either.
Include the necessary headers directly, and drop qapi/qmp/types.h.
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-9-armbru@redhat.com>
Diffstat (limited to 'qobject')
| -rw-r--r-- | qobject/json-parser.c | 3 | ||||
| -rw-r--r-- | qobject/qjson.c | 2 | ||||
| -rw-r--r-- | qobject/qlit.c | 4 | ||||
| -rw-r--r-- | qobject/qobject.c | 4 |
4 files changed, 9 insertions, 4 deletions
diff --git a/qobject/json-parser.c b/qobject/json-parser.c index 724ca240e4..30dfb9dc41 100644 --- a/qobject/json-parser.c +++ b/qobject/json-parser.c @@ -15,7 +15,8 @@ #include "qemu/cutils.h" #include "qapi/error.h" #include "qemu-common.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qbool.h" +#include "qapi/qmp/qstring.h" #include "qapi/qmp/json-parser.h" #include "qapi/qmp/json-lexer.h" #include "qapi/qmp/json-streamer.h" diff --git a/qobject/qjson.c b/qobject/qjson.c index 2e0930884e..fe89213247 100644 --- a/qobject/qjson.c +++ b/qobject/qjson.c @@ -17,7 +17,7 @@ #include "qapi/qmp/json-parser.h" #include "qapi/qmp/json-streamer.h" #include "qapi/qmp/qjson.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qbool.h" #include "qemu/unicode.h" typedef struct JSONParsingState diff --git a/qobject/qlit.c b/qobject/qlit.c index 3c4882c784..dbf19225c8 100644 --- a/qobject/qlit.c +++ b/qobject/qlit.c @@ -16,7 +16,9 @@ #include "qemu/osdep.h" #include "qapi/qmp/qlit.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qbool.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qstring.h" static bool qlit_equal_qdict(const QLitObject *lhs, const QDict *qdict) { diff --git a/qobject/qobject.c b/qobject/qobject.c index b2a536041d..9b61ece06b 100644 --- a/qobject/qobject.c +++ b/qobject/qobject.c @@ -9,7 +9,9 @@ #include "qemu/osdep.h" #include "qemu-common.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qbool.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qstring.h" static void (*qdestroy[QTYPE__MAX])(QObject *) = { [QTYPE_NONE] = NULL, /* No such object exists */ |