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>

diff --git a/backends/cryptodev.c b/backends/cryptodev.c
index d0dff1a463b1edc7b9b5539564016eb40e7a10ef..f35be377efa4bd0fb89f4586071858a32b9b7af1 100644 (file)
--- a/backends/cryptodev.c
+++ b/backends/cryptodev.c
@@ -26,7 +26,6 @@
 #include "hw/boards.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"
-#include "qapi-visit.h"
 #include "qemu/config-file.h"
 #include "qom/object_interfaces.h"
 #include "hw/virtio/virtio-crypto.h"

diff --git a/backends/hostmem.c b/backends/hostmem.c
index 8aa04120323b24f0164a14d6d992912e3ae622c6..74fc04a3621e8dd38e4728ea30a687538b40cf25 100644 (file)
--- a/backends/hostmem.c
+++ b/backends/hostmem.c
@@ -9,12 +9,13 @@
  * This work is licensed under the terms of the GNU GPL, version 2 or later.
  * See the COPYING file in the top-level directory.
  */
+
 #include "qemu/osdep.h"
 #include "sysemu/hostmem.h"
 #include "hw/boards.h"
 #include "qapi/error.h"
+#include "qapi-builtin-visit.h"
 #include "qapi/visitor.h"
-#include "qapi-visit.h"
 #include "qemu/config-file.h"
 #include "qom/object_interfaces.h"
 

diff --git a/block.c b/block.c
index 628910f6382f785a435783a827bad47e2b37d41a..c205320a50bb9ed01b843f416dca552032d1c219 100644 (file)
--- a/block.c
+++ b/block.c
@@ -41,7 +41,6 @@
 #include "qemu/coroutine.h"
 #include "block/qapi.h"
 #include "qemu/timer.h"
-#include "qapi-event.h"
 #include "qemu/cutils.h"
 #include "qemu/id.h"
 

diff --git a/block/block-backend.c b/block/block-backend.c
index 0266ac990b3f0eb9344a9dbfefce72575f72aaa8..94ffbb6a60b0f58e3396ff27d57bdb52693449dc 100644 (file)
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -17,8 +17,8 @@
 #include "block/throttle-groups.h"
 #include "sysemu/blockdev.h"
 #include "sysemu/sysemu.h"
-#include "qapi-event.h"
 #include "qapi/error.h"
+#include "qapi/qapi-events-block.h"
 #include "qemu/id.h"
 #include "qemu/option.h"
 #include "trace.h"

diff --git a/block/crypto.c b/block/crypto.c
index 3df66947c5a420703cb1d7abd2de46b4e5962e90..aeac482e7bbcf7f13bdf48493013578dea4ee122 100644 (file)
--- a/block/crypto.c
+++ b/block/crypto.c
@@ -24,9 +24,9 @@
 #include "sysemu/block-backend.h"
 #include "crypto/block.h"
 #include "qapi/opts-visitor.h"
+#include "qapi/qapi-visit-crypto.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qobject-input-visitor.h"
-#include "qapi-visit.h"
 #include "qapi/error.h"
 #include "qemu/option.h"
 #include "block/crypto.h"

diff --git a/block/nbd.c b/block/nbd.c
index 69b5fd5e8fabd18d548cba073053571b872245d0..d4e4172c08c6a0bd10acd429975af8540082d585 100644 (file)
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -33,7 +33,7 @@
 #include "block/block_int.h"
 #include "qemu/module.h"
 #include "qemu/option.h"
-#include "qapi-visit.h"
+#include "qapi/qapi-visit-sockets.h"
 #include "qapi/qobject-input-visitor.h"
 #include "qapi/qobject-output-visitor.h"
 #include "qapi/qmp/qdict.h"

diff --git a/block/nfs.c b/block/nfs.c
index 6576a73d6eb9d09cc843fee1f308ca57613c8d78..bbdb4fadad0081954433ee33a6081972740045f2 100644 (file)
--- a/block/nfs.c
+++ b/block/nfs.c
@@ -35,9 +35,9 @@
 #include "qemu/uri.h"
 #include "qemu/cutils.h"
 #include "sysemu/sysemu.h"
+#include "qapi/qapi-visit-block-core.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qstring.h"
-#include "qapi-visit.h"
 #include "qapi/qobject-input-visitor.h"
 #include "qapi/qobject-output-visitor.h"
 #include <nfsc/libnfs.h>

diff --git a/block/qapi.c b/block/qapi.c
index 1fdeb1ef2fdb21fe285c46fa96f79bba4602684c..4c9923d262b7d401a61228b530d255b09d7814dd 100644 (file)
--- a/block/qapi.c
+++ b/block/qapi.c
@@ -27,10 +27,10 @@
 #include "block/block_int.h"
 #include "block/throttle-groups.h"
 #include "block/write-threshold.h"
-#include "qmp-commands.h"
-#include "qapi-visit.h"
 #include "qapi/error.h"
+#include "qapi/qapi-commands-block-core.h"
 #include "qapi/qobject-output-visitor.h"
+#include "qapi/qapi-visit-block-core.h"
 #include "qapi/qmp/qbool.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qlist.h"

diff --git a/block/qcow2.c b/block/qcow2.c
index fd79c0ebaaf2ec9ea918876f13ea75265df3977f..3dd098b74f8f569bd07f3257abc85af0a1e5bd32 100644 (file)
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -30,15 +30,14 @@
 #include "block/qcow2.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
+#include "qapi/qapi-events-block-core.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qstring.h"
-#include "qapi-event.h"
 #include "trace.h"
 #include "qemu/option_int.h"
 #include "qemu/cutils.h"
 #include "qemu/bswap.h"
 #include "qapi/opts-visitor.h"
-#include "qapi-visit.h"
 #include "block/crypto.h"
 
 /*

diff --git a/block/quorum.c b/block/quorum.c
index 19f1c3442520a193693d4ca5c8926193c65ffc26..14333c18aaca6125bba54f1b056af0db384371e2 100644 (file)
--- a/block/quorum.c
+++ b/block/quorum.c
@@ -18,11 +18,11 @@
 #include "qemu/option.h"
 #include "block/block_int.h"
 #include "qapi/error.h"
+#include "qapi/qapi-events-block.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/qmp/qlist.h"
 #include "qapi/qmp/qstring.h"
-#include "qapi-event.h"
 #include "crypto/hash.h"
 
 #define HASH_LENGTH 32

diff --git a/block/sheepdog.c b/block/sheepdog.c
index ac02b10fe03d761f7fb0215bd90f34880444096f..215223053bb08e30b05a89f297c53d5b45c124ad 100644 (file)
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -13,8 +13,8 @@
  */
 
 #include "qemu/osdep.h"
-#include "qapi-visit.h"
 #include "qapi/error.h"
+#include "qapi/qapi-visit-sockets.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qobject-input-visitor.h"
 #include "qemu/uri.h"

diff --git a/block/ssh.c b/block/ssh.c
index b63addcf9483c6001b5deee07ada6c10893e9356..b11d4c5e862d61c438221ae3824e6f1ae2c98c83 100644 (file)
--- a/block/ssh.c
+++ b/block/ssh.c
@@ -34,7 +34,7 @@
 #include "qemu/cutils.h"
 #include "qemu/sockets.h"
 #include "qemu/uri.h"
-#include "qapi-visit.h"
+#include "qapi/qapi-visit-sockets.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qstring.h"
 #include "qapi/qobject-input-visitor.h"

diff --git a/block/throttle-groups.c b/block/throttle-groups.c
index f26bcb5eee466adafd3d65fdaef3abc5fa715ef5..36cc0430c329db35538e0fb6af4e7d70be221587 100644 (file)
--- a/block/throttle-groups.c
+++ b/block/throttle-groups.c
@@ -30,7 +30,7 @@
 #include "qemu/thread.h"
 #include "sysemu/qtest.h"
 #include "qapi/error.h"
-#include "qapi-visit.h"
+#include "qapi/qapi-visit-block-core.h"
 #include "qom/object.h"
 #include "qom/object_interfaces.h"
 

diff --git a/block/write-threshold.c b/block/write-threshold.c
index db3de0fa6d31c1e8c906e445e825ffda40002b63..1d48fc20774c8d6b3089238c815b2587cbb6ce31 100644 (file)
--- a/block/write-threshold.c
+++ b/block/write-threshold.c
@@ -15,9 +15,9 @@
 #include "qemu/coroutine.h"
 #include "block/write-threshold.h"
 #include "qemu/notify.h"
-#include "qapi-event.h"
 #include "qapi/error.h"
