diff options
| author | Markus Armbruster <armbru@redhat.com> | 2018-02-26 17:13:27 -0600 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2018-03-02 13:45:50 -0600 |
| commit | 112ed241f5d9a411dbca92bdf597151cb853c6a7 (patch) | |
| tree | c32080433ead621e19d74a981be144a916a02f33 /tests | |
| parent | 9af2398977a78d37bf184d6ff6bd04c72bfbf006 (diff) | |
| download | qemu-112ed241f5d9a411dbca92bdf597151cb853c6a7.zip qemu-112ed241f5d9a411dbca92bdf597151cb853c6a7.tar.gz qemu-112ed241f5d9a411dbca92bdf597151cb853c6a7.tar.bz2 | |
qapi: Empty out qapi-schema.json
The previous commit improved compile time by including less of the
generated QAPI headers. This is impossible for stuff defined directly
in qapi-schema.json, because that ends up in headers that that pull in
everything.
Move everything but include directives from qapi-schema.json to new
sub-module qapi/misc.json, then include just the "misc" shard where
possible.
It's possible everywhere, except:
* monitor.c needs qmp-command.h to get qmp_init_marshal()
* monitor.c, ui/vnc.c and the generated qapi-event-FOO.c need
qapi-event.h to get enum QAPIEvent
Perhaps we'll get rid of those some other day.
Adding a type to qapi/migration.json now recompiles some 120 instead
of 2300 out of 5100 objects.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20180211093607.27351-25-armbru@redhat.com>
[eblake: rebase to master]
Signed-off-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/qmp-test.c | 3 | ||||
| -rw-r--r-- | tests/test-qobject-input-visitor.c | 2 | ||||
| -rw-r--r-- | tests/test-visitor-serialization.c | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/qmp-test.c b/tests/qmp-test.c index 5808483..22445d9 100644 --- a/tests/qmp-test.c +++ b/tests/qmp-test.c @@ -12,8 +12,9 @@ #include "qemu/osdep.h" #include "libqtest.h" -#include "qapi-visit.h" #include "qapi/error.h" +#include "qapi/qapi-visit-introspect.h" +#include "qapi/qapi-visit-misc.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qlist.h" #include "qapi/qobject-input-visitor.h" diff --git a/tests/test-qobject-input-visitor.c b/tests/test-qobject-input-visitor.c index 3900be2..d3a56bd 100644 --- a/tests/test-qobject-input-visitor.c +++ b/tests/test-qobject-input-visitor.c @@ -15,6 +15,7 @@ #include "qemu-common.h" #include "qapi/error.h" +#include "qapi/qapi-visit-introspect.h" #include "qapi/qobject-input-visitor.h" #include "test-qapi-visit.h" #include "qapi/qmp/qbool.h" @@ -25,7 +26,6 @@ #include "qapi/qmp/qjson.h" #include "test-qmp-introspect.h" #include "qmp-introspect.h" -#include "qapi-visit.h" typedef struct TestInputVisitorData { QObject *obj; diff --git a/tests/test-visitor-serialization.c b/tests/test-visitor-serialization.c index dd7e51d..438c18a 100644 --- a/tests/test-visitor-serialization.c +++ b/tests/test-visitor-serialization.c @@ -23,7 +23,6 @@ #include "qapi/qobject-output-visitor.h" #include "qapi/string-input-visitor.h" #include "qapi/string-output-visitor.h" -#include "qapi-visit.h" #include "qapi/dealloc-visitor.h" enum PrimitiveTypeKind { |