Skip to content

Commit 9af2398

Browse files
Markus Armbrusterebblake
Markus Armbruster
authored and
ebblake
committed
Include less of the generated modular QAPI headers
In my "build everything" tree, a change to the types in qapi-schema.json triggers a recompile of about 4800 out of 5100 objects. The previous commit split up qmp-commands.h, qmp-event.h, qmp-visit.h, qapi-types.h. Each of these headers still includes all its shards. Reduce compile time by including just the shards we actually need. To illustrate the benefits: adding a type to qapi/migration.json now recompiles some 2300 instead of 4800 objects. The next commit will improve it further. Signed-off-by: Markus Armbruster <[email protected]> Message-Id: <[email protected]> Reviewed-by: Eric Blake <[email protected]> Reviewed-by: Marc-André Lureau <[email protected]> [eblake: rebase to master] Signed-off-by: Eric Blake <[email protected]>
1 parent 252dc31 commit 9af2398

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+135
-109
lines changed

‎backends/cryptodev.c

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include "hw/boards.h"
2727
#include "qapi/error.h"
2828
#include "qapi/visitor.h"
29-
#include "qapi-visit.h"
3029
#include "qemu/config-file.h"
3130
#include "qom/object_interfaces.h"
3231
#include "hw/virtio/virtio-crypto.h"

‎backends/hostmem.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@
99
* This work is licensed under the terms of the GNU GPL, version 2 or later.
1010
* See the COPYING file in the top-level directory.
1111
*/
12+
1213
#include "qemu/osdep.h"
1314
#include "sysemu/hostmem.h"
1415
#include "hw/boards.h"
1516
#include "qapi/error.h"
17+
#include "qapi-builtin-visit.h"
1618
#include "qapi/visitor.h"
17-
#include "qapi-visit.h"
1819
#include "qemu/config-file.h"
1920
#include "qom/object_interfaces.h"
2021

‎block.c

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
#include "qemu/coroutine.h"
4242
#include "block/qapi.h"
4343
#include "qemu/timer.h"
44-
#include "qapi-event.h"
4544
#include "qemu/cutils.h"
4645
#include "qemu/id.h"
4746

‎block/block-backend.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
#include "block/throttle-groups.h"
1818
#include "sysemu/blockdev.h"
1919
#include "sysemu/sysemu.h"
20-
#include "qapi-event.h"
2120
#include "qapi/error.h"
21+
#include "qapi/qapi-events-block.h"
2222
#include "qemu/id.h"
2323
#include "qemu/option.h"
2424
#include "trace.h"

‎block/crypto.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
#include "sysemu/block-backend.h"
2525
#include "crypto/block.h"
2626
#include "qapi/opts-visitor.h"
27+
#include "qapi/qapi-visit-crypto.h"
2728
#include "qapi/qmp/qdict.h"
2829
#include "qapi/qobject-input-visitor.h"
29-
#include "qapi-visit.h"
3030
#include "qapi/error.h"
3131
#include "qemu/option.h"
3232
#include "block/crypto.h"

‎block/nbd.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include "block/block_int.h"
3434
#include "qemu/module.h"
3535
#include "qemu/option.h"
36-
#include "qapi-visit.h"
36+
#include "qapi/qapi-visit-sockets.h"
3737
#include "qapi/qobject-input-visitor.h"
3838
#include "qapi/qobject-output-visitor.h"
3939
#include "qapi/qmp/qdict.h"

‎block/nfs.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
#include "qemu/uri.h"
3636
#include "qemu/cutils.h"
3737
#include "sysemu/sysemu.h"
38+
#include "qapi/qapi-visit-block-core.h"
3839
#include "qapi/qmp/qdict.h"
3940
#include "qapi/qmp/qstring.h"
40-
#include "qapi-visit.h"
4141
#include "qapi/qobject-input-visitor.h"
4242
#include "qapi/qobject-output-visitor.h"
4343
#include <nfsc/libnfs.h>

‎block/qapi.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
#include "block/block_int.h"
2828
#include "block/throttle-groups.h"
2929
#include "block/write-threshold.h"
30-
#include "qmp-commands.h"
31-
#include "qapi-visit.h"
3230
#include "qapi/error.h"
31+
#include "qapi/qapi-commands-block-core.h"
3332
#include "qapi/qobject-output-visitor.h"
33+
#include "qapi/qapi-visit-block-core.h"
3434
#include "qapi/qmp/qbool.h"
3535
#include "qapi/qmp/qdict.h"
3636
#include "qapi/qmp/qlist.h"

