diff options
| author | Eric Blake <eblake@redhat.com> | 2016-06-09 10:48:32 -0600 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2016-07-06 10:52:03 +0200 |
| commit | c7eb39cbd4304ca55c760c0cb33ce235c457546c (patch) | |
| tree | 4ef8b8a39c2c66db3409c0fe9d9565700cb557c6 /tests | |
| parent | 791b7d2340cfafcac9af7864343cf23504d57804 (diff) | |
| download | qemu-c7eb39cbd4304ca55c760c0cb33ce235c457546c.tar.gz | |
qapi: Improve use of qmp/types.h
'qjson.h' is not a QObject subtype; include this file directly in
.c files that are using it, rather than abusing qmp/types.h for
that purpose.
Meanwhile, for files that include a list of individual QObject
subtypes, it's easier to just use qmp/types.h for that purpose.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1465490926-28625-2-git-send-email-eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/check-qjson.c | 8 | ||||
| -rw-r--r-- | tests/test-qmp-input-strict.c | 1 | ||||
| -rw-r--r-- | tests/test-qmp-input-visitor.c | 1 | ||||
| -rw-r--r-- | tests/test-qmp-output-visitor.c | 1 | ||||
| -rw-r--r-- | tests/test-visitor-serialization.c | 1 |
5 files changed, 5 insertions, 7 deletions
diff --git a/tests/check-qjson.c b/tests/check-qjson.c index 0e158f6eac..85955744eb 100644 --- a/tests/check-qjson.c +++ b/tests/check-qjson.c @@ -12,14 +12,8 @@ */ #include "qemu/osdep.h" -#include "qapi/qmp/qstring.h" -#include "qapi/qmp/qint.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qlist.h" -#include "qapi/qmp/qfloat.h" -#include "qapi/qmp/qbool.h" +#include "qapi/qmp/types.h" #include "qapi/qmp/qjson.h" - #include "qemu-common.h" static void escaped_string(void) diff --git a/tests/test-qmp-input-strict.c b/tests/test-qmp-input-strict.c index d5f57c583a..79739e9808 100644 --- a/tests/test-qmp-input-strict.c +++ b/tests/test-qmp-input-strict.c @@ -19,6 +19,7 @@ #include "test-qapi-types.h" #include "test-qapi-visit.h" #include "qapi/qmp/types.h" +#include "qapi/qmp/qjson.h" #include "test-qmp-introspect.h" #include "qmp-introspect.h" #include "qapi-visit.h" diff --git a/tests/test-qmp-input-visitor.c b/tests/test-qmp-input-visitor.c index 1a4585c553..17cda5ad63 100644 --- a/tests/test-qmp-input-visitor.c +++ b/tests/test-qmp-input-visitor.c @@ -18,6 +18,7 @@ #include "test-qapi-types.h" #include "test-qapi-visit.h" #include "qapi/qmp/types.h" +#include "qapi/qmp/qjson.h" typedef struct TestInputVisitorData { QObject *obj; diff --git a/tests/test-qmp-output-visitor.c b/tests/test-qmp-output-visitor.c index f8a7a271a9..e030c67fb4 100644 --- a/tests/test-qmp-output-visitor.c +++ b/tests/test-qmp-output-visitor.c @@ -18,6 +18,7 @@ #include "test-qapi-types.h" #include "test-qapi-visit.h" #include "qapi/qmp/types.h" +#include "qapi/qmp/qjson.h" typedef struct TestOutputVisitorData { QmpOutputVisitor *qov; diff --git a/tests/test-visitor-serialization.c b/tests/test-visitor-serialization.c index 777469f114..db781c0a79 100644 --- a/tests/test-visitor-serialization.c +++ b/tests/test-visitor-serialization.c @@ -19,6 +19,7 @@ #include "test-qapi-visit.h" #include "qapi/error.h" #include "qapi/qmp/types.h" +#include "qapi/qmp/qjson.h" #include "qapi/qmp-input-visitor.h" #include "qapi/qmp-output-visitor.h" #include "qapi/string-input-visitor.h" |