Include qapi/qmp/qdict.h exactly where needed

This cleanup makes the number of objects depending on qapi/qmp/qdict.h
drop from 4550 (out of 4743) to 368 in my "build everything" tree.
For qapi/qmp/qobject.h, the number drops from 4552 to 390.

While there, separate #include from file comment with a blank line.

Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20180201111846.21846-13-armbru@redhat.com>

diff --git a/block.c b/block.c
index a97f709252cd15078d172e6e5d372a0fc06d7f55..367641ef4f639e93f4898f8f609e1e30718498c6 100644 (file)
--- a/block.c
+++ b/block.c
@@ -31,6 +31,7 @@
 #include "module_block.h"
 #include "qemu/module.h"
 #include "qapi/error.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/qmp/qbool.h"
 #include "qapi/qmp/qjson.h"

diff --git a/block/crypto.c b/block/crypto.c
index 60ddf8623ee6102522a700afa95afc7b91d9b605..2626f8ae3a65ff0d886e714b0c4f4a26783633b2 100644 (file)
--- a/block/crypto.c
+++ b/block/crypto.c
@@ -24,6 +24,7 @@
 #include "sysemu/block-backend.h"
 #include "crypto/block.h"
 #include "qapi/opts-visitor.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qobject-input-visitor.h"
 #include "qapi-visit.h"
 #include "qapi/error.h"

diff --git a/block/curl.c b/block/curl.c
index cd578d3d14750061248e7086a73f42e9c923186b..eafa97cd72ae6ccf3a37e80347aa8da3ab244ee9 100644 (file)
--- a/block/curl.c
+++ b/block/curl.c
@@ -21,12 +21,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "block/block_int.h"
 #include "qapi/qmp/qbool.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qstring.h"
 #include "crypto/secret.h"
 #include <curl/curl.h>

diff --git a/block/file-posix.c b/block/file-posix.c
index 36ee89e9402277360821baf679d3c82da9724917..9422ad529cc36388aa6c128611a45eee2b75644b 100644 (file)
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -31,6 +31,7 @@
 #include "block/thread-pool.h"
 #include "qemu/iov.h"
 #include "block/raw-aio.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qstring.h"
 
 #include "scsi/pr-manager.h"

diff --git a/block/file-win32.c b/block/file-win32.c
index 9e02214a69bea59eb6eb33c34aebf83bba0de115..2f1da48e71c5ae8b304a2ab081d1bf444dcfd4c2 100644 (file)
--- a/block/file-win32.c
+++ b/block/file-win32.c
@@ -30,6 +30,7 @@
 #include "trace.h"
 #include "block/thread-pool.h"
 #include "qemu/iov.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qstring.h"
 #include <windows.h>
 #include <winioctl.h>

diff --git a/block/gluster.c b/block/gluster.c
index 0f4265a3a41e49e3939ff37350ffae84ec9887ed..097b6930a59b7ea09ef5e6a91e43e75d13d8b4dc 100644 (file)
--- a/block/gluster.c
+++ b/block/gluster.c
@@ -11,6 +11,7 @@
 #include <glusterfs/api/glfs.h>
 #include "block/block_int.h"
 #include "qapi/error.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu/uri.h"
 #include "qemu/error-report.h"

diff --git a/block/iscsi.c b/block/iscsi.c
index 9a1bf43cbcc786b90229055a1c32c837db9fa1f6..8edd480f928a3054fbc9bbd6d06560711d6b8ddf 100644 (file)
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -39,6 +39,7 @@
 #include "qemu/uuid.h"
 #include "qmp-commands.h"
 #include "qapi/error.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qstring.h"
 #include "crypto/secret.h"
 #include "scsi/utils.h"

diff --git a/block/qapi.c b/block/qapi.c
index 12a8cb5a8242e1572114bd6205889a7355f0b847..1fdeb1ef2fdb21fe285c46fa96f79bba4602684c 100644 (file)
--- a/block/qapi.c
+++ b/block/qapi.c
@@ -32,6 +32,7 @@
 #include "qapi/error.h"
 #include "qapi/qobject-output-visitor.h"
 #include "qapi/qmp/qbool.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qlist.h"
 #include "qapi/qmp/qnum.h"
 #include "qapi/qmp/qstring.h"

diff --git a/block/qcow.c b/block/qcow.c
index 369241aae804080f491bf3fe2ee0cb36daa69193..0b32c04cd0eb7d3c79eee86b548f2334034adcd4 100644 (file)
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu-common.h"
@@ -30,6 +31,7 @@
 #include "qemu/module.h"
 #include "qemu/bswap.h"
 #include <zlib.h>
+#include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qstring.h"
 #include "crypto/block.h"
 #include "migration/blocker.h"

diff --git a/block/rbd.c b/block/rbd.c
index 76b9e83cea7d184caf43f5eba65056921b2c9bee..42be5ed49d09bb529f23e2e714d41c9c89fc0e47 100644 (file)
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -20,6 +20,7 @@
 #include "crypto/secret.h"
 #include "qemu/cutils.h"
 #include "qapi/qmp/qstring.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qjson.h"
 #include "qapi/qmp/qlist.h"
 

diff --git a/block/snapshot.c b/block/snapshot.c
index 8cb70dbad5909e10bc8f319d9d26f2ce9e00b209..9294a9fcc4f9a745eacecb9f8b19fb9b6cbd6ad8 100644 (file)
--- a/block/snapshot.c
+++ b/block/snapshot.c
@@ -26,6 +26,7 @@
 #include "block/snapshot.h"
 #include "block/block_int.h"
 #include "qapi/error.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/qmp/qstring.h"
 

diff --git a/block/ssh.c b/block/ssh.c
index 8890a0c4ba97d317d362c11f6b71146b7a17dba3..91f5f4c3c9355461e1679138a005c7c14c04c390 100644 (file)
--- a/block/ssh.c
+++ b/block/ssh.c
@@ -34,6 +34,7 @@
 #include "qemu/sockets.h"
 #include "qemu/uri.h"
 #include "qapi-visit.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qstring.h"
 #include "qapi/qobject-input-visitor.h"
 #include "qapi/qobject-output-visitor.h"