-#include "qmp-commands.h"
+#include "qapi/qapi-commands-block-core.h"
+#include "qapi/qapi-events-block-core.h"
 
 uint64_t bdrv_write_threshold_get(const BlockDriverState *bs)
 {

diff --git a/blockdev-nbd.c b/blockdev-nbd.c
index 3a5479bdad9f64a23b86f40af8636db5eab294ee..65a84739edc7ec005a62b33f074e61352217a682 100644 (file)
--- a/blockdev-nbd.c
+++ b/blockdev-nbd.c
@@ -14,8 +14,8 @@
 #include "sysemu/block-backend.h"
 #include "hw/block/block.h"
 #include "qapi/error.h"
+#include "qapi/qapi-commands-block.h"
 #include "sysemu/sysemu.h"
-#include "qmp-commands.h"
 #include "block/nbd.h"
 #include "io/channel-socket.h"
 #include "io/net-listener.h"

diff --git a/blockdev.c b/blockdev.c
index 3fb1ca803c58653dee99bb4a0fed97380c4f88f9..1fbfd3a2c40d9d9b495c616c209cfdca2da15031 100644 (file)
--- a/blockdev.c
+++ b/blockdev.c
@@ -40,10 +40,12 @@
 #include "qemu/error-report.h"
 #include "qemu/option.h"
 #include "qemu/config-file.h"
+#include "qapi/qapi-commands-block.h"
+#include "qapi/qapi-commands-transaction.h"
+#include "qapi/qapi-visit-block-core.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qnum.h"
 #include "qapi/qmp/qstring.h"
-#include "qapi-visit.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/qmp/qlist.h"
@@ -51,7 +53,6 @@
 #include "sysemu/sysemu.h"
 #include "sysemu/iothread.h"
 #include "block/block_int.h"
-#include "qmp-commands.h"
 #include "block/trace.h"
 #include "sysemu/arch_init.h"
 #include "sysemu/qtest.h"

diff --git a/blockjob.c b/blockjob.c
index 3f52f29f751c6dfc67100869a12c1f632ac58772..801d29d8496257dfe6dda0a0dab23be77f88a661 100644 (file)
--- a/blockjob.c
+++ b/blockjob.c
@@ -30,11 +30,11 @@
 #include "block/block_int.h"
 #include "sysemu/block-backend.h"
 #include "qapi/error.h"
+#include "qapi/qapi-events-block-core.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu/coroutine.h"
 #include "qemu/id.h"
 #include "qemu/timer.h"
-#include "qapi-event.h"
 
 /* Right now, this mutex is only needed to synchronize accesses to job->busy
  * and job->sleep_timer, such as concurrent calls to block_job_do_yield and

diff --git a/chardev/char-fe.c b/chardev/char-fe.c
index e5f870e4d21aff10542e3f9230d9e5a02e4bc843..392db78b13df0b1be0c0507d62c7dce04d7c4f0b 100644 (file)
--- a/chardev/char-fe.c
+++ b/chardev/char-fe.c
@@ -25,7 +25,6 @@
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
-#include "qapi-visit.h"
 #include "sysemu/replay.h"
 
 #include "chardev/char-fe.h"

diff --git a/chardev/char-ringbuf.c b/chardev/char-ringbuf.c
index 679afaa4fd5c3ab3b4ef4aa78a6ab6453f30cfd0..87832e27920ec78cab71db564b38f7fccaf3f19e 100644 (file)
--- a/chardev/char-ringbuf.c
+++ b/chardev/char-ringbuf.c
@@ -24,8 +24,8 @@
 
 #include "qemu/osdep.h"
 #include "chardev/char.h"
-#include "qmp-commands.h"
 #include "qapi/error.h"
+#include "qapi/qapi-commands-char.h"
 #include "qemu/base64.h"
 #include "qemu/option.h"
 

diff --git a/chardev/char-socket.c b/chardev/char-socket.c
index bdd6cff5f648f574f2fe01b37ba55a1fcb1c4f38..22f65971a1d81179010af8fd32c3a3171ad8757c 100644 (file)
--- a/chardev/char-socket.c
+++ b/chardev/char-socket.c
@@ -31,6 +31,7 @@
 #include "qemu/option.h"
 #include "qapi/error.h"
 #include "qapi/clone-visitor.h"
+#include "qapi/qapi-visit-sockets.h"
 
 #include "chardev/char-io.h"
 

diff --git a/chardev/char.c b/chardev/char.c
index c9a4da55163194370772d0d9a3aa81df5707cb28..5d7b079ef036ed6c6e180044eee5904938fecc4a 100644 (file)
--- a/chardev/char.c
+++ b/chardev/char.c
@@ -29,9 +29,8 @@
 #include "qemu/config-file.h"
 #include "qemu/error-report.h"
 #include "chardev/char.h"
-#include "qmp-commands.h"
-#include "qapi-visit.h"
 #include "qapi/error.h"
+#include "qapi/qapi-commands-char.h"
 #include "qapi/qmp/qerror.h"
 #include "sysemu/replay.h"
 #include "qemu/help_option.h"

diff --git a/cpus.c b/cpus.c
index af678264f6e2f477b3670d902e381a14fc123a0f..ac5b21ef076ae346dcf8b882903e0eab532326b8 100644 (file)
--- a/cpus.c
+++ b/cpus.c
@@ -27,6 +27,7 @@
 #include "cpu.h"
 #include "monitor/monitor.h"
 #include "qapi/error.h"
+#include "qapi/qapi-events-run-state.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu/error-report.h"
 #include "sysemu/sysemu.h"
@@ -49,7 +50,6 @@
 #include "qemu/bitmap.h"
 #include "qemu/seqlock.h"
 #include "tcg.h"
-#include "qapi-event.h"
 #include "hw/nmi.h"
 #include "sysemu/replay.h"
 #include "hw/boards.h"

diff --git a/crypto/cipherpriv.h b/crypto/cipherpriv.h
index 77da4c2f321ea3fb4b70cdd2963ceb3ec02e2a9c..0823239f4136802ef908adda9ca39f08dbf71ffb 100644 (file)
--- a/crypto/cipherpriv.h
+++ b/crypto/cipherpriv.h
@@ -15,7 +15,7 @@
 #ifndef QCRYPTO_CIPHERPRIV_H
 #define QCRYPTO_CIPHERPRIV_H
 
-#include "qapi-types.h"
+#include "qapi/qapi-types-crypto.h"
 
 typedef struct QCryptoCipherDriver QCryptoCipherDriver;
 

diff --git a/hmp.c b/hmp.c
index ae86bfbadebefd574c4f2fc24d4df74fefdeecc0..cc35a787f94b0d6327cca38c73f2a071e4456885 100644 (file)
--- a/hmp.c
+++ b/hmp.c
@@ -29,11 +29,11 @@
 #include "monitor/qdev.h"
 #include "qapi/error.h"
 #include "qapi/opts-visitor.h"
+#include "qapi-builtin-visit.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/string-input-visitor.h"
 #include "qapi/string-output-visitor.h"
-#include "qapi-visit.h"
 #include "qom/object_interfaces.h"
 #include "ui/console.h"
 #include "block/nbd.h"

diff --git a/hw/acpi/core.c b/hw/acpi/core.c
index b50b3ca772c5b71c8059cb40d97703bd663817ed..5d4ce925dcd93d7a1a6181370bbfb9618858ecc0 100644 (file)
--- a/hw/acpi/core.c
+++ b/hw/acpi/core.c
@@ -27,8 +27,8 @@
 #include "qemu/config-file.h"
 #include "qapi/error.h"
 #include "qapi/opts-visitor.h"
+#include "qapi/qapi-events-run-state.h"
 #include "qapi-visit.h"
-#include "qapi-event.h"
 #include "qemu/error-report.h"
 #include "qemu/option.h"
 

diff --git a/hw/block/block.c b/hw/block/block.c
index b0269c857fdfccd8e11f5e36fba106be4951e926..b91e2b6d7efe073b2e1fd3451ec1bbf68532b538 100644 (file)
--- a/hw/block/block.c
+++ b/hw/block/block.c
@@ -12,6 +12,7 @@
 #include "sysemu/block-backend.h"
 #include "hw/block/block.h"
 #include "qapi/error.h"
+#include "qapi/qapi-types-block.h"
 #include "qemu/error-report.h"
 
 void blkconf_serial(BlockConf *conf, char **serial)

diff --git a/hw/block/hd-geometry.c b/hw/block/hd-geometry.c
index 57ad5012a700a0dba6fc6225d66f7ad84dd44a51..79384a2b0a2360b4d302cd49b679719538204242 100644 (file)
--- a/hw/block/hd-geometry.c
+++ b/hw/block/hd-geometry.c
@@ -32,6 +32,7 @@
 
 #include "qemu/osdep.h"
 #include "sysemu/block-backend.h"
+#include "qapi/qapi-types-block.h"
 #include "qemu/bswap.h"
 #include "hw/block/block.h"
 #include "trace.h"

diff --git a/hw/char/virtio-console.c b/hw/char/virtio-console.c
index 4be5d4ee52481b68984ed45d54cbf8806f0e9086..679a8248884c0ae3960ae07ec28903fd4adeb9b4 100644 (file)
--- a/hw/char/virtio-console.c
+++ b/hw/char/virtio-console.c
@@ -15,8 +15,8 @@
 #include "qemu/error-report.h"
 #include "trace.h"
 #include "hw/virtio/virtio-serial.h"
-#include "qapi-event.h"
 #include "qapi/error.h"
+#include "qapi/qapi-events-char.h"
 
 #define TYPE_VIRTIO_CONSOLE_SERIAL_PORT "virtserialport"
 #define VIRTIO_CONSOLE(obj) \

diff --git a/hw/core/machine.c b/hw/core/machine.c
index 5d445839e89e194b1726671ec6cc5ce5543494ed..5e2bbcdacedbe81316367d6d86f31d3ce85d4875 100644 (file)
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -13,7 +13,7 @@
 #include "qemu/osdep.h"
 #include "hw/boards.h"
 #include "qapi/error.h"
-#include "qapi-visit.h"
+#include "qapi/qapi-visit-common.h"
 #include "qapi/visitor.h"
 #include "hw/sysbus.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 55e69d66fe6fd2e5c93d450f7a4eeb7b5854e0f2..94cfd40ef2c8d9fe954316c529c2f8eb11dd263e 100644 (file)
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -67,8 +67,8 @@
 #include "acpi-build.h"
 #include "hw/mem/pc-dimm.h"
 #include "qapi/error.h"
+#include "qapi/qapi-visit-common.h"
 #include "qapi/visitor.h"
-#include "qapi-visit.h"
 #include "qom/cpu.h"
 #include "hw/nmi.h"
 #include "hw/i386/intel_iommu.h"

diff --git a/hw/mem/nvdimm.c b/hw/mem/nvdimm.c
index 61e677f92ff2d407b01f60d0c95e5ea8db861465..acb656b67250badae6a3885654771d72300c8c60 100644 (file)
--- a/hw/mem/nvdimm.c
+++ b/hw/mem/nvdimm.c
@@ -25,7 +25,6 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"
-#include "qapi-visit.h"
 #include "hw/mem/nvdimm.h"
 
 static void nvdimm_get_label_size(Object *obj, Visitor *v, const char *name,

diff --git a/hw/net/rocker/qmp-norocker.c b/hw/net/rocker/qmp-norocker.c
index 94c1e480aeda28cb511a436bf5c06bd099b119de..0d60513c01bc24ca3d71a51113ff5aff6798b296 100644 (file)
--- a/hw/net/rocker/qmp-norocker.c
+++ b/hw/net/rocker/qmp-norocker.c
@@ -17,8 +17,8 @@
 
 #include "qemu/osdep.h"
 #include "qemu-common.h"
-#include "qmp-commands.h"
 #include "qapi/error.h"
+#include "qapi/qapi-commands-rocker.h"
 #include "qapi/qmp/qerror.h"
 
 RockerSwitch *qmp_query_rocker(const char *name, Error **errp)

diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c
index a2a76c2a74605870346d9f84beacd4b2f5b41506..c02cbefece89f5368b07b7875c00db0e61b64198 100644 (file)
--- a/hw/net/rocker/rocker.c
+++ b/hw/net/rocker/rocker.c
@@ -22,9 +22,9 @@
 #include "net/net.h"
 #include "net/eth.h"
 #include "qapi/error.h"
+#include "qapi/qapi-commands-rocker.h"
 #include "qemu/iov.h"
 #include "qemu/bitops.h"
-#include "qmp-commands.h"
 
 #include "rocker.h"
 #include "rocker_hw.h"

diff --git a/hw/net/rocker/rocker_fp.c b/hw/net/rocker/rocker_fp.c
index 4b3c9847db7c4c7b9ca9311ea0521f5804a21c86..27b17c890f8a2950910384922e8c7695c2fcecad 100644 (file)
--- a/hw/net/rocker/rocker_fp.c
+++ b/hw/net/rocker/rocker_fp.c
@@ -16,7 +16,7 @@
 
 #include "qemu/osdep.h"
 #include "net/clients.h"
-
+#include "qapi/qapi-types-rocker.h"
 #include "rocker.h"
 #include "rocker_hw.h"
 #include "rocker_fp.h"

diff --git a/hw/net/rocker/rocker_of_dpa.c b/hw/net/rocker/rocker_of_dpa.c
index 9339df2d0931721cb41096d5405fa0d6e0c898ba..60046720a563dbffbbdb16cb45b8105c785f3f51 100644 (file)
--- a/hw/net/rocker/rocker_of_dpa.c
+++ b/hw/net/rocker/rocker_of_dpa.c
@@ -17,9 +17,9 @@
 #include "qemu/osdep.h"
 #include "net/eth.h"
 #include "qapi/error.h"
+#include "qapi/qapi-commands-rocker.h"
 #include "qemu/iov.h"
 #include "qemu/timer.h"
-#include "qmp-commands.h"
 
 #include "rocker.h"
 #include "rocker_hw.h"

diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 369d40b3782eb6ef02c8716c9b6b12dcc56ab10c..188744e17d5784c2e98fa170fa5d9e7571b4f98d 100644 (file)
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -23,7 +23,7 @@
 #include "net/vhost_net.h"
 #include "hw/virtio/virtio-bus.h"
 #include "qapi/error.h"
-#include "qapi-event.h"
+#include "qapi/qapi-events-net.h"
 #include "hw/virtio/virtio-access.h"
 #include "migration/misc.h"
 

diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c
index 4bb939d3d111f4086ab97bdd68a4e69c1c1bbd01..0ec5fa4cfe43fb37454b21198ea8e319644043f8 100644 (file)
--- a/hw/ppc/spapr_rtas.c
+++ b/hw/ppc/spapr_rtas.c
@@ -38,7 +38,6 @@
 #include "hw/ppc/spapr_vio.h"
 #include "hw/ppc/spapr_rtas.h"
 #include "hw/ppc/ppc.h"
-#include "qapi-event.h"
 #include "hw/boards.h"
 
 #include <libfdt.h>

diff --git a/hw/tpm/tpm_emulator.c b/hw/tpm/tpm_emulator.c
index b787aee13bc6ea375d62aed4ae8ae67d2f5f6c79..f187a72c101597b0250429110118efaf9e8a14cc 100644 (file)
--- a/hw/tpm/tpm_emulator.c
+++ b/hw/tpm/tpm_emulator.c
@@ -38,6 +38,7 @@
 #include "migration/blocker.h"
 #include "qapi/error.h"
 #include "qapi/clone-visitor.h"
+#include "qapi/qapi-visit-tpm.h"
 #include "chardev/char-fe.h"
 
 #define DEBUG_TPM 0

diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c
index a495fe07f4a8c731f27ed6f58e5b60f0dee9533b..211df3191c96a2e79fc4326067848832d0de318a 100644 (file)
--- a/hw/tpm/tpm_passthrough.c
+++ b/hw/tpm/tpm_passthrough.c
@@ -30,6 +30,7 @@
 #include "tpm_int.h"
 #include "hw/hw.h"
 #include "qapi/clone-visitor.h"
+#include "qapi/qapi-visit-tpm.h"
 #include "tpm_util.h"
 
 #define DEBUG_TPM 0

diff --git a/hw/watchdog/watchdog.c b/hw/watchdog/watchdog.c
index 98a5dd6689e62543bb9de75fcda9f53eee7be7d5..c7843d5748a080bec57e6605e4da02b08733c2c5 100644 (file)
--- a/hw/watchdog/watchdog.c
+++ b/hw/watchdog/watchdog.c
@@ -24,9 +24,9 @@
 #include "qemu/config-file.h"
 #include "qemu/queue.h"
 #include "qapi/error.h"
+#include "qapi/qapi-events-run-state.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/watchdog.h"
-#include "qapi-event.h"
 #include "hw/nmi.h"
 #include "qemu/help_option.h"
 #include "qmp-commands.h"

diff --git a/include/block/block.h b/include/block/block.h
index 19b3ab9cb5ee3e86d419a361fc273fc450d6abf6..fac401ba3e679681be77cbbd8681e6891e3efef0 100644 (file)
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -2,7 +2,7 @@
 #define BLOCK_H
 
 #include "block/aio.h"
-#include "qapi-types.h"
+#include "qapi/qapi-types-block-core.h"
 #include "qemu/iov.h"
 #include "qemu/coroutine.h"
 #include "block/accounting.h"

diff --git a/include/block/dirty-bitmap.h b/include/block/dirty-bitmap.h
index e3f4bbf51dc31b100cf7539fa4daa435b459e6e4..09efec609f67050a64f1e7b34bcedf731bac3a9d 100644 (file)
--- a/include/block/dirty-bitmap.h
+++ b/include/block/dirty-bitmap.h
@@ -2,7 +2,7 @@
 #define BLOCK_DIRTY_BITMAP_H
 
 #include "qemu-common.h"
-#include "qapi-types.h"
+#include "qapi/qapi-types-block-core.h"
 #include "qemu/hbitmap.h"
 
 BdrvDirtyBitmap *bdrv_create_dirty_bitmap(BlockDriverState *bs,

diff --git a/include/block/nbd.h b/include/block/nbd.h
index 495564c73a425d2371a8b86221932909381fd98e..2285637e67360cf9ee2f80fd7f4a48d5465fdf49 100644 (file)
--- a/include/block/nbd.h
+++ b/include/block/nbd.h
@@ -20,7 +20,7 @@
 #ifndef NBD_H
 #define NBD_H
 
-
+#include "qapi/qapi-types-block.h"
 #include "io/channel-socket.h"
 #include "crypto/tlscreds.h"
 

diff --git a/include/chardev/char.h b/include/chardev/char.h
index a381dc3df86b5b7456dc8d2a599b6520548a03e8..ebf1e0ba04890b4e89f15fe12ae61f8b99341e5f 100644 (file)
--- a/include/chardev/char.h
+++ b/include/chardev/char.h
@@ -1,6 +1,7 @@
 #ifndef QEMU_CHAR_H
 #define QEMU_CHAR_H
 
+#include "qapi/qapi-types-char.h"
 #include "qemu/main-loop.h"
 #include "qemu/bitmap.h"
 #include "qom/object.h"

diff --git a/include/crypto/cipher.h b/include/crypto/cipher.h
index 984fb8243f091a607f75b7e5ae720d705b0845e1..bce2d4c8e46149fd8c2e3d2fa42029ae5ebf3156 100644 (file)
--- a/include/crypto/cipher.h
+++ b/include/crypto/cipher.h
@@ -21,7 +21,7 @@
 #ifndef QCRYPTO_CIPHER_H
 #define QCRYPTO_CIPHER_H
 
-#include "qapi-types.h"
+#include "qapi/qapi-types-crypto.h"
 
 typedef struct QCryptoCipher QCryptoCipher;
 

diff --git a/include/crypto/hash.h b/include/crypto/hash.h
index ca3267f3dfd1d48eb941960da794587e2e028d08..077ac7bea0e3eb1ef8612d192d0318c59c7fe7b6 100644 (file)
--- a/include/crypto/hash.h
+++ b/include/crypto/hash.h
@@ -21,7 +21,7 @@
 #ifndef QCRYPTO_HASH_H
 #define QCRYPTO_HASH_H
 
-#include "qapi-types.h"
+#include "qapi/qapi-types-crypto.h"
 
 /* See also "QCryptoHashAlgorithm" defined in qapi/crypto.json */
 

diff --git a/include/crypto/hmac.h b/include/crypto/hmac.h
index 5e889059896e75fc8f35fd4e4b6cd7d268a825df..aa3c97a2ffa163dfafd8dcd0b4909c0de421ba6a 100644 (file)
--- a/include/crypto/hmac.h
+++ b/include/crypto/hmac.h
@@ -12,7 +12,7 @@
 #ifndef QCRYPTO_HMAC_H
 #define QCRYPTO_HMAC_H
 
-#include "qapi-types.h"
+#include "qapi/qapi-types-crypto.h"
 
 typedef struct QCryptoHmac QCryptoHmac;
 struct QCryptoHmac {

diff --git a/include/crypto/secret.h b/include/crypto/secret.h
index 07a963e7940a4f4fd9dcffb5ae1f1efec95b5e5a..edd0e13236698de916b023081886d2d7a5f3f024 100644 (file)
--- a/include/crypto/secret.h
+++ b/include/crypto/secret.h
@@ -21,6 +21,7 @@
 #ifndef QCRYPTO_SECRET_H
 #define QCRYPTO_SECRET_H
 
+#include "qapi/qapi-types-crypto.h"
 #include "qom/object.h"
 
 #define TYPE_QCRYPTO_SECRET "secret"

diff --git a/include/crypto/tlscreds.h b/include/crypto/tlscreds.h
index ad47d88be77116868d00243e250f86000ea7760a..6b011e1dbc623c3c50368039a45f6066ea3ac471 100644 (file)
--- a/include/crypto/tlscreds.h
+++ b/include/crypto/tlscreds.h
@@ -21,6 +21,7 @@
 #ifndef QCRYPTO_TLSCREDS_H
 #define QCRYPTO_TLSCREDS_H
 
+#include "qapi/qapi-types-crypto.h"
 #include "qom/object.h"
 
 #ifdef CONFIG_GNUTLS

diff --git a/include/hw/block/block.h b/include/hw/block/block.h
index f532d10e3553d0202e519bb53e3e6748457cac44..d4f4dfffab91d3f593a1f9821b72b77b4b20252b 100644 (file)
--- a/include/hw/block/block.h
+++ b/include/hw/block/block.h
@@ -12,7 +12,7 @@
 #define HW_BLOCK_H
 
 #include "qemu-common.h"
-#include "qapi-types.h"
+#include "qapi/qapi-types-block-core.h"
 
 /* Configuration */
 

diff --git a/include/hw/block/fdc.h b/include/hw/block/fdc.h
index 68a0c904eaf8f15d7ed5542fccc7ac8000d9e521..3b813c7f7d61168a1c8752eaad20e3e228a3b7c2 100644 (file)
--- a/include/hw/block/fdc.h
+++ b/include/hw/block/fdc.h
@@ -2,7 +2,7 @@
 #define HW_FDC_H
 
 #include "qemu-common.h"
-#include "qapi-types.h"
+#include "qapi/qapi-types-block.h"
 
 /* fdc.c */
 #define MAX_FD 2

diff --git a/include/hw/ppc/spapr_drc.h b/include/hw/ppc/spapr_drc.h
index f8d9f5b231cf1244adabd64e9f6e15393e907548..f6ff32e7e2f227e2e4fb3e623f83afd8c537a385 100644 (file)
--- a/include/hw/ppc/spapr_drc.h
+++ b/include/hw/ppc/spapr_drc.h
@@ -14,6 +14,7 @@
 #define HW_SPAPR_DRC_H
 
 #include <libfdt.h>
+#include "qapi/qapi-types-run-state.h"
 #include "qom/object.h"
 #include "sysemu/sysemu.h"
 #include "hw/qdev.h"

diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h
index 1d61a351086df938d436e23600f531be4bd55f97..40c2c8acb1aa0f86a90424f004b39b5bb6c46438 100644 (file)
--- a/include/hw/qdev-properties.h
+++ b/include/hw/qdev-properties.h
@@ -1,6 +1,7 @@
 #ifndef QEMU_QDEV_PROPERTIES_H
 #define QEMU_QDEV_PROPERTIES_H
 
+#include "qapi-types.h"
 #include "hw/qdev-core.h"
 
 /*** qdev-properties.c ***/

diff --git a/include/io/dns-resolver.h b/include/io/dns-resolver.h
index 2f69c08c13f9778fb68cbc75b85df121d4dc20b0..1a162185cc663b7e2af346c77cf87b1b61146720 100644 (file)
--- a/include/io/dns-resolver.h
+++ b/include/io/dns-resolver.h
@@ -22,6 +22,7 @@
 #define QIO_DNS_RESOLVER_H
 
 #include "qemu-common.h"
+#include "qapi/qapi-types-sockets.h"
 #include "qom/object.h"
 #include "io/task.h"
 

diff --git a/include/migration/colo.h b/include/migration/colo.h
index 50ace162059d81ef24bf99b512d5e96b7c98f829..2fe48ad3535bada0fb77d4282184f6a5f7bed395 100644 (file)
--- a/include/migration/colo.h
+++ b/include/migration/colo.h
@@ -14,7 +14,7 @@
 #define QEMU_COLO_H
 
 #include "qemu-common.h"
-#include "qapi-types.h"
+#include "qapi/qapi-types-migration.h"
 
 void colo_info_init(void);
 

diff --git a/include/migration/failover.h b/include/migration/failover.h
index ad91ef238198d4f96bc6e62bb29a25be5237f754..4c37218dcc186a65432be74bfdd09b67f5b1ee40 100644 (file)
--- a/include/migration/failover.h
+++ b/include/migration/failover.h
@@ -14,7 +14,7 @@
 #define QEMU_FAILOVER_H
 
 #include "qemu-common.h"
-#include "qapi-types.h"
+#include "qapi/qapi-types-migration.h"
 
 void failover_init_state(void);
 FailoverStatus failover_set_state(FailoverStatus old_state,

diff --git a/include/migration/global_state.h b/include/migration/global_state.h
index d307de8350ed214812dcca59c5ef260d42dfc8c5..fd22dd303457b7cb73ff8cb80f233deb5167069d 100644 (file)
--- a/include/migration/global_state.h
+++ b/include/migration/global_state.h
@@ -13,6 +13,7 @@
 #ifndef QEMU_MIGRATION_GLOBAL_STATE_H
 #define QEMU_MIGRATION_GLOBAL_STATE_H
 
+#include "qapi/qapi-types-run-state.h"
 #include "sysemu/sysemu.h"
 
 void register_global_state(void);

diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h
index ad64ad8e682461b2f04723cd79adb907fdbd1b6a..50f7cea057da62691f245663dd309435f8d1b34d 100644 (file)
--- a/include/monitor/monitor.h
+++ b/include/monitor/monitor.h
@@ -3,6 +3,7 @@
 
 #include "qemu-common.h"
 #include "block/block.h"
+#include "qapi-types.h"
 #include "qemu/readline.h"
 
 extern Monitor *cur_mon;

diff --git a/include/net/filter.h b/include/net/filter.h
index 0c4a2ea6c90f4a1676d0e7c27ae408ed85514489..435acd6f82cf0fe81d9533a772386020e4774c28 100644 (file)
--- a/include/net/filter.h
+++ b/include/net/filter.h
@@ -9,6 +9,7 @@
 #ifndef QEMU_NET_FILTER_H
 #define QEMU_NET_FILTER_H
 
+#include "qapi/qapi-types-net.h"
 #include "qom/object.h"
 #include "qemu-common.h"
 #include "net/queue.h"

diff --git a/include/net/net.h b/include/net/net.h
index 3fc48e4f51a0eb0e7179a7208f106d2b9a2415d9..727643032cf3d5657d6d2e3092ca5033375d3f48 100644 (file)
--- a/include/net/net.h
+++ b/include/net/net.h
@@ -2,7 +2,7 @@
 #define QEMU_NET_H
 
 #include "qemu/queue.h"
-#include "qapi-types.h"
+#include "qapi/qapi-types-net.h"
 #include "net/queue.h"
 #include "migration/vmstate.h"
 

diff --git a/include/qapi/clone-visitor.h b/include/qapi/clone-visitor.h
index b119d3daa99018fc4b6be233dab37125c2ecea8f..5b665ee38c6b0493f9067328efdb111803326c07 100644 (file)
--- a/include/qapi/clone-visitor.h
+++ b/include/qapi/clone-visitor.h
@@ -12,7 +12,6 @@
 #define QAPI_CLONE_VISITOR_H
 
 #include "qapi/visitor.h"
-#include "qapi-visit.h"
 
 /*
  * The clone visitor is for direct use only by the QAPI_CLONE() macro;

diff --git a/include/qapi/error.h b/include/qapi/error.h
index c2115a6a4aa6fad36d54b56fc5d7324bae92580f..bcb86a79f5e2547dc1959282531c237bafde26e7 100644 (file)
--- a/include/qapi/error.h
+++ b/include/qapi/error.h
@@ -115,7 +115,7 @@
 #ifndef ERROR_H
 #define ERROR_H
 
-#include "qapi-types.h"
+#include "qapi/qapi-types-common.h"
 
 /*
  * Overall category of an error.

diff --git a/include/qapi/qmp/qobject.h b/include/qapi/qmp/qobject.h
index 38ac68845cc9ebd8bbc7ef7f6138af083bb5a346..a2964fbf254ed3730ee73aadd08aa4b7574cc4cd 100644 (file)
--- a/include/qapi/qmp/qobject.h
+++ b/include/qapi/qmp/qobject.h
@@ -32,7 +32,7 @@
 #ifndef QOBJECT_H
 #define QOBJECT_H
 
-#include "qapi-types.h"
+#include "qapi-builtin-types.h"
 
 struct QObject {
     QType type;

diff --git a/include/qapi/visitor.h b/include/qapi/visitor.h
index ecff296c11a0f8014e451aa68e1a219c2d18de3f..9e57508446ebb844007495fa95dd764219f27529 100644 (file)
--- a/include/qapi/visitor.h
+++ b/include/qapi/visitor.h
@@ -15,7 +15,7 @@
 #ifndef QAPI_VISITOR_H
 #define QAPI_VISITOR_H
 
-#include "qapi-types.h"
+#include "qapi-builtin-types.h"
 
 /*
  * The QAPI schema defines both a set of C data types, and a QMP wire

diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h
index 8889bcb1ecf9a947ee24e4421bcd02b20d74e10b..e88d4c37abe9ad30fe10b25a53a72183dd2a2e4b 100644 (file)
--- a/include/qemu/sockets.h
+++ b/include/qemu/sockets.h
@@ -9,7 +9,7 @@ int inet_aton(const char *cp, struct in_addr *ia);
 
 #endif /* !_WIN32 */
 
-#include "qapi-types.h"
+#include "qapi/qapi-types-sockets.h"
 
 /* misc helpers */
 int qemu_socket(int domain, int type, int protocol);

diff --git a/include/qemu/throttle.h b/include/qemu/throttle.h
index 03d45f44f87fbc20f96ab12740a1845610146cae..abeb886d93cff16b8cb97d47923c844aee868505 100644 (file)
--- a/include/qemu/throttle.h
+++ b/include/qemu/throttle.h
@@ -26,7 +26,7 @@
 #define THROTTLE_H
 
 #include "qemu-common.h"
-#include "qapi-types.h"
+#include "qapi/qapi-types-block-core.h"
 #include "qemu/timer.h"
 
 #define THROTTLE_VALUE_MAX 1000000000000000LL

diff --git a/include/qom/cpu.h b/include/qom/cpu.h
index aff88fa16f6340f64c0c0a1e2c0490f9a8a02c6e..dc6d4956a818b8b7d8c08ef9568ffc772012086f 100644 (file)
--- a/include/qom/cpu.h
+++ b/include/qom/cpu.h
@@ -24,6 +24,7 @@
 #include "disas/bfd.h"
 #include "exec/hwaddr.h"
 #include "exec/memattrs.h"
+#include "qapi/qapi-types-run-state.h"
 #include "qemu/bitmap.h"
 #include "qemu/queue.h"
 #include "qemu/thread.h"

diff --git a/include/qom/object.h b/include/qom/object.h
index dc73d59660c2b501062c41c1aae74488fbad8fc4..5b5c016d8fab5684500573507f69b2c0dfc56bd0 100644 (file)
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -14,7 +14,7 @@
 #ifndef QEMU_OBJECT_H
 #define QEMU_OBJECT_H
 
-#include "qapi-types.h"
+#include "qapi-builtin-types.h"
 #include "qemu/queue.h"
 
 struct TypeImpl;

diff --git a/include/sysemu/dump.h b/include/sysemu/dump.h
index c14bcfe8c60b008a961fdee15495d8b9b1f636d7..2424e314255dc8e050b4520b43b885b7b6ba9f1f 100644 (file)
--- a/include/sysemu/dump.h
+++ b/include/sysemu/dump.h
@@ -14,6 +14,8 @@
 #ifndef DUMP_H
 #define DUMP_H
 
+#include "qapi-types.h"
+
 #define MAKEDUMPFILE_SIGNATURE      "makedumpfile"
 #define MAX_SIZE_MDF_HEADER         (4096) /* max size of makedumpfile_header */
 #define TYPE_FLAT_HEADER            (1)    /* type of flattened format */

diff --git a/include/sysemu/hostmem.h b/include/sysemu/hostmem.h
index d5ab0b99c6164fa649c6915a3246d0a3c0eab79a..e1efaf04ac7a9b47179138cb8dee16774e492953 100644 (file)
--- a/include/sysemu/hostmem.h
+++ b/include/sysemu/hostmem.h
@@ -14,6 +14,7 @@
 #define SYSEMU_HOSTMEM_H
 
 #include "sysemu/sysemu.h" /* for MAX_NODES */
+#include "qapi-types.h"
 #include "qom/object.h"
 #include "exec/memory.h"
 #include "qemu/bitmap.h"

diff --git a/include/sysemu/replay.h b/include/sysemu/replay.h
index dc8ae7b6b11c06412cbf5303e67474ded053fa28..fb533ed9b6a39d13ad70a8e47275e1e71d0a9cc1 100644 (file)
--- a/include/sysemu/replay.h
+++ b/include/sysemu/replay.h
@@ -13,6 +13,7 @@
  */
 
 #include "sysemu.h"
+#include "qapi-types.h"
 
 /* replay clock kinds */
 enum ReplayClockKind {

diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index 77bb3da5828e633ac33e9ba013bebe1b58f246e8..bfbef9e69ca7f7addaafd8282d6390abfa8fc9f0 100644 (file)
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -2,6 +2,7 @@
 #define SYSEMU_H
 /* Misc. things related to the system emulator.  */
 
+#include "qapi/qapi-types-run-state.h"
 #include "qemu/queue.h"
 #include "qemu/timer.h"
 #include "qemu/notify.h"

diff --git a/include/sysemu/tpm.h b/include/sysemu/tpm.h
index 32b753d4f3e64fd345d4cc516142006c181ff437..9ae1ab6da3b7105b7f0dc2cee382316876993bd8 100644 (file)
--- a/include/sysemu/tpm.h
+++ b/include/sysemu/tpm.h
@@ -12,6 +12,7 @@
 #ifndef QEMU_TPM_H
 #define QEMU_TPM_H
 
+#include "qapi/qapi-types-tpm.h"
 #include "qom/object.h"
 
 int tpm_config_parse(QemuOptsList *opts_list, const char *optarg);

diff --git a/include/sysemu/watchdog.h b/include/sysemu/watchdog.h
index 677ace394572440f34a5d94c7fc2b5160ab61adb..a08d16380d798f2737118e0b978272310f5d9433 100644 (file)
--- a/include/sysemu/watchdog.h
+++ b/include/sysemu/watchdog.h
@@ -23,7 +23,7 @@
 #define QEMU_WATCHDOG_H
 
 #include "qemu/queue.h"
-#include "qapi-types.h"
+#include "qapi/qapi-types-run-state.h"
 
 struct WatchdogTimerModel {
     QLIST_ENTRY(WatchdogTimerModel) entry;

diff --git a/include/ui/console.h b/include/ui/console.h
index f29bacd62559278156f0dd5b66cddd45f603a9c9..e0d81f1144b4119e113c2be28a54ff4a9d833961 100644 (file)
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -5,6 +5,7 @@
 #include "qom/object.h"
 #include "qemu/notify.h"
 #include "qemu/error-report.h"
+#include "qapi/qapi-types-ui.h"
 
 #ifdef CONFIG_OPENGL
 # include <epoxy/gl.h>

diff --git a/include/ui/input.h b/include/ui/input.h
index ceb22b8eef70bae947338e6135e57b39b203bdaf..16395ab8f28e62602b0dcf83c4e1496b1e0f95f1 100644 (file)
--- a/include/ui/input.h
+++ b/include/ui/input.h
@@ -1,7 +1,7 @@
 #ifndef INPUT_H
 #define INPUT_H
 
-#include "qapi-types.h"
+#include "qapi/qapi-types-ui.h"
 
 #define INPUT_EVENT_MASK_KEY   (1<<INPUT_EVENT_KIND_KEY)
 #define INPUT_EVENT_MASK_BTN   (1<<INPUT_EVENT_KIND_BTN)

diff --git a/io/channel-socket.c b/io/channel-socket.c
index 563e297357c35dc0c9c97494fb347a2b66c395b4..8359b6683acfb27608ed5f424295be860fc17890 100644 (file)
--- a/io/channel-socket.c
+++ b/io/channel-socket.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qapi/qapi-visit-sockets.h"
 #include "io/channel-socket.h"
 #include "io/channel-watch.h"
 #include "trace.h"

diff --git a/io/dns-resolver.c b/io/dns-resolver.c
index c072d121c3a47cf565007e1d7bd985ae5094fa88..8c924071c410acef876eb621bfdec07d37075bd2 100644 (file)
--- a/io/dns-resolver.c
+++ b/io/dns-resolver.c
@@ -21,6 +21,7 @@
 #include "qemu/osdep.h"
 #include "io/dns-resolver.h"
 #include "qapi/clone-visitor.h"
+#include "qapi/qapi-visit-sockets.h"
 #include "qemu/sockets.h"
 #include "qapi/error.h"
 #include "qemu/cutils.h"

diff --git a/migration/colo-failover.c b/migration/colo-failover.c
index 891785cb6315ee8b7585562211ba0cec6ef15798..0ae0c4122125e90d15467df8b1ab492c9b30e6eb 100644 (file)
--- a/migration/colo-failover.c
+++ b/migration/colo-failover.c
@@ -15,8 +15,8 @@
 #include "migration/failover.h"
 #include "qemu/main-loop.h"
 #include "migration.h"
-#include "qmp-commands.h"
 #include "qapi/error.h"
+#include "qapi/qapi-commands-migration.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu/error-report.h"
 #include "trace.h"

diff --git a/migration/colo.c b/migration/colo.c
index 245a46d59dea5eefaf189fb93393587fb243a4d4..4381067ed4c54dd8b93ae625ec29ed2a706bded6 100644 (file)
--- a/migration/colo.c
+++ b/migration/colo.c
@@ -13,6 +13,7 @@
 #include "qemu/osdep.h"
 #include "sysemu/sysemu.h"
 #include "qapi/error.h"
+#include "qapi/qapi-commands-migration.h"
 #include "qemu-file-channel.h"
 #include "migration.h"
 #include "qemu-file.h"
@@ -24,7 +25,6 @@
 #include "qemu/error-report.h"
 #include "migration/failover.h"
 #include "replication.h"
-#include "qmp-commands.h"
 
 static bool vmstate_loading;
 

diff --git a/migration/migration.c b/migration/migration.c
index 0aa596f8678ae1ee92aedb71e2dfa72b60000caa..e345d0cc7e8c3fee0580d5b9c46c05113f3e183b 100644 (file)
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -31,15 +31,15 @@
 #include "migration/vmstate.h"
 #include "block/block.h"
 #include "qapi/error.h"
+#include "qapi/qapi-commands-migration.h"
+#include "qapi/qapi-events-migration.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/qmp/qnull.h"
 #include "qemu/rcu.h"
 #include "block.h"
 #include "postcopy-ram.h"
 #include "qemu/thread.h"
-#include "qmp-commands.h"
 #include "trace.h"
-#include "qapi-event.h"
 #include "exec/target_page.h"
 #include "io/channel-buffer.h"
 #include "migration/colo.h"

diff --git a/migration/migration.h b/migration/migration.h
index 82cf926b170529511a502957168d48449ecc60db..08c5d2ded1414496f571ca645645b274174609ef 100644 (file)
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -15,6 +15,7 @@
 #define QEMU_MIGRATION_H
 
 #include "qemu-common.h"
+#include "qapi/qapi-types-migration.h"
 #include "qemu/thread.h"
 #include "exec/cpu-common.h"
 #include "qemu/coroutine_int.h"

diff --git a/migration/ram.c b/migration/ram.c
index 5e33e5cc7901f2dc58d055a41ec36535a5937498..3b6c077964b84c11755a7ef3f60f5cfc02475cc2 100644 (file)
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -29,7 +29,6 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include <zlib.h>
-#include "qapi-event.h"
 #include "qemu/cutils.h"
 #include "qemu/bitops.h"
 #include "qemu/bitmap.h"
@@ -44,6 +43,7 @@
 #include "migration/page_cache.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
+#include "qapi/qapi-events-migration.h"
 #include "qapi/qmp/qerror.h"
 #include "trace.h"
 #include "exec/ram_addr.h"

diff --git a/migration/ram.h b/migration/ram.h
index f3a227b4fcc816fc43120988f9cd33364bf9644c..53f0021c5188b47b701afb28230117008d775b53 100644 (file)
--- a/migration/ram.h
+++ b/migration/ram.h
@@ -30,7 +30,7 @@
 #define QEMU_MIGRATION_RAM_H
 
 #include "qemu-common.h"
-#include "qapi-types.h"
+#include "qapi/qapi-types-migration.h"
 #include "exec/cpu-common.h"
 
 extern MigrationStats ram_counters;

diff --git a/net/colo-compare.c b/net/colo-compare.c
index 76e03fdb1407d15d4efb17621df2e33796c58ea2..23b2d2c4cc662ffd4998eab7f4655cb3437c2f80 100644 (file)
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -25,7 +25,6 @@
 #include "net/queue.h"
 #include "chardev/char-fe.h"
 #include "qemu/sockets.h"
-#include "qapi-visit.h"
 #include "net/colo.h"
 #include "sysemu/iothread.h"
 

diff --git a/net/filter-buffer.c b/net/filter-buffer.c
index 9ce96aaa35466892468ba222a7147d7be70e525e..7c487629f9295a6f1f53f2155326e37b3d4d8c95 100644 (file)
--- a/net/filter-buffer.c
+++ b/net/filter-buffer.c
@@ -13,8 +13,8 @@
 #include "qemu-common.h"
 #include "qemu/timer.h"
 #include "qemu/iov.h"
+#include "qapi-builtin-visit.h"
 #include "qapi/qmp/qerror.h"
-#include "qapi-visit.h"
 #include "qom/object.h"
 
 #define TYPE_FILTER_BUFFER "filter-buffer"

diff --git a/net/filter-mirror.c b/net/filter-mirror.c
index bd78e25d1270c0437b6b6b41f4269b77c71e43f4..3a61cf21e8c9f3f5a66e4df97247acc9a9b1cbf5 100644 (file)
--- a/net/filter-mirror.c
+++ b/net/filter-mirror.c
@@ -14,7 +14,6 @@
 #include "net/net.h"
 #include "qemu-common.h"
 #include "qapi/error.h"
-#include "qapi-visit.h"
 #include "qom/object.h"
 #include "qemu/main-loop.h"
 #include "qemu/error-report.h"

diff --git a/net/filter-rewriter.c b/net/filter-rewriter.c
index 6201494ceb83d067a5d236ea7d03ec3e6b65469e..62dad2d773c9c4900cff99dbbf337188f2d69ab9 100644 (file)
--- a/net/filter-rewriter.c
+++ b/net/filter-rewriter.c
@@ -16,7 +16,6 @@
 #include "net/net.h"
 #include "qemu-common.h"
 #include "qemu/error-report.h"
-#include "qapi-visit.h"
 #include "qom/object.h"
 #include "qemu/main-loop.h"
 #include "qemu/iov.h"

diff --git a/net/net.c b/net/net.c
index 7d429252586fef2e9010006cf8b2353311dd66c6..547c499110539b3dc4798d0546f4c0fcc2dd133a 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -33,18 +33,18 @@
 
 #include "monitor/monitor.h"
 #include "qemu/help_option.h"
+#include "qapi/qapi-commands-net.h"
+#include "qapi/qapi-visit-net.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu/error-report.h"
 #include "qemu/sockets.h"
 #include "qemu/cutils.h"
 #include "qemu/config-file.h"
-#include "qmp-commands.h"
 #include "hw/qdev.h"
 #include "qemu/iov.h"
 #include "qemu/main-loop.h"
 #include "qemu/option.h"
-#include "qapi-visit.h"
 #include "qapi/error.h"
 #include "qapi/opts-visitor.h"
 #include "sysemu/sysemu.h"

diff --git a/net/tap_int.h b/net/tap_int.h
index ae6888f74ae04df497bb16ab720aa0ca17f47c5b..9f931d52d6176beb882fda9732c8ed35e4539383 100644 (file)
--- a/net/tap_int.h
+++ b/net/tap_int.h
@@ -27,7 +27,7 @@
 #define NET_TAP_INT_H
 
 #include "qemu-common.h"
-#include "qapi-types.h"
+#include "qapi/qapi-types-net.h"
 
 int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
              int vnet_hdr_required, int mq_required, Error **errp);

diff --git a/net/vhost-user.c b/net/vhost-user.c
index d024573e45f6895a3e093b69a5ff494516b8bd14..e0f16c895b51ec8b2dfd6da8d49e06280a21c545 100644 (file)
--- a/net/vhost-user.c
+++ b/net/vhost-user.c
@@ -14,10 +14,10 @@
 #include "net/vhost-user.h"
 #include "chardev/char-fe.h"
 #include "qapi/error.h"
+#include "qapi/qapi-commands-net.h"
 #include "qemu/config-file.h"
 #include "qemu/error-report.h"
 #include "qemu/option.h"
-#include "qmp-commands.h"
 #include "trace.h"
 
 typedef struct VhostUserState {

diff --git a/qemu-img.c b/qemu-img.c
index 56edc152181de05e3dc20b2de4f6a3aaec187aa9..40bf7aa7d15dd9ee76454d1f570492258667df64 100644 (file)
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -27,7 +27,7 @@
 
 #include "qemu-version.h"
 #include "qapi/error.h"
-#include "qapi-visit.h"
+#include "qapi/qapi-visit-block-core.h"
 #include "qapi/qobject-output-visitor.h"
 #include "qapi/qmp/qjson.h"
 #include "qapi/qmp/qdict.h"

diff --git a/qom/object.c b/qom/object.c
index 5dcee4683ce4eab5a5daefe6fff62ad2d0f2cbda..81b4f7ac482458d4c4c9d6559e2a7afca03519ff 100644 (file)
--- a/qom/object.c
+++ b/qom/object.c
@@ -16,9 +16,9 @@
 #include "qom/object_interfaces.h"
 #include "qemu/cutils.h"
 #include "qapi/visitor.h"
-#include "qapi-visit.h"
 #include "qapi/string-input-visitor.h"
 #include "qapi/string-output-visitor.h"
+#include "qapi-builtin-visit.h"
 #include "qapi/qmp/qerror.h"
 #include "trace.h"
 

diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c
index 43d9aa0946d442b47f2d9959d4f7a48c66fb53be..2f76e1f36d55631f68fb0d4b9c7ecf16dd685b1c 100644 (file)
--- a/qom/object_interfaces.c
+++ b/qom/object_interfaces.c
@@ -5,7 +5,6 @@
 #include "qom/object_interfaces.h"
 #include "qemu/module.h"
 #include "qemu/option.h"
-#include "qapi-visit.h"
 #include "qapi/opts-visitor.h"
 #include "qemu/config-file.h"
 

diff --git a/replay/replay-input.c b/replay/replay-input.c
index 3ab1536bf758e85df902bf0348bea59999101d50..6ee8b5f8dbf0b4de10851e5fd9b066e4d9b5905e 100644 (file)
--- a/replay/replay-input.c
+++ b/replay/replay-input.c
@@ -16,6 +16,7 @@
 #include "qemu/notify.h"
 #include "ui/input.h"
 #include "qapi/clone-visitor.h"
+#include "qapi/qapi-visit-ui.h"
 
 void replay_save_input_event(InputEvent *evt)
 {

diff --git a/replication.h b/replication.h
index ece6ca6133e0613c495f70a15878782a15b93401..8faefe005f83584c39e66e5a80cbb2aa1bc0c1ca 100644 (file)
--- a/replication.h
+++ b/replication.h
@@ -15,6 +15,7 @@
 #ifndef REPLICATION_H
 #define REPLICATION_H
 
+#include "qapi/qapi-types-block-core.h"
 #include "qemu/queue.h"
 
 typedef struct ReplicationOps ReplicationOps;

diff --git a/scripts/qapi/commands.py b/scripts/qapi/commands.py
index a43bccb1902f27e24fb9a4aaa0d6c549191914aa..953449171b36f2e2b9b376e6f27c06f765dbfc0d 100644 (file)
--- a/scripts/qapi/commands.py
+++ b/scripts/qapi/commands.py
@@ -241,6 +241,9 @@ class QAPISchemaGenCommandVisitor(QAPISchemaModularCVisitor):
 
     def _begin_module(self, name):
         self._visited_ret_types[self._genc] = set()
+        commands = self._module_basename('qapi-commands', name)
+        types = self._module_basename('qapi-types', name)
+        visit = self._module_basename('qapi-visit', name)
         self._genc.add(mcgen('''
 #include "qemu/osdep.h"
 #include "qemu-common.h"
@@ -251,18 +254,17 @@ class QAPISchemaGenCommandVisitor(QAPISchemaModularCVisitor):
 #include "qapi/qobject-input-visitor.h"
 #include "qapi/dealloc-visitor.h"
 #include "qapi/error.h"
-#include "%(prefix)sqapi-types.h"
-#include "%(prefix)sqapi-visit.h"
-#include "%(prefix)sqmp-commands.h"
+#include "%(visit)s.h"
+#include "%(commands)s.h"
 
 ''',
-                             prefix=self._prefix))
+                             commands=commands, visit=visit))
         self._genh.add(mcgen('''
-#include "%(prefix)sqapi-types.h"
+#include "%(types)s.h"
 #include "qapi/qmp/dispatch.h"
 
 ''',
-                             prefix=self._prefix))
+                             types=types))
 
     def visit_end(self):
         (genc, genh) = self._module[self._main_module]

diff --git a/scripts/qapi/events.py b/scripts/qapi/events.py
index 1e0b990f3563d519219893f956d0600613fed1ac..5ad670849114f3233b8a1b3fab7a177d7d9d2bfd 100644 (file)
--- a/scripts/qapi/events.py
+++ b/scripts/qapi/events.py
@@ -165,24 +165,26 @@ class QAPISchemaGenEventVisitor(QAPISchemaModularCVisitor):
         return basename
 
     def _begin_module(self, name):
+        types = self._module_basename('qapi-types', name)
+        visit = self._module_basename('qapi-visit', name)
         self._genc.add(mcgen('''
 #include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "%(prefix)sqapi-event.h"
-#include "%(prefix)sqapi-visit.h"
+#include "%(visit)s.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qobject-output-visitor.h"
 #include "qapi/qmp-event.h"
 
 ''',
-                             prefix=self._prefix))
+                             visit=visit, prefix=self._prefix))
         self._genh.add(mcgen('''
 #include "qapi/util.h"
-#include "%(prefix)sqapi-types.h"
+#include "%(types)s.h"
 
 ''',
-                             prefix=self._prefix))
+                             types=types))
 
     def visit_end(self):
         self._genh.add(gen_enum(self._enum_name, self._event_names))