‎block/qcow2.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,14 @@
3030
#include "block/qcow2.h"
3131
#include "qemu/error-report.h"
3232
#include "qapi/error.h"
33+
#include "qapi/qapi-events-block-core.h"
3334
#include "qapi/qmp/qdict.h"
3435
#include "qapi/qmp/qstring.h"
35-
#include "qapi-event.h"
3636
#include "trace.h"
3737
#include "qemu/option_int.h"
3838
#include "qemu/cutils.h"
3939
#include "qemu/bswap.h"
4040
#include "qapi/opts-visitor.h"
41-
#include "qapi-visit.h"
4241
#include "block/crypto.h"
4342

4443
/*

‎block/quorum.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
#include "qemu/option.h"
1919
#include "block/block_int.h"
2020
#include "qapi/error.h"
21+
#include "qapi/qapi-events-block.h"
2122
#include "qapi/qmp/qdict.h"
2223
#include "qapi/qmp/qerror.h"
2324
#include "qapi/qmp/qlist.h"
2425
#include "qapi/qmp/qstring.h"
25-
#include "qapi-event.h"
2626
#include "crypto/hash.h"
2727

2828
#define HASH_LENGTH 32

‎block/sheepdog.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
*/
1414

1515
#include "qemu/osdep.h"
16-
#include "qapi-visit.h"
1716
#include "qapi/error.h"
17+
#include "qapi/qapi-visit-sockets.h"
1818
#include "qapi/qmp/qdict.h"
1919
#include "qapi/qobject-input-visitor.h"
2020
#include "qemu/uri.h"

‎block/ssh.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include "qemu/cutils.h"
3535
#include "qemu/sockets.h"
3636
#include "qemu/uri.h"
37-
#include "qapi-visit.h"
37+
#include "qapi/qapi-visit-sockets.h"
3838
#include "qapi/qmp/qdict.h"
3939
#include "qapi/qmp/qstring.h"
4040
#include "qapi/qobject-input-visitor.h"

‎block/throttle-groups.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include "qemu/thread.h"
3131
#include "sysemu/qtest.h"
3232
#include "qapi/error.h"
33-
#include "qapi-visit.h"
33+
#include "qapi/qapi-visit-block-core.h"
3434
#include "qom/object.h"
3535
#include "qom/object_interfaces.h"
3636

‎block/write-threshold.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
#include "qemu/coroutine.h"
1616
#include "block/write-threshold.h"
1717
#include "qemu/notify.h"
18-
#include "qapi-event.h"
1918
#include "qapi/error.h"
20-
#include "qmp-commands.h"
19+
#include "qapi/qapi-commands-block-core.h"
20+
#include "qapi/qapi-events-block-core.h"
2121