diff --git a/block/vvfat.c b/block/vvfat.c
index a690595f2c9a593132a7d767202d038575107029..93e76580b066fcc159f4004f80b901f30ea9d8c4 100644 (file)
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -22,6 +22,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include <dirent.h>
 #include "qapi/error.h"
@@ -30,6 +31,7 @@
 #include "qemu/bswap.h"
 #include "migration/blocker.h"
 #include "qapi/qmp/qbool.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qstring.h"
 #include "qemu/cutils.h"
 #include "qemu/error-report.h"

diff --git a/blockdev.c b/blockdev.c
index 90ef3166de4377067f1000c41e72aeacfc0623e2..bdbdeae7e451cf194abcfc940095cad7524bcdff 100644 (file)
--- a/blockdev.c
+++ b/blockdev.c
@@ -40,6 +40,7 @@
 #include "qemu/error-report.h"
 #include "qemu/option.h"
 #include "qemu/config-file.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qnum.h"
 #include "qapi/qmp/qstring.h"
 #include "qapi-visit.h"

diff --git a/device-hotplug.c b/device-hotplug.c
index 126f73c676f4a2e63a4a34bbb3ee7aa4e8b92e01..b10e8cc6d4b013d1d835e4b3ef6ca45f39c8cba0 100644 (file)
--- a/device-hotplug.c
+++ b/device-hotplug.c
@@ -27,6 +27,7 @@
 #include "hw/boards.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/blockdev.h"
+#include "qapi/qmp/qdict.h"
 #include "qemu/config-file.h"
 #include "sysemu/sysemu.h"
 #include "monitor/monitor.h"

diff --git a/hmp.c b/hmp.c
index 13550b0191924fed4c7de2771a9608f428d7dc74..7870d6a3004e1e980ea955729e6747ecea7b61ce 100644 (file)
--- a/hmp.c
+++ b/hmp.c
@@ -29,6 +29,7 @@
 #include "monitor/qdev.h"
 #include "qapi/error.h"
 #include "qapi/opts-visitor.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/string-input-visitor.h"
 #include "qapi/string-output-visitor.h"

diff --git a/hmp.h b/hmp.h
index 62c969caa3f8508d98d803a48be0fcf5d51f5cdc..1143db44a7606bf5c4dcd6bf20632f42f35ee42d 100644 (file)
--- a/hmp.h
+++ b/hmp.h
@@ -16,7 +16,6 @@
 
 #include "qemu-common.h"
 #include "qemu/readline.h"
-#include "qapi/qmp/qdict.h"
 
 void hmp_info_name(Monitor *mon, const QDict *qdict);
 void hmp_info_version(Monitor *mon, const QDict *qdict);

diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c
index 071e5e9bbb27264395160e70c4091021ad6bb58f..0b55392fe7de44aeca32c588500a27506d8a7af2 100644 (file)
--- a/hw/pci/pcie_aer.c
+++ b/hw/pci/pcie_aer.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "sysemu/sysemu.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qjson.h"
 #include "monitor/monitor.h"
 #include "hw/pci/pci_bridge.h"

diff --git a/hw/s390x/s390-skeys.c b/hw/s390x/s390-skeys.c
index fd994f86b1f6a48ed424ec90e970ee3d556d7c6e..bdb6c18a0f931116ff9648f7315d2881ed22c21b 100644 (file)
--- a/hw/s390x/s390-skeys.c
+++ b/hw/s390x/s390-skeys.c
@@ -14,6 +14,7 @@
 #include "qmp-commands.h"
 #include "hw/s390x/storage-keys.h"
 #include "qapi/error.h"
+#include "qapi/qmp/qdict.h"
 #include "qemu/error-report.h"
 #include "sysemu/kvm.h"
 #include "migration/register.h"

diff --git a/hw/s390x/s390-stattrib.c b/hw/s390x/s390-stattrib.c
index c6c06b2780997315ddb2dacb5639d44b6c6c5a97..a1d2135a6013f98912678afe8b8d56d2167c06f5 100644 (file)
--- a/hw/s390x/s390-stattrib.c
+++ b/hw/s390x/s390-stattrib.c
@@ -18,6 +18,7 @@
 #include "qemu/error-report.h"
 #include "exec/ram_addr.h"
 #include "qapi/error.h"
+#include "qapi/qmp/qdict.h"
 
 #define CMMA_BLOCK_SIZE  (1 << 10)
 

diff --git a/hw/usb/xen-usb.c b/hw/usb/xen-usb.c
index 584a6f2442a5c896fcbd538b643b378ce2dbae4f..3b678685e129faeb8ad67d01c396b602c63c83c1 100644 (file)
--- a/hw/usb/xen-usb.c
+++ b/hw/usb/xen-usb.c
@@ -30,6 +30,7 @@
 #include "hw/xen/xen_backend.h"
 #include "monitor/qdev.h"
 #include "qapi/qmp/qbool.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qstring.h"
 
 #include "hw/xen/io/ring.h"

diff --git a/include/block/block.h b/include/block/block.h
index 549e4c46183039e934c4d0bfabc7b343681d3072..47e2910db260d665eebf29d6b8fa2b9063bc2a34 100644 (file)
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -2,6 +2,7 @@
 #define BLOCK_H
 
 #include "block/aio.h"
+#include "qapi-types.h"
 #include "qemu/iov.h"
 #include "qemu/option.h"
 #include "qemu/coroutine.h"

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

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

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

diff --git a/include/hw/loader.h b/include/hw/loader.h
index 355fe0f5a25d05fc834d843234c96dc918c2f4f9..5edbe02b1c7f6d705834f76cf1afcefc8e687504 100644 (file)
--- a/include/hw/loader.h
+++ b/include/hw/loader.h
@@ -1,6 +1,5 @@
 #ifndef LOADER_H
 #define LOADER_H