diff --git a/scripts/qapi/types.py b/scripts/qapi/types.py
index 59826b11625d396c105ecf7b6fda7184c921221a..2a3c502cf6d6b9e39ddb64dcb424d462270d91c6 100644 (file)
--- a/scripts/qapi/types.py
+++ b/scripts/qapi/types.py
@@ -185,13 +185,15 @@ class QAPISchemaGenTypeVisitor(QAPISchemaModularCVisitor):
 '''))
 
     def _begin_module(self, name):
+        types = self._module_basename('qapi-types', name)
+        visit = self._module_basename('qapi-visit', name)
         self._genc.preamble_add(mcgen('''
 #include "qemu/osdep.h"
 #include "qapi/dealloc-visitor.h"
-#include "%(prefix)sqapi-types.h"
-#include "%(prefix)sqapi-visit.h"
+#include "%(types)s.h"
+#include "%(visit)s.h"
 ''',
-                                      prefix=self._prefix))
+                                      types=types, visit=visit))
         self._genh.preamble_add(mcgen('''
 #include "qapi-builtin-types.h"
 '''))

diff --git a/scripts/qapi/visit.py b/scripts/qapi/visit.py
index 9b678e72634855911987ec742fb8d188ad1aa618..de09966643de2be85598c0eb6108ee64e8bb3bec 100644 (file)
--- a/scripts/qapi/visit.py
+++ b/scripts/qapi/visit.py
@@ -284,20 +284,22 @@ class QAPISchemaGenVisitVisitor(QAPISchemaModularCVisitor):
                                       prefix=prefix))
 
     def _begin_module(self, name):
+        types = self._module_basename('qapi-types', name)
+        visit = self._module_basename('qapi-visit', name)
         self._genc.preamble_add(mcgen('''
 #include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
