jcs.org
qemu with hax to log dma reads & writes
jcs.org/2018/11/12/vfio
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 <armbru@redhat.com>
Message-Id: <20180211093607.27351-24-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
[eblake: rebase to master]
Signed-off-by: Eric Blake <eblake@redhat.com>
authored by
Markus Armbruster
and committed by
Eric Blake
9af23989
252dc310
+135
-109
-1
backends/cryptodev.c
-1
backends/cryptodev.c
+2
-1
backends/hostmem.c
+2
-1
backends/hostmem.c
···
9
9
* This work is licensed under the terms of the GNU GPL, version 2 or later.
10
10
* See the COPYING file in the top-level directory.
11
11
*/
12
+
12
13
#include "qemu/osdep.h"
13
14
#include "sysemu/hostmem.h"
14
15
#include "hw/boards.h"
15
16
#include "qapi/error.h"
17
+
#include "qapi-builtin-visit.h"
16
18
#include "qapi/visitor.h"
17
-
#include "qapi-visit.h"
18
19
#include "qemu/config-file.h"
19
20
#include "qom/object_interfaces.h"
20
21
-1
block.c
-1
block.c
+1
-1
block/block-backend.c
+1
-1
block/block-backend.c
+1
-1
block/crypto.c
+1
-1
block/crypto.c
···
24
24
#include "sysemu/block-backend.h"
25
25
#include "crypto/block.h"
26
26
#include "qapi/opts-visitor.h"
27
+
#include "qapi/qapi-visit-crypto.h"
27
28
#include "qapi/qmp/qdict.h"
28
29
#include "qapi/qobject-input-visitor.h"
29
-
#include "qapi-visit.h"
30
30
#include "qapi/error.h"
31
31
#include "qemu/option.h"
32
32
#include "block/crypto.h"
+1
-1
block/nbd.c
+1
-1
block/nbd.c
+1
-1
block/nfs.c
+1
-1
block/nfs.c
···
35
35
#include "qemu/uri.h"
36
36
#include "qemu/cutils.h"
37
37
#include "sysemu/sysemu.h"
38
+
#include "qapi/qapi-visit-block-core.h"
38
39
#include "qapi/qmp/qdict.h"
39
40
#include "qapi/qmp/qstring.h"
40
-
#include "qapi-visit.h"
41
41
#include "qapi/qobject-input-visitor.h"
42
42
#include "qapi/qobject-output-visitor.h"
43
43
#include <nfsc/libnfs.h>
+2
-2
block/qapi.c
+2
-2
block/qapi.c
···
27
27
#include "block/block_int.h"
28
28
#include "block/throttle-groups.h"
29
29
#include "block/write-threshold.h"
30
-
#include "qmp-commands.h"
31
-
#include "qapi-visit.h"
32
30
#include "qapi/error.h"
31
+
#include "qapi/qapi-commands-block-core.h"
33
32
#include "qapi/qobject-output-visitor.h"
33
+
#include "qapi/qapi-visit-block-core.h"
34
34
#include "qapi/qmp/qbool.h"
35
35
#include "qapi/qmp/qdict.h"
36
36
#include "qapi/qmp/qlist.h"
+1
-2
block/qcow2.c
+1
-2
block/qcow2.c
···
30
30
#include "block/qcow2.h"
31
31
#include "qemu/error-report.h"
32
32
#include "qapi/error.h"
33
+
#include "qapi/qapi-events-block-core.h"
33
34
#include "qapi/qmp/qdict.h"
34
35
#include "qapi/qmp/qstring.h"
35
-
#include "qapi-event.h"
36
36
#include "trace.h"
37
37
#include "qemu/option_int.h"
38
38
#include "qemu/cutils.h"
39
39
#include "qemu/bswap.h"
40
40
#include "qapi/opts-visitor.h"
41
-
#include "qapi-visit.h"
42
41
#include "block/crypto.h"
43
42
44
43
/*
+1
-1
block/quorum.c
+1
-1
block/quorum.c
···
18
18
#include "qemu/option.h"
19
19
#include "block/block_int.h"
20
20
#include "qapi/error.h"
21
+
#include "qapi/qapi-events-block.h"
21
22
#include "qapi/qmp/qdict.h"
22
23
#include "qapi/qmp/qerror.h"
23
24
#include "qapi/qmp/qlist.h"
24
25
#include "qapi/qmp/qstring.h"
25
-
#include "qapi-event.h"
26
26
#include "crypto/hash.h"
27
27
28
28
#define HASH_LENGTH 32
+1
-1
block/sheepdog.c
+1
-1
block/sheepdog.c
+1
-1
block/ssh.c
+1
-1
block/ssh.c
+1
-1
block/throttle-groups.c
+1
-1
block/throttle-groups.c
+2
-2
block/write-threshold.c
+2
-2
block/write-threshold.c
···
15
15
#include "qemu/coroutine.h"
16
16
#include "block/write-threshold.h"
17
17
#include "qemu/notify.h"
18
-
#include "qapi-event.h"
19
18
#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"
21
21
22
22
uint64_t bdrv_write_threshold_get(const BlockDriverState *bs)
23
23
{
+1
-1
blockdev-nbd.c
+1
-1
blockdev-nbd.c
···
14
14
#include "sysemu/block-backend.h"
15
15
#include "hw/block/block.h"
16
16
#include "qapi/error.h"
17
+
#include "qapi/qapi-commands-block.h"
17
18
#include "sysemu/sysemu.h"
18
-
#include "qmp-commands.h"
19
19
#include "block/nbd.h"
20
20
#include "io/channel-socket.h"
21
21
#include "io/net-listener.h"
+3
-2
blockdev.c
+3
-2
blockdev.c
···
40
40
#include "qemu/error-report.h"
41
41
#include "qemu/option.h"
42
42
#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"
43
46
#include "qapi/qmp/qdict.h"
44
47
#include "qapi/qmp/qnum.h"
45
48
#include "qapi/qmp/qstring.h"
46
-
#include "qapi-visit.h"
47
49
#include "qapi/error.h"
48
50
#include "qapi/qmp/qerror.h"
49
51
#include "qapi/qmp/qlist.h"
···
51
53
#include "sysemu/sysemu.h"
52
54
#include "sysemu/iothread.h"
53
55
#include "block/block_int.h"
54
-
#include "qmp-commands.h"
55
56
#include "block/trace.h"
56
57
#include "sysemu/arch_init.h"
57
58
#include "sysemu/qtest.h"
+1
-1
blockjob.c
+1
-1
blockjob.c
···
30
30
#include "block/block_int.h"
31
31
#include "sysemu/block-backend.h"
32
32
#include "qapi/error.h"
33
+
#include "qapi/qapi-events-block-core.h"
33
34
#include "qapi/qmp/qerror.h"
34
35
#include "qemu/coroutine.h"
35
36
#include "qemu/id.h"
36
37
#include "qemu/timer.h"
37
-
#include "qapi-event.h"
38
38
39
39
/* Right now, this mutex is only needed to synchronize accesses to job->busy
40
40
* and job->sleep_timer, such as concurrent calls to block_job_do_yield and
-1
chardev/char-fe.c
-1
chardev/char-fe.c
+1
-1
chardev/char-ringbuf.c
+1
-1
chardev/char-ringbuf.c
+1
chardev/char-socket.c
+1
chardev/char-socket.c
+1
-2
chardev/char.c
+1
-2
chardev/char.c
···
29
29
#include "qemu/config-file.h"
30
30
#include "qemu/error-report.h"
31
31
#include "chardev/char.h"
32
-
#include "qmp-commands.h"
33
-
#include "qapi-visit.h"
34
32
#include "qapi/error.h"
33
+
#include "qapi/qapi-commands-char.h"
35
34
#include "qapi/qmp/qerror.h"
36
35
#include "sysemu/replay.h"
37
36
#include "qemu/help_option.h"
+1
-1
cpus.c
+1
-1
cpus.c
···
27
27
#include "cpu.h"
28
28
#include "monitor/monitor.h"
29
29
#include "qapi/error.h"
30
+
#include "qapi/qapi-events-run-state.h"
30
31
#include "qapi/qmp/qerror.h"
31
32
#include "qemu/error-report.h"
32
33
#include "sysemu/sysemu.h"
···
49
50
#include "qemu/bitmap.h"
50
51
#include "qemu/seqlock.h"
51
52
#include "tcg.h"
52
-
#include "qapi-event.h"
53
53
#include "hw/nmi.h"
54
54
#include "sysemu/replay.h"
55
55
#include "hw/boards.h"
+1
-1
crypto/cipherpriv.h
+1
-1
crypto/cipherpriv.h
+1
-1
hmp.c
+1
-1
hmp.c
···
29
29
#include "monitor/qdev.h"
30
30
#include "qapi/error.h"
31
31
#include "qapi/opts-visitor.h"
32
+
#include "qapi-builtin-visit.h"
32
33
#include "qapi/qmp/qdict.h"
33
34
#include "qapi/qmp/qerror.h"
34
35
#include "qapi/string-input-visitor.h"
35
36
#include "qapi/string-output-visitor.h"
36
-
#include "qapi-visit.h"
37
37
#include "qom/object_interfaces.h"
38
38
#include "ui/console.h"
39
39
#include "block/nbd.h"
+1
-1
hw/acpi/core.c
+1
-1
hw/acpi/core.c
+1
hw/block/block.c
+1
hw/block/block.c
+1
hw/block/hd-geometry.c
+1
hw/block/hd-geometry.c
+1
-1
hw/char/virtio-console.c
+1
-1
hw/char/virtio-console.c
···
15
15
#include "qemu/error-report.h"
16
16
#include "trace.h"
17
17
#include "hw/virtio/virtio-serial.h"
18
-
#include "qapi-event.h"
19
18
#include "qapi/error.h"
19
+
#include "qapi/qapi-events-char.h"
20
20
21
21
#define TYPE_VIRTIO_CONSOLE_SERIAL_PORT "virtserialport"
22
22
#define VIRTIO_CONSOLE(obj) \
+1
-1
hw/core/machine.c
+1
-1
hw/core/machine.c
+1
-1
hw/i386/pc.c
+1
-1
hw/i386/pc.c
-1
hw/mem/nvdimm.c
-1
hw/mem/nvdimm.c
+1
-1
hw/net/rocker/qmp-norocker.c
+1
-1
hw/net/rocker/qmp-norocker.c
+1
-1
hw/net/rocker/rocker.c
+1
-1
hw/net/rocker/rocker.c
+1
-1
hw/net/rocker/rocker_fp.c
+1
-1
hw/net/rocker/rocker_fp.c
+1
-1
hw/net/rocker/rocker_of_dpa.c
+1
-1
hw/net/rocker/rocker_of_dpa.c
+1
-1
hw/net/virtio-net.c
+1
-1
hw/net/virtio-net.c
-1
hw/ppc/spapr_rtas.c
-1
hw/ppc/spapr_rtas.c
+1
hw/tpm/tpm_emulator.c
+1
hw/tpm/tpm_emulator.c
+1
hw/tpm/tpm_passthrough.c
+1
hw/tpm/tpm_passthrough.c
+1
-1
hw/watchdog/watchdog.c
+1
-1
hw/watchdog/watchdog.c
···
24
24
#include "qemu/config-file.h"
25
25
#include "qemu/queue.h"
26
26
#include "qapi/error.h"
27
+
#include "qapi/qapi-events-run-state.h"
27
28
#include "sysemu/sysemu.h"
28
29
#include "sysemu/watchdog.h"
29
-
#include "qapi-event.h"
30
30
#include "hw/nmi.h"
31
31
#include "qemu/help_option.h"
32
32
#include "qmp-commands.h"
+1
-1
include/block/block.h
+1
-1
include/block/block.h
+1
-1
include/block/dirty-bitmap.h
+1
-1
include/block/dirty-bitmap.h
+1
-1
include/block/nbd.h
+1
-1
include/block/nbd.h
+1
include/chardev/char.h
+1
include/chardev/char.h
+1
-1
include/crypto/cipher.h
+1
-1
include/crypto/cipher.h
+1
-1
include/crypto/hash.h
+1
-1
include/crypto/hash.h
+1
-1
include/crypto/hmac.h
+1
-1
include/crypto/hmac.h
+1
include/crypto/secret.h
+1
include/crypto/secret.h
+1
include/crypto/tlscreds.h
+1
include/crypto/tlscreds.h
+1
-1
include/hw/block/block.h
+1
-1
include/hw/block/block.h
+1
-1
include/hw/block/fdc.h
+1
-1
include/hw/block/fdc.h
+1
include/hw/ppc/spapr_drc.h
+1
include/hw/ppc/spapr_drc.h
+1
include/hw/qdev-properties.h
+1
include/hw/qdev-properties.h
+1
include/io/dns-resolver.h
+1
include/io/dns-resolver.h
+1
-1
include/migration/colo.h
+1
-1
include/migration/colo.h
+1
-1
include/migration/failover.h
+1
-1
include/migration/failover.h
+1
include/migration/global_state.h
+1
include/migration/global_state.h
+1
include/monitor/monitor.h
+1
include/monitor/monitor.h
+1
include/net/filter.h
+1
include/net/filter.h
+1
-1
include/net/net.h
+1
-1
include/net/net.h
-1
include/qapi/clone-visitor.h
-1
include/qapi/clone-visitor.h
+1
-1
include/qapi/error.h
+1
-1
include/qapi/error.h
+1
-1
include/qapi/qmp/qobject.h
+1
-1
include/qapi/qmp/qobject.h
+1
-1
include/qapi/visitor.h
+1
-1
include/qapi/visitor.h
+1
-1
include/qemu/sockets.h
+1
-1
include/qemu/sockets.h
+1
-1
include/qemu/throttle.h
+1
-1
include/qemu/throttle.h
+1
include/qom/cpu.h
+1
include/qom/cpu.h
+1
-1
include/qom/object.h
+1
-1
include/qom/object.h
+2
include/sysemu/dump.h
+2
include/sysemu/dump.h
+1
include/sysemu/hostmem.h
+1
include/sysemu/hostmem.h
+1
include/sysemu/replay.h
+1
include/sysemu/replay.h
+1
include/sysemu/sysemu.h
+1
include/sysemu/sysemu.h
+1
include/sysemu/tpm.h
+1
include/sysemu/tpm.h
+1
-1
include/sysemu/watchdog.h
+1
-1
include/sysemu/watchdog.h
+1
include/ui/console.h
+1
include/ui/console.h
+1
-1
include/ui/input.h
+1
-1
include/ui/input.h
+1
io/channel-socket.c
+1
io/channel-socket.c
+1
io/dns-resolver.c
+1
io/dns-resolver.c
+1
-1
migration/colo-failover.c
+1
-1
migration/colo-failover.c
···
15
15
#include "migration/failover.h"
16
16
#include "qemu/main-loop.h"
17
17
#include "migration.h"
18
-
#include "qmp-commands.h"
19
18
#include "qapi/error.h"
19
+
#include "qapi/qapi-commands-migration.h"
20
20
#include "qapi/qmp/qerror.h"
21
21
#include "qemu/error-report.h"
22
22
#include "trace.h"
+1
-1
migration/colo.c
+1
-1
migration/colo.c
···
13
13
#include "qemu/osdep.h"
14
14
#include "sysemu/sysemu.h"
15
15
#include "qapi/error.h"
16
+
#include "qapi/qapi-commands-migration.h"
16
17
#include "qemu-file-channel.h"
17
18
#include "migration.h"
18
19
#include "qemu-file.h"
···
24
25
#include "qemu/error-report.h"
25
26
#include "migration/failover.h"
26
27
#include "replication.h"
27
-
#include "qmp-commands.h"
28
28
29
29
static bool vmstate_loading;
30
30
+2
-2
migration/migration.c
+2
-2
migration/migration.c
···
31
31
#include "migration/vmstate.h"
32
32
#include "block/block.h"
33
33
#include "qapi/error.h"
34
+
#include "qapi/qapi-commands-migration.h"
35
+
#include "qapi/qapi-events-migration.h"
34
36
#include "qapi/qmp/qerror.h"
35
37
#include "qapi/qmp/qnull.h"
36
38
#include "qemu/rcu.h"
37
39
#include "block.h"
38
40
#include "postcopy-ram.h"
39
41
#include "qemu/thread.h"
40
-
#include "qmp-commands.h"
41
42
#include "trace.h"
42
-
#include "qapi-event.h"
43
43
#include "exec/target_page.h"
44
44
#include "io/channel-buffer.h"
45
45
#include "migration/colo.h"
+1
migration/migration.h
+1
migration/migration.h
+1
-1
migration/ram.c
+1
-1
migration/ram.c
···
29
29
#include "qemu/osdep.h"
30
30
#include "cpu.h"
31
31
#include <zlib.h>
32
-
#include "qapi-event.h"
33
32
#include "qemu/cutils.h"
34
33
#include "qemu/bitops.h"
35
34
#include "qemu/bitmap.h"
···
44
43
#include "migration/page_cache.h"
45
44
#include "qemu/error-report.h"
46
45
#include "qapi/error.h"
46
+
#include "qapi/qapi-events-migration.h"
47
47
#include "qapi/qmp/qerror.h"
48
48
#include "trace.h"
49
49
#include "exec/ram_addr.h"
+1
-1
migration/ram.h
+1
-1
migration/ram.h
-1
net/colo-compare.c
-1
net/colo-compare.c
+1
-1
net/filter-buffer.c
+1
-1
net/filter-buffer.c
-1
net/filter-mirror.c
-1
net/filter-mirror.c
-1
net/filter-rewriter.c
-1
net/filter-rewriter.c
+2
-2
net/net.c
+2
-2
net/net.c
···
33
33
34
34
#include "monitor/monitor.h"
35
35
#include "qemu/help_option.h"
36
+
#include "qapi/qapi-commands-net.h"
37
+
#include "qapi/qapi-visit-net.h"
36
38
#include "qapi/qmp/qdict.h"
37
39
#include "qapi/qmp/qerror.h"
38
40
#include "qemu/error-report.h"
39
41
#include "qemu/sockets.h"
40
42
#include "qemu/cutils.h"
41
43
#include "qemu/config-file.h"
42
-
#include "qmp-commands.h"
43
44
#include "hw/qdev.h"
44
45
#include "qemu/iov.h"
45
46
#include "qemu/main-loop.h"
46
47
#include "qemu/option.h"
47
-
#include "qapi-visit.h"
48
48
#include "qapi/error.h"
49
49
#include "qapi/opts-visitor.h"
50
50
#include "sysemu/sysemu.h"
+1
-1
net/tap_int.h
+1
-1
net/tap_int.h
+1
-1
net/vhost-user.c
+1
-1
net/vhost-user.c
···
14
14
#include "net/vhost-user.h"
15
15
#include "chardev/char-fe.h"
16
16
#include "qapi/error.h"
17
+
#include "qapi/qapi-commands-net.h"
17
18
#include "qemu/config-file.h"
18
19
#include "qemu/error-report.h"
19
20
#include "qemu/option.h"
20
-
#include "qmp-commands.h"
21
21
#include "trace.h"
22
22
23
23
typedef struct VhostUserState {
+1
-1
qemu-img.c
+1
-1
qemu-img.c
+1
-1
qom/object.c
+1
-1
qom/object.c
···
16
16
#include "qom/object_interfaces.h"
17
17
#include "qemu/cutils.h"
18
18
#include "qapi/visitor.h"
19
-
#include "qapi-visit.h"
20
19
#include "qapi/string-input-visitor.h"
21
20
#include "qapi/string-output-visitor.h"
21
+
#include "qapi-builtin-visit.h"
22
22
#include "qapi/qmp/qerror.h"
23
23
#include "trace.h"
24
24
-1
qom/object_interfaces.c
-1
qom/object_interfaces.c
+1
replay/replay-input.c
+1
replay/replay-input.c
+1
replication.h
+1
replication.h
+8
-6
scripts/qapi/commands.py
+8
-6
scripts/qapi/commands.py
···
241
241
242
242
def _begin_module(self, name):
243
243
self._visited_ret_types[self._genc] = set()
244
+
commands = self._module_basename('qapi-commands', name)
245
+
types = self._module_basename('qapi-types', name)
246
+
visit = self._module_basename('qapi-visit', name)
244
247
self._genc.add(mcgen('''
245
248
#include "qemu/osdep.h"
246
249
#include "qemu-common.h"
···
251
254
#include "qapi/qobject-input-visitor.h"
252
255
#include "qapi/dealloc-visitor.h"
253
256
#include "qapi/error.h"
254
-
#include "%(prefix)sqapi-types.h"
255
-
#include "%(prefix)sqapi-visit.h"
256
-
#include "%(prefix)sqmp-commands.h"
257
+
#include "%(visit)s.h"
258
+
#include "%(commands)s.h"
257
259
258
260
''',
259
-
prefix=self._prefix))
261
+
commands=commands, visit=visit))
260
262
self._genh.add(mcgen('''
261
-
#include "%(prefix)sqapi-types.h"
263
+
#include "%(types)s.h"
262
264
#include "qapi/qmp/dispatch.h"
263
265
264
266
''',
265
-
prefix=self._prefix))
267
+
types=types))
266
268
267
269
def visit_end(self):
268
270
(genc, genh) = self._module[self._main_module]
+6
-4
scripts/qapi/events.py
+6
-4
scripts/qapi/events.py
···
165
165
return basename
166
166
167
167
def _begin_module(self, name):
168
+
types = self._module_basename('qapi-types', name)
169
+
visit = self._module_basename('qapi-visit', name)
168
170
self._genc.add(mcgen('''
169
171
#include "qemu/osdep.h"
170
172
#include "qemu-common.h"
171
173
#include "%(prefix)sqapi-event.h"
172
-
#include "%(prefix)sqapi-visit.h"
174
+
#include "%(visit)s.h"
173
175
#include "qapi/error.h"
174
176
#include "qapi/qmp/qdict.h"
175
177
#include "qapi/qobject-output-visitor.h"
176
178
#include "qapi/qmp-event.h"
177
179
178
180
''',
179
-
prefix=self._prefix))
181
+
visit=visit, prefix=self._prefix))
180
182
self._genh.add(mcgen('''
181
183
#include "qapi/util.h"
182
-
#include "%(prefix)sqapi-types.h"
184
+
#include "%(types)s.h"
183
185
184
186
''',
185
-
prefix=self._prefix))
187
+
types=types))
186
188
187
189
def visit_end(self):
188
190
self._genh.add(gen_enum(self._enum_name, self._event_names))
+5
-3
scripts/qapi/types.py
+5
-3
scripts/qapi/types.py
···
185
185
'''))
186
186
187
187
def _begin_module(self, name):
188
+
types = self._module_basename('qapi-types', name)
189
+
visit = self._module_basename('qapi-visit', name)
188
190
self._genc.preamble_add(mcgen('''
189
191
#include "qemu/osdep.h"
190
192
#include "qapi/dealloc-visitor.h"
191
-
#include "%(prefix)sqapi-types.h"
192
-
#include "%(prefix)sqapi-visit.h"
193
+
#include "%(types)s.h"
194
+
#include "%(visit)s.h"
193
195
''',
194
-
prefix=self._prefix))
196
+
types=types, visit=visit))
195
197
self._genh.preamble_add(mcgen('''
196
198
#include "qapi-builtin-types.h"
197
199
'''))
+6
-4
scripts/qapi/visit.py
+6
-4
scripts/qapi/visit.py
···
284
284
prefix=prefix))
285
285
286
286
def _begin_module(self, name):
287
+
types = self._module_basename('qapi-types', name)
288
+
visit = self._module_basename('qapi-visit', name)
287
289
self._genc.preamble_add(mcgen('''
288
290
#include "qemu/osdep.h"
289
291
#include "qemu-common.h"
290
292
#include "qapi/error.h"
291
293
#include "qapi/qmp/qerror.h"
292
-
#include "%(prefix)sqapi-visit.h"
294
+
#include "%(visit)s.h"
293
295
''',
294
-
prefix=self._prefix))
296
+
visit=visit, prefix=self._prefix))
295
297
self._genh.preamble_add(mcgen('''
296
298
#include "qapi-builtin-visit.h"
297
-
#include "%(prefix)sqapi-types.h"
299
+
#include "%(types)s.h"
298
300
299
301
''',
300
-
prefix=self._prefix))
302
+
types=types))
301
303
302
304
def visit_enum_type(self, name, info, values, prefix):
303
305
self._genh.add(gen_visit_decl(name, scalar=True))
+2
-1
stubs/tpm.c
+2
-1
stubs/tpm.c
···
4
4
* This work is licensed under the terms of the GNU GPL, version 2 or later.
5
5
* See the COPYING file in the top-level directory.
6
6
*/
7
+
7
8
#include "qemu/osdep.h"
9
+
#include "qapi/qapi-commands-tpm.h"
8
10
#include "sysemu/tpm.h"
9
-
#include "qmp-commands.h"
10
11
11
12
int tpm_init(void)
12
13
{
-1
target/s390x/kvm.c
-1
target/s390x/kvm.c
+1
target/s390x/sigp.c
+1
target/s390x/sigp.c
+1
-1
tests/test-char.c
+1
-1
tests/test-char.c
-1
tests/test-qmp-event.c
-1
tests/test-qmp-event.c
+1
-1
tpm.c
+1
-1
tpm.c
···
15
15
#include "qemu/osdep.h"
16
16
17
17
#include "qapi/error.h"
18
+
#include "qapi/qapi-commands-tpm.h"
18
19
#include "qapi/qmp/qerror.h"
19
20
#include "sysemu/tpm_backend.h"
20
21
#include "sysemu/tpm.h"
21
22
#include "qemu/config-file.h"
22
23
#include "qemu/error-report.h"
23
-
#include "qmp-commands.h"
24
24
25
25
static QLIST_HEAD(, TPMBackend) tpm_backends =
26
26
QLIST_HEAD_INITIALIZER(tpm_backends);
+1
-1
trace/qmp.c
+1
-1
trace/qmp.c
+1
-1
ui/console.c
+1
-1
ui/console.c
···
26
26
#include "ui/console.h"
27
27
#include "hw/qdev-core.h"
28
28
#include "qapi/error.h"
29
+
#include "qapi/qapi-commands-ui.h"
29
30
#include "qemu/option.h"
30
31
#include "qemu/timer.h"
31
-
#include "qmp-commands.h"
32
32
#include "chardev/char-fe.h"
33
33
#include "trace.h"
34
34
#include "exec/memory.h"
+1
-1
ui/input-legacy.c
+1
-1
ui/input-legacy.c
+1
-1
ui/input.c
+1
-1
ui/input.c
···
1
1
#include "qemu/osdep.h"
2
2
#include "sysemu/sysemu.h"
3
3
#include "qapi/error.h"
4
+
#include "qapi/qapi-commands-ui.h"
4
5
#include "qapi/qmp/qdict.h"
5
6
#include "qemu/error-report.h"
6
-
#include "qmp-commands.h"
7
7
#include "trace.h"
8
8
#include "ui/input.h"
9
9
#include "ui/console.h"
+2
-2
ui/spice-core.c
+2
-2
ui/spice-core.c
···
28
28
#include "qemu/queue.h"
29
29
#include "qemu-x509.h"
30
30
#include "qemu/sockets.h"
31
-
#include "qmp-commands.h"
32
31
#include "qapi/error.h"
32
+
#include "qapi/qapi-commands-ui.h"
33
+
#include "qapi/qapi-events-ui.h"
33
34
#include "qemu/notify.h"
34
35
#include "qemu/option.h"
35
36
#include "migration/misc.h"
36
37
#include "hw/hw.h"
37
38
#include "ui/spice-display.h"
38
-
#include "qapi-event.h"
39
39
40
40
/* core bits */
41
41
+1
-1
ui/vnc.c
+1
-1
ui/vnc.c
+1
ui/vnc.h
+1
ui/vnc.h
+1
-1
util/qemu-sockets.c
+1
-1
util/qemu-sockets.c
···
24
24
#include "monitor/monitor.h"
25
25
#include "qapi/clone-visitor.h"
26
26
#include "qapi/error.h"
27
+
#include "qapi/qapi-visit-sockets.h"
27
28
#include "qemu/sockets.h"
28
29
#include "qemu/main-loop.h"
29
30
#include "qapi/qobject-input-visitor.h"
30
31
#include "qapi/qobject-output-visitor.h"
31
-
#include "qapi-visit.h"
32
32
#include "qemu/cutils.h"
33
33
34
34
#ifndef AI_ADDRCONFIG
+2
-2
vl.c
+2
-2
vl.c
···
97
97
#include "sysemu/kvm.h"
98
98
#include "sysemu/hax.h"
99
99
#include "qapi/qobject-input-visitor.h"
100
-
#include "qapi-visit.h"
101
100
#include "qemu/option.h"
102
101
#include "qemu/config-file.h"
103
102
#include "qemu-options.h"
···
122
121
#include "qapi/string-input-visitor.h"
123
122
#include "qapi/opts-visitor.h"
124
123
#include "qom/object_interfaces.h"
125
-
#include "qapi-event.h"
126
124
#include "exec/semihost.h"
127
125
#include "crypto/init.h"
128
126
#include "sysemu/replay.h"
127
+
#include "qapi/qapi-events-run-state.h"
128
+
#include "qapi/qapi-visit-block-core.h"
129
129
#include "qapi/qmp/qerror.h"
130
130
#include "sysemu/iothread.h"
131
131