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 /target | |
| 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 'target')
| -rw-r--r-- | target/arm/monitor.c | 3 | ||||
| -rw-r--r-- | target/i386/cpu.c | 4 | ||||
| -rw-r--r-- | target/s390x/cpu.c | 3 | ||||
| -rw-r--r-- | target/s390x/sigp.c | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/target/arm/monitor.c b/target/arm/monitor.c index 299cb80..4cdd267 100644 --- a/target/arm/monitor.c +++ b/target/arm/monitor.c @@ -19,10 +19,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" -#include "qmp-commands.h" #include "hw/boards.h" #include "kvm_arm.h" +#include "qapi/qapi-commands-misc.h" static GICCapability *gic_cap_new(int version) { diff --git a/target/i386/cpu.c b/target/i386/cpu.c index b5e431e..2c04645 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -31,10 +31,10 @@ #include "qemu/option.h" #include "qemu/config-file.h" #include "qapi/error.h" +#include "qapi/qapi-visit-misc.h" +#include "qapi/qapi-visit-run-state.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qerror.h" - -#include "qapi-visit.h" #include "qapi/visitor.h" #include "qom/qom-qobject.h" #include "sysemu/arch_init.h" diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index 627002b..c2b775f 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -35,7 +35,8 @@ #include "qemu/error-report.h" #include "trace.h" #include "qapi/visitor.h" -#include "qapi-visit.h" +#include "qapi/qapi-visit-misc.h" +#include "qapi/qapi-visit-run-state.h" #include "sysemu/hw_accel.h" #include "exec/exec-all.h" #include "hw/qdev-properties.h" diff --git a/target/s390x/sigp.c b/target/s390x/sigp.c index 92b2830..aff1530 100644 --- a/target/s390x/sigp.c +++ b/target/s390x/sigp.c @@ -17,7 +17,7 @@ #include "exec/exec-all.h" #include "sysemu/sysemu.h" #include "trace.h" -#include "qapi-types.h" +#include "qapi/qapi-types-misc.h" QemuMutex qemu_sigp_mutex; |