2222
uint64_t bdrv_write_threshold_get(const BlockDriverState *bs)
2323
{

‎blockdev-nbd.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
#include "sysemu/block-backend.h"
1515
#include "hw/block/block.h"
1616
#include "qapi/error.h"
17+
#include "qapi/qapi-commands-block.h"
1718
#include "sysemu/sysemu.h"
18-
#include "qmp-commands.h"
1919
#include "block/nbd.h"
2020
#include "io/channel-socket.h"
2121
#include "io/net-listener.h"

‎blockdev.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,19 @@
4040
#include "qemu/error-report.h"
4141
#include "qemu/option.h"
4242
#include "qemu/config-file.h"
43+
#include "qapi/qapi-commands-block.h"
44+
#include "qapi/qapi-commands-transaction.h"
45+
#include "qapi/qapi-visit-block-core.h"
4346
#include "qapi/qmp/qdict.h"
4447
#include "qapi/qmp/qnum.h"
4548
#include "qapi/qmp/qstring.h"
46-
#include "qapi-visit.h"
4749
#include "qapi/error.h"
4850
#include "qapi/qmp/qerror.h"
4951
#include "qapi/qmp/qlist.h"
5052
#include "qapi/qobject-output-visitor.h"
5153
#include "sysemu/sysemu.h"
5254
#include "sysemu/iothread.h"
5355
#include "block/block_int.h"
54-
#include "qmp-commands.h"
5556
#include "block/trace.h"
5657
#include "sysemu/arch_init.h"
5758
#include "sysemu/qtest.h"

‎blockjob.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
#include "block/block_int.h"
3131
#include "sysemu/block-backend.h"
3232
#include "qapi/error.h"
33+
#include "qapi/qapi-events-block-core.h"
3334
#include "qapi/qmp/qerror.h"
3435
#include "qemu/coroutine.h"
3536
#include "qemu/id.h"
3637
#include "qemu/timer.h"
37-
#include "qapi-event.h"
3838

3939
/* Right now, this mutex is only needed to synchronize accesses to job->busy
4040
* and job->sleep_timer, such as concurrent calls to block_job_do_yield and

‎chardev/char-fe.c

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include "qemu/error-report.h"
2626
#include "qapi/error.h"
2727
#include "qapi/qmp/qerror.h"
28-
#include "qapi-visit.h"
2928
#include "sysemu/replay.h"
3029

3130
#include "chardev/char-fe.h"

‎chardev/char-ringbuf.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424

2525
#include "qemu/osdep.h"
2626
#include "chardev/char.h"
27-
#include "qmp-commands.h"
2827
#include "qapi/error.h"
28+
#include "qapi/qapi-commands-char.h"
2929
#include "qemu/base64.h"
3030
#include "qemu/option.h"
3131

‎chardev/char-socket.c

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#include "qemu/option.h"
3232
#include "qapi/error.h"
3333
#include "qapi/clone-visitor.h"
34+
#include "qapi/qapi-visit-sockets.h"
3435

3536
#include "chardev/char-io.h"
3637

‎chardev/char.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@
2929
#include "qemu/config-file.h"
3030
#include "qemu/error-report.h"
3131
#include "chardev/char.h"
32-
#include "qmp-commands.h"
33-
#include "qapi-visit.h"
3432
#include "qapi/error.h"
33+
#include "qapi/qapi-commands-char.h"
3534
#include "qapi/qmp/qerror.h"
3635
#include "sysemu/replay.h"
3736
#include "qemu/help_option.h"

‎cpus.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include "cpu.h"
2828
#include "monitor/monitor.h"
2929
#include "qapi/error.h"
30+
#include "qapi/qapi-events-run-state.h"
3031
#include "qapi/qmp/qerror.h"
3132
#include "qemu/error-report.h"
3233
#include "sysemu/sysemu.h"
@@ -49,7 +50,6 @@
4950
#include "qemu/bitmap.h"
5051
#include "qemu/seqlock.h"
5152
#include "tcg.h"
52-
#include "qapi-event.h"
5353
#include "hw/nmi.h"
5454
#include "sysemu/replay.h"
5555
#include "hw/boards.h"

‎crypto/cipherpriv.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#ifndef QCRYPTO_CIPHERPRIV_H
1616
#define QCRYPTO_CIPHERPRIV_H
1717

18-
#include "qapi-types.h"
18+
#include "qapi/qapi-types-crypto.h"
1919

2020
typedef struct QCryptoCipherDriver QCryptoCipherDriver;
2121

‎hmp.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929
#include "monitor/qdev.h"
3030
#include "qapi/error.h"
3131
#include "qapi/opts-visitor.h"
32+
#include "qapi-builtin-visit.h"
3233
#include "qapi/qmp/qdict.h"
3334
#include "qapi/qmp/qerror.h"
3435
#include "qapi/string-input-visitor.h"
3536
#include "qapi/string-output-visitor.h"
36-
#include "qapi-visit.h"
3737
#include "qom/object_interfaces.h"
3838
#include "ui/console.h"
3939
#include "block/nbd.h"

‎hw/acpi/core.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
#include "qemu/config-file.h"
2828
#include "qapi/error.h"
2929
#include "qapi/opts-visitor.h"
30+
#include "qapi/qapi-events-run-state.h"
3031
#include "qapi-visit.h"
31-
#include "qapi-event.h"
3232
#include "qemu/error-report.h"
3333
#include "qemu/option.h"
3434

‎hw/block/block.c

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include "sysemu/block-backend.h"
1313
#include "hw/block/block.h"
1414
#include "qapi/error.h"
15+
#include "qapi/qapi-types-block.h"
1516
#include "qemu/error-report.h"
1617

1718
void blkconf_serial(BlockConf *conf, char **serial)

‎hw/block/hd-geometry.c

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232

3333
#include "qemu/osdep.h"
3434
#include "sysemu/block-backend.h"
35+
#include "qapi/qapi-types-block.h"
3536
#include "qemu/bswap.h"
3637
#include "hw/block/block.h"
3738
#include "trace.h"

‎hw/char/virtio-console.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
#include "qemu/error-report.h"
1616
#include "trace.h"
1717
#include "hw/virtio/virtio-serial.h"
18-
#include "qapi-event.h"
1918
#include "qapi/error.h"
19+
#include "qapi/qapi-events-char.h"
2020

2121
#define TYPE_VIRTIO_CONSOLE_SERIAL_PORT "virtserialport"
2222
#define VIRTIO_CONSOLE(obj) \

‎hw/core/machine.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "qemu/osdep.h"
1414
#include "hw/boards.h"
1515
#include "qapi/error.h"
16-
#include "qapi-visit.h"
16+
#include "qapi/qapi-visit-common.h"
1717
#include "qapi/visitor.h"
1818
#include "hw/sysbus.h"
1919
#include "sysemu/sysemu.h"

‎hw/i386/pc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@
6767
#include "acpi-build.h"
6868
#include "hw/mem/pc-dimm.h"
6969
#include "qapi/error.h"
70+
#include "qapi/qapi-visit-common.h"
7071
#include "qapi/visitor.h"
71-
#include "qapi-visit.h"
7272
#include "qom/cpu.h"
7373
#include "hw/nmi.h"
7474
#include "hw/i386/intel_iommu.h"

‎hw/mem/nvdimm.c

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include "qemu/osdep.h"
2626
#include "qapi/error.h"
2727
#include "qapi/visitor.h"
28-
#include "qapi-visit.h"
2928
#include "hw/mem/nvdimm.h"
3029

3130
static void nvdimm_get_label_size(Object *obj, Visitor *v, const char *name,

‎hw/net/rocker/qmp-norocker.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
#include "qemu/osdep.h"
1919
#include "qemu-common.h"
20-
#include "qmp-commands.h"
2120
#include "qapi/error.h"
21+
#include "qapi/qapi-commands-rocker.h"
2222
#include "qapi/qmp/qerror.h"
2323

2424
RockerSwitch *qmp_query_rocker(const char *name, Error **errp)

‎hw/net/rocker/rocker.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
#include "net/net.h"
2323
#include "net/eth.h"
2424
#include "qapi/error.h"
25+
#include "qapi/qapi-commands-rocker.h"
2526
#include "qemu/iov.h"
2627
#include "qemu/bitops.h"
27-
#include "qmp-commands.h"
2828

2929
#include "rocker.h"
3030
#include "rocker_hw.h"

‎hw/net/rocker/rocker_fp.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#include "qemu/osdep.h"
1818
#include "net/clients.h"
19-
19+
#include "qapi/qapi-types-rocker.h"
2020
#include "rocker.h"
2121
#include "rocker_hw.h"
2222
#include "rocker_fp.h"

‎hw/net/rocker/rocker_of_dpa.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
#include "qemu/osdep.h"
1818
#include "net/eth.h"
1919
#include "qapi/error.h"
20+
#include "qapi/qapi-commands-rocker.h"
2021
#include "qemu/iov.h"
2122
#include "qemu/timer.h"
22-
#include "qmp-commands.h"
2323

2424
#include "rocker.h"
2525
#include "rocker_hw.h"

‎hw/net/virtio-net.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include "net/vhost_net.h"
2424
#include "hw/virtio/virtio-bus.h"
2525
#include "qapi/error.h"
26-
#include "qapi-event.h"
26+
#include "qapi/qapi-events-net.h"
2727
#include "hw/virtio/virtio-access.h"
2828
#include "migration/misc.h"
2929

‎hw/ppc/spapr_rtas.c

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
#include "hw/ppc/spapr_vio.h"
3939
#include "hw/ppc/spapr_rtas.h"
4040
#include "hw/ppc/ppc.h"
41-
#include "qapi-event.h"
4241
#include "hw/boards.h"
4342

4443
#include <libfdt.h>

0 commit comments

Comments
 (0)