Commit 112ed241 authored by Markus Armbruster's avatar Markus Armbruster Committed by Eric Blake
Browse files

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: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <20180211093607.27351-25-armbru@redhat.com>
[eblake: rebase to master]
Signed-off-by: default avatarEric Blake <eblake@redhat.com>
parent 9af23989

.gitignore

+4 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
/qapi/qapi-commands-crypto.[ch]

/qapi/qapi-commands-introspect.[ch]

/qapi/qapi-commands-migration.[ch]

/qapi/qapi-commands-misc.[ch]

/qapi/qapi-commands-net.[ch]

/qapi/qapi-commands-rocker.[ch]

/qapi/qapi-commands-run-state.[ch]
@@ -53,6 +54,7 @@ 
/qapi/qapi-events-crypto.[ch]

/qapi/qapi-events-introspect.[ch]

/qapi/qapi-events-migration.[ch]

/qapi/qapi-events-misc.[ch]

/qapi/qapi-events-net.[ch]

/qapi/qapi-events-rocker.[ch]

/qapi/qapi-events-run-state.[ch]
@@ -68,6 +70,7 @@ 
/qapi/qapi-types-crypto.[ch]

/qapi/qapi-types-introspect.[ch]

/qapi/qapi-types-migration.[ch]

/qapi/qapi-types-misc.[ch]

/qapi/qapi-types-net.[ch]

/qapi/qapi-types-rocker.[ch]

/qapi/qapi-types-run-state.[ch]
@@ -84,6 +87,7 @@ 
/qapi/qapi-visit-crypto.[ch]

/qapi/qapi-visit-introspect.[ch]

/qapi/qapi-visit-migration.[ch]

/qapi/qapi-visit-misc.[ch]

/qapi/qapi-visit-net.[ch]

/qapi/qapi-visit-rocker.[ch]

/qapi/qapi-visit-run-state.[ch]

Makefile

+9 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ GENERATED_FILES += qapi/qapi-types-common.h qapi/qapi-types-common.c 
GENERATED_FILES += qapi/qapi-types-crypto.h qapi/qapi-types-crypto.c

GENERATED_FILES += qapi/qapi-types-introspect.h qapi/qapi-types-introspect.c

GENERATED_FILES += qapi/qapi-types-migration.h qapi/qapi-types-migration.c

GENERATED_FILES += qapi/qapi-types-misc.h qapi/qapi-types-misc.c

GENERATED_FILES += qapi/qapi-types-net.h qapi/qapi-types-net.c

GENERATED_FILES += qapi/qapi-types-rocker.h qapi/qapi-types-rocker.c

GENERATED_FILES += qapi/qapi-types-run-state.h qapi/qapi-types-run-state.c
@@ -116,6 +117,7 @@ GENERATED_FILES += qapi/qapi-visit-common.h qapi/qapi-visit-common.c 
GENERATED_FILES += qapi/qapi-visit-crypto.h qapi/qapi-visit-crypto.c

GENERATED_FILES += qapi/qapi-visit-introspect.h qapi/qapi-visit-introspect.c

GENERATED_FILES += qapi/qapi-visit-migration.h qapi/qapi-visit-migration.c

GENERATED_FILES += qapi/qapi-visit-misc.h qapi/qapi-visit-misc.c

GENERATED_FILES += qapi/qapi-visit-net.h qapi/qapi-visit-net.c

GENERATED_FILES += qapi/qapi-visit-rocker.h qapi/qapi-visit-rocker.c

GENERATED_FILES += qapi/qapi-visit-run-state.h qapi/qapi-visit-run-state.c
@@ -132,6 +134,7 @@ GENERATED_FILES += qapi/qapi-commands-common.h qapi/qapi-commands-common.c 
GENERATED_FILES += qapi/qapi-commands-crypto.h qapi/qapi-commands-crypto.c

GENERATED_FILES += qapi/qapi-commands-introspect.h qapi/qapi-commands-introspect.c

GENERATED_FILES += qapi/qapi-commands-migration.h qapi/qapi-commands-migration.c

GENERATED_FILES += qapi/qapi-commands-misc.h qapi/qapi-commands-misc.c

GENERATED_FILES += qapi/qapi-commands-net.h qapi/qapi-commands-net.c

GENERATED_FILES += qapi/qapi-commands-rocker.h qapi/qapi-commands-rocker.c

GENERATED_FILES += qapi/qapi-commands-run-state.h qapi/qapi-commands-run-state.c
@@ -148,6 +151,7 @@ GENERATED_FILES += qapi/qapi-events-common.h qapi/qapi-events-common.c 
GENERATED_FILES += qapi/qapi-events-crypto.h qapi/qapi-events-crypto.c

GENERATED_FILES += qapi/qapi-events-introspect.h qapi/qapi-events-introspect.c

GENERATED_FILES += qapi/qapi-events-migration.h qapi/qapi-events-migration.c

GENERATED_FILES += qapi/qapi-events-misc.h qapi/qapi-events-misc.c

GENERATED_FILES += qapi/qapi-events-net.h qapi/qapi-events-net.c

GENERATED_FILES += qapi/qapi-events-rocker.h qapi/qapi-events-rocker.c

GENERATED_FILES += qapi/qapi-events-run-state.h qapi/qapi-events-run-state.c
@@ -573,6 +577,7 @@ qapi-modules = $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/qapi/common.json \ 
               $(SRC_PATH)/qapi/crypto.json \

               $(SRC_PATH)/qapi/introspect.json \

               $(SRC_PATH)/qapi/migration.json \

               $(SRC_PATH)/qapi/misc.json \

               $(SRC_PATH)/qapi/net.json \

               $(SRC_PATH)/qapi/rocker.json \

               $(SRC_PATH)/qapi/run-state.json \