-#include "qapi/qmp/qdict.h"
 #include "hw/nvram/fw_cfg.h"
 
 /* loader.c */

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

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

diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h
index 83ea4a1aafe98f3529b0f20541483cf46ba77bdc..ad64ad8e682461b2f04723cd79adb907fdbd1b6a 100644 (file)
--- a/include/monitor/monitor.h
+++ b/include/monitor/monitor.h
@@ -2,7 +2,6 @@
 #define MONITOR_H
 
 #include "qemu-common.h"
-#include "qapi/qmp/qdict.h"
 #include "block/block.h"
 #include "qemu/readline.h"
 

diff --git a/include/net/net.h b/include/net/net.h
index eefb259e0ad346b4b5f34a45c3256093d243333f..71f1119bc9d9479d6b406d8e403ac1d4dbd6d706 100644 (file)
--- a/include/net/net.h
+++ b/include/net/net.h
@@ -3,7 +3,7 @@
 
 #include "qemu/queue.h"
 #include "qemu-common.h"
-#include "qapi/qmp/qdict.h"
+#include "qapi-types.h"
 #include "qemu/option.h"
 #include "net/queue.h"
 #include "migration/vmstate.h"

diff --git a/include/net/slirp.h b/include/net/slirp.h
index 865d2fca36d2d91b446792db51581e7eabba3596..9a492b84a4b99e139d6382269ac42ad3184869ed 100644 (file)
--- a/include/net/slirp.h
+++ b/include/net/slirp.h
@@ -25,7 +25,6 @@
 #define QEMU_NET_SLIRP_H
 
 #include "qemu-common.h"
-#include "qapi/qmp/qdict.h"
 #include "qemu/option.h"
 
 #ifdef CONFIG_SLIRP

diff --git a/include/qapi/qmp-event.h b/include/qapi/qmp-event.h
index 40fe3cbc1253560afb70206a62974f482597abac..0c87ad833ec8bee9c4a6cdf22b25fba810db49e6 100644 (file)
--- a/include/qapi/qmp-event.h
+++ b/include/qapi/qmp-event.h
@@ -14,7 +14,6 @@
 #ifndef QMP_EVENT_H
 #define QMP_EVENT_H
 
-#include "qapi/qmp/qdict.h"
 
 typedef void (*QMPEventFuncEmit)(unsigned event, QDict *dict, Error **errp);
 

diff --git a/include/qapi/qmp/dispatch.h b/include/qapi/qmp/dispatch.h
index 47a0ff348bb934957a48e06455961369935188d8..1e694b5ecf97cd7dc735e3461cf70383b1302b77 100644 (file)
--- a/include/qapi/qmp/dispatch.h
+++ b/include/qapi/qmp/dispatch.h
@@ -14,7 +14,7 @@
 #ifndef QAPI_QMP_DISPATCH_H
 #define QAPI_QMP_DISPATCH_H
 
-#include "qapi/qmp/qdict.h"
+#include "qemu/queue.h"
 
 typedef void (QmpCommandFunc)(QDict *, QObject **, Error **);
 

diff --git a/include/qemu/config-file.h b/include/qemu/config-file.h
index c80d5c8a335187722f26966652502234841ded83..449e631c869a00bdefe7dc85ef3e71ce967abdca 100644 (file)
--- a/include/qemu/config-file.h
+++ b/include/qemu/config-file.h
@@ -2,7 +2,6 @@
 #define QEMU_CONFIG_FILE_H
 
 #include "qemu/option.h"
-#include "qapi/qmp/qdict.h"
 
 QemuOptsList *qemu_find_opts(const char *group);
 QemuOptsList *qemu_find_opts_err(const char *group, Error **errp);

diff --git a/include/qemu/option.h b/include/qemu/option.h
index a88c5f02b115efc6570d52837ca64b871123a6de..b127fb6db6c9e8502752aa03b1c6793a0bd794ea 100644 (file)
--- a/include/qemu/option.h
+++ b/include/qemu/option.h
@@ -27,7 +27,6 @@
 #define QEMU_OPTION_H
 
 #include "qemu/queue.h"
-#include "qapi/qmp/qdict.h"
 
 const char *get_opt_name(char *buf, int buf_size, const char *p, char delim);
 const char *get_opt_value(char *buf, int buf_size, const char *p);

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

diff --git a/include/qom/object_interfaces.h b/include/qom/object_interfaces.h
index d23e11bc53e060dc925d1159e2ad7e661ba8b920..4d513fb329f134c264e2ab72645aef32e4c7b8c5 100644 (file)
--- a/include/qom/object_interfaces.h
+++ b/include/qom/object_interfaces.h
@@ -2,7 +2,6 @@
 #define OBJECT_INTERFACES_H
 
 #include "qom/object.h"
-#include "qapi/qmp/qdict.h"
 #include "qapi/visitor.h"
 
 #define TYPE_USER_CREATABLE "user-creatable"

diff --git a/include/scsi/pr-manager.h b/include/scsi/pr-manager.h
index b2b37d63bcf7be385edb2e35ae55125e68b250d4..5d2f13a5e4513f434f9991637cffc3e29e5262f1 100644 (file)
--- a/include/scsi/pr-manager.h
+++ b/include/scsi/pr-manager.h
@@ -2,7 +2,6 @@
 #define PR_MANAGER_H
 
 #include "qom/object.h"
-#include "qapi/qmp/qdict.h"
 #include "qapi/visitor.h"
 #include "qom/object_interfaces.h"
 #include "block/aio.h"

diff --git a/include/sysemu/arch_init.h b/include/sysemu/arch_init.h
index 4b88f99060458f832a98b34cd0285f109ea6d03d..28f713eae2351ace3548481d35a2edbde863e3cd 100644 (file)
--- a/include/sysemu/arch_init.h
+++ b/include/sysemu/arch_init.h
@@ -1,6 +1,7 @@
 #ifndef QEMU_ARCH_INIT_H
 #define QEMU_ARCH_INIT_H
 