-#include "%(prefix)sqapi-visit.h"
+#include "%(visit)s.h"
 ''',
-                                      prefix=self._prefix))
+                                      visit=visit, prefix=self._prefix))
         self._genh.preamble_add(mcgen('''
 #include "qapi-builtin-visit.h"
-#include "%(prefix)sqapi-types.h"
+#include "%(types)s.h"
 
 ''',
-                                      prefix=self._prefix))
+                                      types=types))
 
     def visit_enum_type(self, name, info, values, prefix):
         self._genh.add(gen_visit_decl(name, scalar=True))

diff --git a/stubs/tpm.c b/stubs/tpm.c
index c18aac1c739f077aa45c0fd4e55fa90b94470261..6729bc8517297b5948c933665113f03e6218413c 100644 (file)
--- a/stubs/tpm.c
+++ b/stubs/tpm.c
@@ -4,9 +4,10 @@
  * This work is licensed under the terms of the GNU GPL, version 2 or later.
  * See the COPYING file in the top-level directory.
  */
+
 #include "qemu/osdep.h"
+#include "qapi/qapi-commands-tpm.h"
 #include "sysemu/tpm.h"
-#include "qmp-commands.h"
 
 int tpm_init(void)
 {

diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
index 656aaea2cd03ea08b01efcc25ec35f690c4ccdc1..f570896dc16b91776fe8375254baafecb32f5c43 100644 (file)
--- a/target/s390x/kvm.c
+++ b/target/s390x/kvm.c
@@ -41,7 +41,6 @@
 #include "exec/gdbstub.h"
 #include "exec/address-spaces.h"
 #include "trace.h"
-#include "qapi-event.h"
 #include "hw/s390x/s390-pci-inst.h"
 #include "hw/s390x/s390-pci-bus.h"
 #include "hw/s390x/ipl.h"

diff --git a/target/s390x/sigp.c b/target/s390x/sigp.c
index 5a7a9c4cfbdb7be5aa0eb44bca5ae7e80e59a947..92b2830940cce9416685cd7e2675982080c4b4a2 100644 (file)
--- a/target/s390x/sigp.c
+++ b/target/s390x/sigp.c
@@ -17,6 +17,7 @@
 #include "exec/exec-all.h"
 #include "sysemu/sysemu.h"
 #include "trace.h"
+#include "qapi-types.h"
 
 QemuMutex qemu_sigp_mutex;
 

diff --git a/tests/test-char.c b/tests/test-char.c
index b358620911336c0b30b123bc79f427ee5dc67718..b3a77af0855edd0d8bfa8cc84abb4a5138f3509e 100644 (file)
--- a/tests/test-char.c
+++ b/tests/test-char.c
@@ -8,9 +8,9 @@
 #include "chardev/char-mux.h"
 #include "sysemu/sysemu.h"
 #include "qapi/error.h"
+#include "qapi/qapi-commands-char.h"
 #include "qapi/qmp/qdict.h"
 #include "qom/qom-qobject.h"
-#include "qmp-commands.h"
 
 static bool quit;
 

diff --git a/tests/test-qmp-event.c b/tests/test-qmp-event.c
index 8012341343803878465a4605c0a596683f4b9fb2..5fbe7e551f7b30cfaf2e85b6b845ad2a4f78e30e 100644 (file)
--- a/tests/test-qmp-event.c
+++ b/tests/test-qmp-event.c
@@ -14,7 +14,6 @@
 #include "qemu/osdep.h"
 
 #include "qemu-common.h"
-#include "test-qapi-visit.h"
 #include "test-qapi-event.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qbool.h"

diff --git a/tpm.c b/tpm.c
index d11b10bed86b0e76278950047facb2f26102f081..2db03a09b21a02635e4a05442b1dca280f06416f 100644 (file)
--- a/tpm.c
+++ b/tpm.c
@@ -15,12 +15,12 @@
 #include "qemu/osdep.h"
 
 #include "qapi/error.h"
+#include "qapi/qapi-commands-tpm.h"
 #include "qapi/qmp/qerror.h"
 #include "sysemu/tpm_backend.h"
 #include "sysemu/tpm.h"
 #include "qemu/config-file.h"
 #include "qemu/error-report.h"
-#include "qmp-commands.h"
 
 static QLIST_HEAD(, TPMBackend) tpm_backends =
     QLIST_HEAD_INITIALIZER(tpm_backends);

diff --git a/trace/qmp.c b/trace/qmp.c
index ccd35cd840ad65f5e7b9ecbf900ab052deea8b94..756086c79fb0a9482a9f018ff76362e338d82e50 100644 (file)
--- a/trace/qmp.c
+++ b/trace/qmp.c
@@ -9,7 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qmp-commands.h"
+#include "qapi/qapi-commands-trace.h"
 #include "trace/control.h"
 
 

diff --git a/ui/console.c b/ui/console.c
index e22931a3961e263bcc3602f2741b6e69640b659e..6a1f49916eebf5974ee7479d86bc77d1fc489d64 100644 (file)
--- a/ui/console.c
+++ b/ui/console.c
@@ -26,9 +26,9 @@
 #include "ui/console.h"
 #include "hw/qdev-core.h"
 #include "qapi/error.h"
+#include "qapi/qapi-commands-ui.h"
 #include "qemu/option.h"
 #include "qemu/timer.h"
-#include "qmp-commands.h"
 #include "chardev/char-fe.h"
 #include "trace.h"
 #include "exec/memory.h"

diff --git a/ui/input-legacy.c b/ui/input-legacy.c
index 92b37ccb902ca28a27750bfbcd02671de0226b4e..e5d4db1d9730a6e9b39fdc106aa95ccac1aabbab 100644 (file)
--- a/ui/input-legacy.c
+++ b/ui/input-legacy.c
@@ -23,9 +23,9 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/qapi-commands-ui.h"
 #include "sysemu/sysemu.h"
 #include "ui/console.h"
-#include "qmp-commands.h"
 #include "ui/keymaps.h"
 #include "ui/input.h"
 

diff --git a/ui/input.c b/ui/input.c
index 8bef0fb0383a877f05377f9d15c989fd3fa6ef5f..51b1019252c6d913859f8b62372529bc68114d42 100644 (file)
--- a/ui/input.c
+++ b/ui/input.c
@@ -1,9 +1,9 @@
 #include "qemu/osdep.h"
 #include "sysemu/sysemu.h"
 #include "qapi/error.h"
+#include "qapi/qapi-commands-ui.h"
 #include "qapi/qmp/qdict.h"
 #include "qemu/error-report.h"
-#include "qmp-commands.h"
 #include "trace.h"
 #include "ui/input.h"
 #include "ui/console.h"

diff --git a/ui/spice-core.c b/ui/spice-core.c
index e449172fe905647501236c68b5466dc29ab736bc..ae8921a201cae940df16e939d00781b3110288a7 100644 (file)
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -28,14 +28,14 @@
 #include "qemu/queue.h"
 #include "qemu-x509.h"
 #include "qemu/sockets.h"
-#include "qmp-commands.h"
 #include "qapi/error.h"
+#include "qapi/qapi-commands-ui.h"
+#include "qapi/qapi-events-ui.h"
 #include "qemu/notify.h"
 #include "qemu/option.h"
 #include "migration/misc.h"
 #include "hw/hw.h"
 #include "ui/spice-display.h"
-#include "qapi-event.h"
 
 /* core bits */
 

diff --git a/ui/vnc.c b/ui/vnc.c
index d19f86c7f413725d9f0a748692242cfd870a0ca1..a25e408cf037d13319947066e57b99ea636bc728 100644 (file)
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -36,7 +36,7 @@
 #include "qemu/acl.h"
 #include "qemu/config-file.h"
 #include "qapi/error.h"
-#include "qmp-commands.h"
+#include "qapi/qapi-commands-ui.h"
 #include "ui/input.h"
 #include "qapi-event.h"
 #include "crypto/hash.h"

diff --git a/ui/vnc.h b/ui/vnc.h
index 1ca062f3321c18ffbbaebbb0112ef4a98217b051..7b29def77de559c77a58710913c89054c5480464 100644 (file)
--- a/ui/vnc.h
+++ b/ui/vnc.h
@@ -28,6 +28,7 @@
 #define QEMU_VNC_H
 
 #include "qemu-common.h"
+#include "qapi/qapi-types-ui.h"
 #include "qemu/queue.h"
 #include "qemu/thread.h"
 #include "ui/console.h"

diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
index fbbef69f62758553b1100b9d2bce57aa763ca414..7f13e8a338cf93df683e5b2d35cf21dccc2fbea5 100644 (file)
--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
@@ -24,11 +24,11 @@
 #include "monitor/monitor.h"
 #include "qapi/clone-visitor.h"
 #include "qapi/error.h"
+#include "qapi/qapi-visit-sockets.h"
 #include "qemu/sockets.h"
 #include "qemu/main-loop.h"
 #include "qapi/qobject-input-visitor.h"
 #include "qapi/qobject-output-visitor.h"
-#include "qapi-visit.h"
 #include "qemu/cutils.h"
 
 #ifndef AI_ADDRCONFIG

diff --git a/vl.c b/vl.c
index a33ac008fb5edd663d2d87b4138fa2066d4eb064..e2e4e68c35c3926c44dea18041599762b0346266 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -97,7 +97,6 @@ int main(int argc, char **argv)
 #include "sysemu/kvm.h"
 #include "sysemu/hax.h"
 #include "qapi/qobject-input-visitor.h"
-#include "qapi-visit.h"
 #include "qemu/option.h"
 #include "qemu/config-file.h"
 #include "qemu-options.h"
@@ -122,10 +121,11 @@ int main(int argc, char **argv)
 #include "qapi/string-input-visitor.h"
 #include "qapi/opts-visitor.h"
 #include "qom/object_interfaces.h"
-#include "qapi-event.h"
 #include "exec/semihost.h"
 #include "crypto/init.h"
 #include "sysemu/replay.h"
+#include "qapi/qapi-events-run-state.h"
+#include "qapi/qapi-visit-block-core.h"
 #include "qapi/qmp/qerror.h"
 #include "sysemu/iothread.h"