aboutsummaryrefslogtreecommitdiff
path: root/stubs
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2018-02-26 17:13:27 -0600
committerEric Blake <eblake@redhat.com>2018-03-02 13:45:50 -0600
commit112ed241f5d9a411dbca92bdf597151cb853c6a7 (patch)
treec32080433ead621e19d74a981be144a916a02f33 /stubs
parent9af2398977a78d37bf184d6ff6bd04c72bfbf006 (diff)
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 'stubs')
-rw-r--r--stubs/uuid.c2
-rw-r--r--stubs/vmgenid.c2
-rw-r--r--stubs/xen-hvm.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/stubs/uuid.c b/stubs/uuid.c
index a880de8d61..a802e9836b 100644
--- a/stubs/uuid.c
+++ b/stubs/uuid.c
@@ -1,7 +1,7 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
+#include "qapi/qapi-commands-misc.h"
#include "qemu/uuid.h"
-#include "qmp-commands.h"
UuidInfo *qmp_query_uuid(Error **errp)
{
diff --git a/stubs/vmgenid.c b/stubs/vmgenid.c
index 3c8fe55bdf..568e42b064 100644
--- a/stubs/vmgenid.c
+++ b/stubs/vmgenid.c
@@ -1,6 +1,6 @@
#include "qemu/osdep.h"
-#include "qmp-commands.h"
#include "qapi/error.h"
+#include "qapi/qapi-commands-misc.h"
#include "qapi/qmp/qerror.h"
GuidInfo *qmp_query_vm_generation_id(Error **errp)
diff --git a/stubs/xen-hvm.c b/stubs/xen-hvm.c
index 3ca6c51b21..0067bcc6db 100644
--- a/stubs/xen-hvm.c
+++ b/stubs/xen-hvm.c
@@ -12,7 +12,7 @@
#include "qemu-common.h"
#include "hw/xen/xen.h"
#include "exec/memory.h"
-#include "qmp-commands.h"
+#include "qapi/qapi-commands-misc.h"
int xen_pci_slot_get_pirq(PCIDevice *pci_dev, int irq_num)
{