@@ -591,6 +596,7 @@ qapi/qapi-types-common.c qapi/qapi-types-common.h \ 
qapi/qapi-types-crypto.c qapi/qapi-types-crypto.h \

qapi/qapi-types-introspect.c qapi/qapi-types-introspect.h \

qapi/qapi-types-migration.c qapi/qapi-types-migration.h \

qapi/qapi-types-misc.c qapi/qapi-types-misc.h \

qapi/qapi-types-net.c qapi/qapi-types-net.h \

qapi/qapi-types-rocker.c qapi/qapi-types-rocker.h \

qapi/qapi-types-run-state.c qapi/qapi-types-run-state.h \
@@ -608,6 +614,7 @@ qapi/qapi-visit-common.c qapi/qapi-visit-common.h \ 
qapi/qapi-visit-crypto.c qapi/qapi-visit-crypto.h \

qapi/qapi-visit-introspect.c qapi/qapi-visit-introspect.h \

qapi/qapi-visit-migration.c qapi/qapi-visit-migration.h \

qapi/qapi-visit-misc.c qapi/qapi-visit-misc.h \

qapi/qapi-visit-net.c qapi/qapi-visit-net.h \

qapi/qapi-visit-rocker.c qapi/qapi-visit-rocker.h \

qapi/qapi-visit-run-state.c qapi/qapi-visit-run-state.h \
@@ -624,6 +631,7 @@ qapi/qapi-commands-common.c qapi/qapi-commands-common.h \ 
qapi/qapi-commands-crypto.c qapi/qapi-commands-crypto.h \

qapi/qapi-commands-introspect.c qapi/qapi-commands-introspect.h \

qapi/qapi-commands-migration.c qapi/qapi-commands-migration.h \

qapi/qapi-commands-misc.c qapi/qapi-commands-misc.h \

qapi/qapi-commands-net.c qapi/qapi-commands-net.h \

qapi/qapi-commands-rocker.c qapi/qapi-commands-rocker.h \

qapi/qapi-commands-run-state.c qapi/qapi-commands-run-state.h \
@@ -640,6 +648,7 @@ qapi/qapi-events-common.c qapi/qapi-events-common.h \ 
qapi/qapi-events-crypto.c qapi/qapi-events-crypto.h \

qapi/qapi-events-introspect.c qapi/qapi-events-introspect.h \

qapi/qapi-events-migration.c qapi/qapi-events-migration.h \

qapi/qapi-events-misc.c qapi/qapi-events-misc.h \

qapi/qapi-events-net.c qapi/qapi-events-net.h \

qapi/qapi-events-rocker.c qapi/qapi-events-rocker.h \

qapi/qapi-events-run-state.c qapi/qapi-events-run-state.h \

Makefile.objs

+4 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ util-obj-y += qapi/qapi-types-common.o 
util-obj-y += qapi/qapi-types-crypto.o

util-obj-y += qapi/qapi-types-introspect.o

util-obj-y += qapi/qapi-types-migration.o

util-obj-y += qapi/qapi-types-misc.o

util-obj-y += qapi/qapi-types-net.o

util-obj-y += qapi/qapi-types-rocker.o

util-obj-y += qapi/qapi-types-run-state.o
@@ -28,6 +29,7 @@ util-obj-y += qapi/qapi-visit-common.o 
util-obj-y += qapi/qapi-visit-crypto.o

util-obj-y += qapi/qapi-visit-introspect.o

util-obj-y += qapi/qapi-visit-migration.o

util-obj-y += qapi/qapi-visit-misc.o

util-obj-y += qapi/qapi-visit-net.o

util-obj-y += qapi/qapi-visit-rocker.o

util-obj-y += qapi/qapi-visit-run-state.o
@@ -44,6 +46,7 @@ util-obj-y += qapi/qapi-events-common.o 
util-obj-y += qapi/qapi-events-crypto.o

util-obj-y += qapi/qapi-events-introspect.o

util-obj-y += qapi/qapi-events-migration.o

util-obj-y += qapi/qapi-events-misc.o

util-obj-y += qapi/qapi-events-net.o

util-obj-y += qapi/qapi-events-rocker.o

util-obj-y += qapi/qapi-events-run-state.o
@@ -136,6 +139,7 @@ common-obj-y += qapi/qapi-commands-common.o 
common-obj-y += qapi/qapi-commands-crypto.o

common-obj-y += qapi/qapi-commands-introspect.o

common-obj-y += qapi/qapi-commands-migration.o

common-obj-y += qapi/qapi-commands-misc.o

common-obj-y += qapi/qapi-commands-net.o

common-obj-y += qapi/qapi-commands-rocker.o

common-obj-y += qapi/qapi-commands-run-state.o

arch_init.c

+1 −1
Original line number Diff line number Diff line
@@ -28,9 +28,9 @@ 
#include "sysemu/arch_init.h"

#include "hw/pci/pci.h"

#include "hw/audio/soundhw.h"

#include "qapi/qapi-commands-misc.h"

#include "qemu/config-file.h"

#include "qemu/error-report.h"

#include "qmp-commands.h"

#include "hw/acpi/acpi.h"

#include "qemu/help_option.h"

balloon.c

+1 −1
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ 
#include "sysemu/kvm.h"

#include "sysemu/balloon.h"

#include "trace-root.h"

#include "qmp-commands.h"

#include "qapi/error.h"

#include "qapi/qapi-commands-misc.h"

#include "qapi/qmp/qerror.h"



static QEMUBalloonEvent *balloon_event_fn;