+#include "qapi-types.h"
 #include "qemu/option.h"
 
 enum {

diff --git a/include/ui/console.h b/include/ui/console.h
index f3a1ec243dacb1a3c599b2f34c82221fe9097d0d..12fef809232e2d744cc932b17737292ccc943dff 100644 (file)
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -3,7 +3,6 @@
 
 #include "ui/qemu-pixman.h"
 #include "qom/object.h"
-#include "qapi/qmp/qdict.h"
 #include "qemu/notify.h"
 #include "qemu/error-report.h"
 

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

diff --git a/monitor.c b/monitor.c
index 20f7b159b3976f2321712807d1daf6473f58b97f..a22d911087529fd580887640ad9e02d938800920 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -52,6 +52,7 @@
 #include "sysemu/hw_accel.h"
 #include "qemu/acl.h"
 #include "sysemu/tpm.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/qmp/qbool.h"
 #include "qapi/qmp/qnum.h"

diff --git a/net/net.c b/net/net.c
index b36449dd65d94633a3a5aa5f486ad5607061b752..7a22ca74e2da679285aaef832f02a6625985e73d 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -34,6 +34,7 @@
 #include "monitor/monitor.h"
 #include "qemu-common.h"
 #include "qemu/help_option.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu/error-report.h"
 #include "qemu/sockets.h"

diff --git a/net/slirp.c b/net/slirp.c
index 7044d292c85eaa8e2444c8e513cb169e2860e850..8991816bbfc81ff5fb7aae0ca3066fd354544ad5 100644 (file)
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "net/slirp.h"
 
@@ -41,6 +42,7 @@
 #include "sysemu/sysemu.h"
 #include "qemu/cutils.h"
 #include "qapi/error.h"
+#include "qapi/qmp/qdict.h"
 
 static int get_str_sep(char *buf, int buf_size, const char **pp, int sep)
 {

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

diff --git a/qapi/qmp-dispatch.c b/qapi/qmp-dispatch.c
index 92f957f40ed9eec0b6491c69f58637333b24e8d5..e31ac4be1fbad2cd8d9e842812b16f591985adf2 100644 (file)
--- a/qapi/qmp-dispatch.c
+++ b/qapi/qmp-dispatch.c
@@ -15,6 +15,7 @@
 #include "qapi/error.h"
 #include "qapi/qmp/dispatch.h"
 #include "qapi/qmp/json-parser.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qjson.h"
 
 static QDict *qmp_dispatch_check_obj(const QObject *request, Error **errp)

diff --git a/qapi/qmp-event.c b/qapi/qmp-event.c
index ba3029cc89e58209a96c426c2984f197c080d78f..9d7e88e84a28e22842f07a7fa9f5d805a9b58938 100644 (file)
--- a/qapi/qmp-event.c
+++ b/qapi/qmp-event.c
@@ -16,6 +16,7 @@
 #include "qemu-common.h"
 #include "qapi/qmp-event.h"
 #include "qapi/qmp/qstring.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qjson.h"
 
 static QMPEventFuncEmit qmp_emit;

diff --git a/qapi/qobject-input-visitor.c b/qapi/qobject-input-visitor.c
index 3e235a1eeefda7a10082becd2af8fd8a7e1b7a6c..3566eed3653027187d3a79f118c65bd98b01d4ae 100644 (file)
--- a/qapi/qobject-input-visitor.c
+++ b/qapi/qobject-input-visitor.c
@@ -21,6 +21,7 @@
 #include "qemu-common.h"
 #include "qapi/qmp/qjson.h"
 #include "qapi/qmp/qbool.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/qmp/qlist.h"
 #include "qapi/qmp/qnull.h"

diff --git a/qapi/qobject-output-visitor.c b/qapi/qobject-output-visitor.c
index 52634b97256d4e138c89a2b0f3d5506252544f87..7c3b42cfe2b086a6ad45d170bce82b16d3d46c22 100644 (file)
--- a/qapi/qobject-output-visitor.c
+++ b/qapi/qobject-output-visitor.c
@@ -18,6 +18,7 @@
 #include "qemu/queue.h"
 #include "qemu-common.h"
 #include "qapi/qmp/qbool.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qlist.h"
 #include "qapi/qmp/qnull.h"
 #include "qapi/qmp/qnum.h"

diff --git a/qdev-monitor.c b/qdev-monitor.c
index 0aa8a6c60bd4a1aae4012ed586bafd0c2f731001..a954c2192b01aa36c60be1107ba2e22b4392ec35 100644 (file)
--- a/qdev-monitor.c
+++ b/qdev-monitor.c
@@ -25,6 +25,7 @@
 #include "qmp-commands.h"
 #include "sysemu/arch_init.h"
 #include "qapi/error.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu/config-file.h"
 #include "qemu/error-report.h"

diff --git a/qemu-img.c b/qemu-img.c
index 8023233c3dbee410e8f37e7c57f9862e47d409b1..c6bcfcd83e51b0734c97be08ece15239165a603b 100644 (file)
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include <getopt.h>
 
@@ -30,6 +31,7 @@
 #include "qapi/qobject-output-visitor.h"
 #include "qapi/qmp/qjson.h"
 #include "qapi/qmp/qbool.h"
+#include "qapi/qmp/qdict.h"
 #include "qemu/cutils.h"
 #include "qemu/config-file.h"
 #include "qemu/option.h"

diff --git a/qemu-io.c b/qemu-io.c
index c70bde3eb1cd3b2721df18f78cd492226927eeb6..2e5737ce9c5c717139553d3b96790240473f3aba 100644 (file)
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -7,6 +7,7 @@
  * 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 <getopt.h>
 #include <libgen.h>
@@ -21,6 +22,7 @@
 #include "qemu/log.h"
 #include "qapi/qmp/qstring.h"
 #include "qapi/qmp/qbool.h"
+#include "qapi/qmp/qdict.h"
 #include "qom/object_interfaces.h"
 #include "sysemu/block-backend.h"
 #include "block/block_int.h"

diff --git a/qemu-nbd.c b/qemu-nbd.c
index 3723493be1ab0f4823dbf940b3bd01e98cdab7f6..6ff8ef41e94d96b4f32ffc5587367ec1f7612f6a 100644 (file)
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -34,6 +34,7 @@
 #include "qemu/log.h"
 #include "qemu/systemd.h"
 #include "block/snapshot.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qstring.h"
 #include "qom/object_interfaces.h"
 #include "io/channel-socket.h"

diff --git a/qga/main.c b/qga/main.c
index 804cc4c1a0b41b161ed1b7c574d502c5c849fbca..72406a3c235af12ede5ef882bfbe99e102019650 100644 (file)
--- a/qga/main.c
+++ b/qga/main.c
@@ -20,6 +20,7 @@
 #endif
 #include "qapi/qmp/json-streamer.h"
 #include "qapi/qmp/json-parser.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qjson.h"
 #include "qga/guest-agent-core.h"
 #include "qemu/module.h"

diff --git a/qmp.c b/qmp.c
index f87de2bc26a81051c3c9a3a7feb41fc08693b47a..1b750293e4eaed2e6e3800f4b9c0c113daa02938 100644 (file)
--- a/qmp.c
+++ b/qmp.c
@@ -31,6 +31,7 @@
 #include "sysemu/block-backend.h"
 #include "qom/qom-qobject.h"
 #include "qapi/error.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/qobject-input-visitor.h"
 #include "hw/boards.h"

diff --git a/qobject/json-parser.c b/qobject/json-parser.c
index ee0cbba6a5ea96a5618b4fc7507b5f218ad6fc46..b72456241585ef0123f259baf377b866a6ccfa2d 100644 (file)
--- a/qobject/json-parser.c
+++ b/qobject/json-parser.c
@@ -16,6 +16,7 @@
 #include "qapi/error.h"
 #include "qemu-common.h"
 #include "qapi/qmp/qbool.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qlist.h"
 #include "qapi/qmp/qnull.h"
 #include "qapi/qmp/qnum.h"

diff --git a/qobject/qjson.c b/qobject/qjson.c
index 527b5bb5711cd05fad9b447464c65d2e84719baa..77f796bbee5b47b9b7ff6bc7d46c90744f14c957 100644 (file)
--- a/qobject/qjson.c
+++ b/qobject/qjson.c
@@ -18,6 +18,7 @@
 #include "qapi/qmp/json-streamer.h"
 #include "qapi/qmp/qjson.h"
 #include "qapi/qmp/qbool.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qlist.h"
 #include "qapi/qmp/qnum.h"
 #include "qemu/unicode.h"

diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c
index 6824a88caabe071cca31bb0fa6749815f27a086b..2719df3bae849c86db09c3544e213f4ef12d53b0 100644 (file)
--- a/qom/object_interfaces.c
+++ b/qom/object_interfaces.c
@@ -1,5 +1,6 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qapi/qmp/qdict.h"
 #include "qom/object_interfaces.h"
 #include "qemu/module.h"
 #include "qapi-visit.h"

diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py
index 26c56c506267b41f468617b3db76a7da527997f6..f89d748ba40825f609472d942d734523ea824caf 100644 (file)
--- a/scripts/qapi-commands.py
+++ b/scripts/qapi-commands.py
@@ -294,6 +294,7 @@ fdef.write(mcgen('''
 #include "qemu-common.h"
 #include "qemu/module.h"
 #include "qapi/visitor.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qobject-output-visitor.h"
 #include "qapi/qobject-input-visitor.h"
 #include "qapi/dealloc-visitor.h"
@@ -307,7 +308,6 @@ fdef.write(mcgen('''
 
 fdecl.write(mcgen('''
 #include "%(prefix)sqapi-types.h"
-#include "qapi/qmp/qdict.h"
 #include "qapi/qmp/dispatch.h"
 
 void %(c_prefix)sqmp_init_marshal(QmpCommandList *cmds);

diff --git a/scripts/qapi-event.py b/scripts/qapi-event.py
index 9d7134658d83eb2661e62cf0cb4b28614f2e330c..c710968dc225c43dfaa00d35d3adec49ec65beee 100644 (file)
--- a/scripts/qapi-event.py
+++ b/scripts/qapi-event.py
@@ -210,6 +210,7 @@ fdef.write(mcgen('''
 #include "%(prefix)sqapi-event.h"
 #include "%(prefix)sqapi-visit.h"
 #include "qapi/error.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qobject-output-visitor.h"
 #include "qapi/qmp-event.h"
 
@@ -218,7 +219,6 @@ fdef.write(mcgen('''
 
 fdecl.write(mcgen('''
 #include "qapi/util.h"
-#include "qapi/qmp/qdict.h"
 #include "%(prefix)sqapi-types.h"
 
 ''',

diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 5cb63eae4135ab4e9f05f85f3b3d42740dd8c8e1..b5e431e769daf3c07334345ca428a9d39d73d2d9 100644 (file)
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -31,6 +31,7 @@
 #include "qemu/option.h"
 #include "qemu/config-file.h"
 #include "qapi/error.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qerror.h"
 
 #include "qapi-visit.h"

diff --git a/target/i386/monitor.c b/target/i386/monitor.c
index 75e155ffb1c4c48f9c45000353907d9a5d587c0d..75429129fde01fd477444d92a7e626b944edc615 100644 (file)
--- a/target/i386/monitor.c
+++ b/target/i386/monitor.c
@@ -21,10 +21,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "monitor/monitor.h"
 #include "monitor/hmp-target.h"
+#include "qapi/qmp/qdict.h"
 #include "hw/i386/pc.h"
 #include "sysemu/kvm.h"
 #include "hmp.h"

diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
index 212a5f0697e90d7e34160fbdcabfd4ad333080f2..27201c4f91de02174aac081d67b7c0007306e3c6 100644 (file)
--- a/target/s390x/cpu_models.c
+++ b/target/s390x/cpu_models.c
@@ -21,6 +21,7 @@
 #include "qapi/qmp/qerror.h"
 #include "qapi/qobject-input-visitor.h"
 #include "qapi/qmp/qbool.h"
+#include "qapi/qmp/qdict.h"
 #ifndef CONFIG_USER_ONLY
 #include "sysemu/arch_init.h"
 #endif

diff --git a/tests/ahci-test.c b/tests/ahci-test.c
index 3934e62ef7cdb717e19cc82859cd886cd46cd60c..7aa5af428cea545bc30dd8e3bbea0c993dd82b5a 100644 (file)
--- a/tests/ahci-test.c
+++ b/tests/ahci-test.c
@@ -31,6 +31,7 @@
 #include "libqos/pci-pc.h"
 
 #include "qemu-common.h"
+#include "qapi/qmp/qdict.h"
 #include "qemu/host-utils.h"
 
 #include "hw/pci/pci_ids.h"

diff --git a/tests/check-qobject.c b/tests/check-qobject.c
index 885d0e3de688f522a94dbeb571fc87586a1f015e..7a3670643cbe1675cb97d577c6d6a50e119ca121 100644 (file)
--- a/tests/check-qobject.c
+++ b/tests/check-qobject.c
@@ -9,6 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/qmp/qbool.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qlist.h"
 #include "qapi/qmp/qnull.h"
 #include "qapi/qmp/qnum.h"

diff --git a/tests/cpu-plug-test.c b/tests/cpu-plug-test.c
index 65456c9e379bad68d0f2e1cd48ce1c338dc1d4c8..8b5ab1fd020afe8c2b52af75102a57f0b483e9e8 100644 (file)
--- a/tests/cpu-plug-test.c
+++ b/tests/cpu-plug-test.c
@@ -11,6 +11,7 @@
 
 #include "qemu-common.h"
 #include "libqtest.h"
+#include "qapi/qmp/qdict.h"
 
 struct PlugTestData {
     char *machine;

diff --git a/tests/drive_del-test.c b/tests/drive_del-test.c
index c9ac997555f13b3a53c86d2053205ec7163ce573..313030a14cf44aca6b5721b688bcb50c82258b13 100644 (file)
--- a/tests/drive_del-test.c
+++ b/tests/drive_del-test.c
@@ -13,6 +13,7 @@
 #include "qemu/osdep.h"
 #include "libqtest.h"
 #include "libqos/virtio.h"
+#include "qapi/qmp/qdict.h"
 
 static void drive_add(void)
 {

diff --git a/tests/libqos/libqos.c b/tests/libqos/libqos.c
index 991bc1aec2f0ef9955c4cca41f2809afd6530dfe..306d4c06de142959b325a1fe16a0c68d0c6d4b65 100644 (file)
--- a/tests/libqos/libqos.c
+++ b/tests/libqos/libqos.c
@@ -4,6 +4,7 @@
 #include "libqtest.h"
 #include "libqos/libqos.h"
 #include "libqos/pci.h"
+#include "qapi/qmp/qdict.h"
 
 /*** Test Setup & Teardown ***/
 

diff --git a/tests/libqos/pci-pc.c b/tests/libqos/pci-pc.c
index ded1c54c063829e657cf92bcd592f499bcbbe656..cd4e20e1ea5511a40b3e3f593494100f204bb2f2 100644 (file)
--- a/tests/libqos/pci-pc.c
+++ b/tests/libqos/pci-pc.c
@@ -13,7 +13,7 @@
 #include "qemu/osdep.h"
 #include "libqtest.h"
 #include "libqos/pci-pc.h"
-
+#include "qapi/qmp/qdict.h"
 #include "hw/pci/pci_regs.h"
 
 #include "qemu-common.h"

diff --git a/tests/libqtest.c b/tests/libqtest.c
index 16d60818a785dd3ef5c503fb221f9f193b6682cc..b65374c6347a1970cc4db602845e2d1aa1cb593f 100644 (file)
--- a/tests/libqtest.c
+++ b/tests/libqtest.c
@@ -24,6 +24,7 @@
 #include "qapi/error.h"
 #include "qapi/qmp/json-parser.h"
 #include "qapi/qmp/json-streamer.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qjson.h"
 #include "qapi/qmp/qlist.h"
 

diff --git a/tests/libqtest.h b/tests/libqtest.h
index fe7847cbd5b65d42a96bbbe9c4f4bdd9ac8c788a..811169453ab48f19e36cc7596881892f6c23a15b 100644 (file)
--- a/tests/libqtest.h
+++ b/tests/libqtest.h
@@ -17,8 +17,6 @@
 #ifndef LIBQTEST_H
 #define LIBQTEST_H
 
-#include "qapi/qmp/qdict.h"
-
 typedef struct QTestState QTestState;
 
 extern QTestState *global_qtest;

diff --git a/tests/migration-test.c b/tests/migration-test.c
index 9efad9574960a9c717587a091c052f68f809e0b4..d0abad40f5e9cbd72c13f0c1824bd3613eace2eb 100644 (file)
--- a/tests/migration-test.c
+++ b/tests/migration-test.c
@@ -13,6 +13,7 @@
 #include "qemu/osdep.h"
 
 #include "libqtest.h"
+#include "qapi/qmp/qdict.h"
 #include "qemu/option.h"
 #include "qemu/range.h"
 #include "qemu/sockets.h"

diff --git a/tests/numa-test.c b/tests/numa-test.c
index 8158854e1706fbebf4f433b92d7cd83e5c764f25..68aca9cb389ad004536f61dff2a2bddb4990b0d8 100644 (file)
--- a/tests/numa-test.c
+++ b/tests/numa-test.c
@@ -11,6 +11,7 @@
 
 #include "qemu/osdep.h"
 #include "libqtest.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qlist.h"
 
 static char *make_cli(const char *generic_cli, const char *test_cli)

diff --git a/tests/pvpanic-test.c b/tests/pvpanic-test.c
index 71ebb5c02c1527da9c5f3deac77502ce05a0c9cd..ebdf32c2e29d5a80f078e8b5e06d9a68d6b60151 100644 (file)
--- a/tests/pvpanic-test.c
+++ b/tests/pvpanic-test.c
@@ -9,6 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "libqtest.h"
+#include "qapi/qmp/qdict.h"
 
 static void test_panic(void)
 {

diff --git a/tests/q35-test.c b/tests/q35-test.c
index f98bed7a2d13cd9fe41b209d3951f3cb0bc2e39d..187d68fb7e34a1013d038231a5f4c29cfd12cbce 100644 (file)
--- a/tests/q35-test.c
+++ b/tests/q35-test.c
@@ -14,6 +14,7 @@
 #include "libqos/pci.h"
 #include "libqos/pci-pc.h"
 #include "hw/pci-host/q35.h"
+#include "qapi/qmp/qdict.h"
 
 #define TSEG_SIZE_TEST_GUEST_RAM_MBYTES 128
 

diff --git a/tests/qmp-test.c b/tests/qmp-test.c
index cc9661af47efcda8fc519c8c87a3bc56ac5c2245..908f9b981f6e4dca105a403c65a1727dbeda91fb 100644 (file)
--- a/tests/qmp-test.c
+++ b/tests/qmp-test.c
@@ -14,6 +14,7 @@
 #include "libqtest.h"
 #include "qapi-visit.h"
 #include "qapi/error.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qlist.h"
 #include "qapi/qobject-input-visitor.h"
 #include "qapi/util.h"

diff --git a/tests/qom-test.c b/tests/qom-test.c
index 847703cb149206dfae908fb93b8c54b9a78f5723..9dab7ac61ecea30758bc8a5395f2b89ab04725d9 100644 (file)
--- a/tests/qom-test.c
+++ b/tests/qom-test.c
@@ -10,6 +10,7 @@
 #include "qemu/osdep.h"
 
 #include "qemu-common.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qlist.h"
 #include "qemu/cutils.h"
 #include "libqtest.h"

diff --git a/tests/tco-test.c b/tests/tco-test.c
index 2616d33c29d4d35b130885cb33470adf56765f0d..8ab43d742a44b61bfad67dc81ce4fa8a8985eacc 100644 (file)
--- a/tests/tco-test.c
+++ b/tests/tco-test.c
@@ -6,11 +6,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 "libqtest.h"
 #include "libqos/pci.h"
 #include "libqos/pci-pc.h"
+#include "qapi/qmp/qdict.h"
 #include "hw/pci/pci_regs.h"
 #include "hw/i386/ich9.h"
 #include "hw/acpi/ich9.h"

diff --git a/tests/test-char.c b/tests/test-char.c
index 911e3f6e8df3f78d173c707604f6a39162d652c7..54e68a1ad24e11cb0984a229c7532acd4c64aeb1 100644 (file)
--- a/tests/test-char.c
+++ b/tests/test-char.c
@@ -8,6 +8,7 @@
 #include "chardev/char-mux.h"
 #include "sysemu/sysemu.h"
 #include "qapi/error.h"
+#include "qapi/qmp/qdict.h"
 #include "qom/qom-qobject.h"
 #include "qmp-commands.h"
 

diff --git a/tests/test-keyval.c b/tests/test-keyval.c
index d0c4bf2b9df0163f30f1c5bebc8c909f81881870..94eb4df28d4ba30afa599ca9223ab4d881d42479 100644 (file)
--- a/tests/test-keyval.c
+++ b/tests/test-keyval.c
@@ -12,6 +12,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qlist.h"
 #include "qapi/qmp/qstring.h"
 #include "qapi/qobject-input-visitor.h"

diff --git a/tests/test-netfilter.c b/tests/test-netfilter.c
index 250647336518218aaa0eb92c389809fc6b6e70d6..95f7839aef407a29ba524ff5816c9d85649a406b 100644 (file)
--- a/tests/test-netfilter.c
+++ b/tests/test-netfilter.c
@@ -10,6 +10,7 @@
 
 #include "qemu/osdep.h"
 #include "libqtest.h"
+#include "qapi/qmp/qdict.h"
 
 /* add a netfilter to a netdev and then remove it */
 static void add_one_netfilter(void)

diff --git a/tests/test-qemu-opts.c b/tests/test-qemu-opts.c
index cc1bb1afdfd18c2dbc879f94bb0c177e093f8956..b37d695c28f762b5e851c6ee4748eaf378c2a8a1 100644 (file)
--- a/tests/test-qemu-opts.c
+++ b/tests/test-qemu-opts.c
@@ -10,6 +10,7 @@
 #include "qemu/osdep.h"
 #include "qemu/cutils.h"
 #include "qapi/error.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qstring.h"
 #include "qemu/config-file.h"
 

diff --git a/tests/test-qga.c b/tests/test-qga.c
index e67c7289ebbd3506a0c94ae62b989d4975a3f351..5c5b661f8a365399fd5c16f75cea0e8dad123e14 100644 (file)
--- a/tests/test-qga.c
+++ b/tests/test-qga.c
@@ -5,6 +5,7 @@
 #include <sys/un.h>
 
 #include "libqtest.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qlist.h"
 
 typedef struct {

diff --git a/tests/test-qmp-event.c b/tests/test-qmp-event.c
index e5ee69e9af9fe3fa5adc4930ba134cc060a52c95..8012341343803878465a4605c0a596683f4b9fb2 100644 (file)
--- a/tests/test-qmp-event.c
+++ b/tests/test-qmp-event.c
@@ -18,6 +18,7 @@
 #include "test-qapi-event.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qbool.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qnum.h"
 #include "qapi/qmp/qstring.h"
 #include "qapi/qmp-event.h"

diff --git a/tests/test-qobject-input-visitor.c b/tests/test-qobject-input-visitor.c
index 20bf9a54140c80e5fca9c1065d6c862cb8c7ba62..2e6f7f422fbaebf869148d6df1e9e13230901e27 100644 (file)
--- a/tests/test-qobject-input-visitor.c
+++ b/tests/test-qobject-input-visitor.c
@@ -18,6 +18,7 @@
 #include "qapi/qobject-input-visitor.h"
 #include "test-qapi-visit.h"
 #include "qapi/qmp/qbool.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qnull.h"
 #include "qapi/qmp/qnum.h"
 #include "qapi/qmp/qjson.h"

diff --git a/tests/test-qobject-output-visitor.c b/tests/test-qobject-output-visitor.c
index 7cf86707ec9d8fc1097b3c64a9fb2d6565860da1..09a56d2d06670d4932cc0c7054c5692e8e6bb6f7 100644 (file)
--- a/tests/test-qobject-output-visitor.c
+++ b/tests/test-qobject-output-visitor.c
@@ -17,6 +17,7 @@
 #include "qapi/qobject-output-visitor.h"
 #include "test-qapi-visit.h"
 #include "qapi/qmp/qbool.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qlist.h"
 #include "qapi/qmp/qnull.h"
 #include "qapi/qmp/qnum.h"

diff --git a/tests/test-replication.c b/tests/test-replication.c
index cebeb793b028c325e5464ccc669c2523fb645d6d..31372777aee4647830143586244a4b62188c40e8 100644 (file)
--- a/tests/test-replication.c
+++ b/tests/test-replication.c
@@ -11,6 +11,7 @@
 #include "qemu/osdep.h"
 
 #include "qapi/error.h"
+#include "qapi/qmp/qdict.h"
 #include "replication.h"
 #include "block/block_int.h"
 #include "sysemu/block-backend.h"

diff --git a/tests/tmp105-test.c b/tests/tmp105-test.c
index a7940a4639e4edc1d827a9b9b346ff228f10bf10..e9a3cb7ac3ab3563f030684c6b4db52722259f4d 100644 (file)
--- a/tests/tmp105-test.c
+++ b/tests/tmp105-test.c
@@ -11,6 +11,7 @@
 
 #include "libqtest.h"
 #include "libqos/i2c.h"
+#include "qapi/qmp/qdict.h"
 #include "hw/misc/tmp105_regs.h"
 
 #define OMAP2_I2C_1_BASE 0x48070000

diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
index 95eb449cfc1f1e95417d514b594c853f3d297388..128fce302fd087f6ca493579274b5598496fa796 100644 (file)
--- a/tests/vhost-user-test.c
+++ b/tests/vhost-user-test.c
@@ -12,6 +12,7 @@
 
 #include "libqtest.h"
 #include "qapi/error.h"
+#include "qapi/qmp/qdict.h"
 #include "qemu/config-file.h"
 #include "qemu/option.h"
 #include "qemu/range.h"

diff --git a/tests/virtio-net-test.c b/tests/virtio-net-test.c
index ea634dc05a60f7b7b1ca944929e6b8b6eb4f18ed..41148394572a7f5254659cb5570d0b46308eca0a 100644 (file)
--- a/tests/virtio-net-test.c
+++ b/tests/virtio-net-test.c
@@ -16,6 +16,7 @@
 #include "libqos/libqos-spapr.h"
 #include "libqos/virtio.h"
 #include "libqos/virtio-pci.h"
+#include "qapi/qmp/qdict.h"
 #include "qemu/bswap.h"
 #include "hw/virtio/virtio-net.h"
 #include "standard-headers/linux/virtio_ids.h"

diff --git a/tests/vmgenid-test.c b/tests/vmgenid-test.c
index 68ff954578d3e6fea7b936e574cac2a2917e3c4c..7190e680dc15f490a86469631cd0149c8d0402f1 100644 (file)
--- a/tests/vmgenid-test.c
+++ b/tests/vmgenid-test.c
@@ -15,6 +15,7 @@
 #include "boot-sector.h"
 #include "acpi-utils.h"
 #include "libqtest.h"
+#include "qapi/qmp/qdict.h"
 
 #define VGID_GUID "324e6eaf-d1d1-4bf6-bf41-b9bb6c91fb87"
 #define VMGENID_GUID_OFFSET 40   /* allow space for

diff --git a/tests/wdt_ib700-test.c b/tests/wdt_ib700-test.c
index 49f4f0c2216f07a45746fc162599c9f90078404c..6062d4e942fd194079d4f4913d887c167bdb9bb0 100644 (file)
--- a/tests/wdt_ib700-test.c
+++ b/tests/wdt_ib700-test.c
@@ -9,6 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "libqtest.h"
+#include "qapi/qmp/qdict.h"
 #include "qemu/timer.h"
 
 static void qmp_check_no_event(void)

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

diff --git a/util/keyval.c b/util/keyval.c
index 4085282a7a5cdf034170adc53e139626a02dcedb..212ae90d00363b2048adb4bc716f4f7fb1ec207c 100644 (file)
--- a/util/keyval.c
+++ b/util/keyval.c
@@ -81,6 +81,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qlist.h"
 #include "qapi/qmp/qstring.h"
 #include "qemu/cutils.h"

diff --git a/util/qemu-config.c b/util/qemu-config.c
index 230c699a513e6d117ff5abf3c5d1f44a33faedd6..10cae120cca96ffac74ef95ee5f6a6f636fc4670 100644 (file)
--- a/util/qemu-config.c
+++ b/util/qemu-config.c
@@ -1,5 +1,6 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qlist.h"
 #include "qemu-common.h"
 #include "qemu/error-report.h"