diff --git a/block.c b/block.c index a97f709252cd..367641ef4f63 100644 --- 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 60ddf8623ee6..2626f8ae3a65 100644 --- 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 cd578d3d1475..eafa97cd72ae 100644 --- 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 diff --git a/block/file-posix.c b/block/file-posix.c index 36ee89e94022..9422ad529cc3 100644 --- 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 9e02214a69be..2f1da48e71c5 100644 --- 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 #include diff --git a/block/gluster.c b/block/gluster.c index 0f4265a3a41e..097b6930a59b 100644 --- a/block/gluster.c +++ b/block/gluster.c @@ -11,6 +11,7 @@ #include #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 9a1bf43cbcc7..8edd480f928a 100644 --- 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 12a8cb5a8242..1fdeb1ef2fdb 100644 --- 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 369241aae804..0b32c04cd0eb 100644 --- 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 +#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 76b9e83cea7d..42be5ed49d09 100644 --- 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 8cb70dbad590..9294a9fcc4f9 100644 --- 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 8890a0c4ba97..91f5f4c3c935 100644 --- 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 a690595f2c9a..93e76580b066 100644 --- 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 #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 90ef3166de43..bdbdeae7e451 100644 --- 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 126f73c676f4..b10e8cc6d4b0 100644 --- 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 13550b019192..7870d6a3004e 100644 --- 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 62c969caa3f8..1143db44a760 100644 --- 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 071e5e9bbb27..0b55392fe7de 100644 --- 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 fd994f86b1f6..bdb6c18a0f93 100644 --- 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 c6c06b278099..a1d2135a6013 100644 --- 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 584a6f2442a5..3b678685e129 100644 --- 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 549e4c461830..47e2910db260 100644 --- 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 a591c272134a..3da8486ab1a5 100644 --- 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 64b929882953..f532d10e3553 100644 --- 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 1749dabf250c..68a0c904eaf8 100644 --- 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 355fe0f5a25d..5edbe02b1c7f 100644 --- 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 ff9874ea16c5..50ace162059d 100644 --- 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 9283d602e6aa..ad91ef238198 100644 --- 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 83ea4a1aafe9..ad64ad8e6824 100644 --- 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 eefb259e0ad3..71f1119bc9d9 100644 --- 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 865d2fca36d2..9a492b84a4b9 100644 --- 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 40fe3cbc1253..0c87ad833ec8 100644 --- 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 47a0ff348bb9..1e694b5ecf97 100644 --- 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 c80d5c8a3351..449e631c869a 100644 --- 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 a88c5f02b115..b127fb6db6c9 100644 --- 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 8c9323786638..03d45f44f87f 100644 --- 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 d23e11bc53e0..4d513fb329f1 100644 --- 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 b2b37d63bcf7..5d2f13a5e451 100644 --- 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 4b88f9906045..28f713eae235 100644 --- 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 f3a1ec243dac..12fef809232e 100644 --- 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 64d81e9f1d43..f3a227b4fcc8 100644 --- 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 20f7b159b397..a22d91108752 100644 --- 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 b36449dd65d9..7a22ca74e2da 100644 --- 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 7044d292c85e..8991816bbfc8 100644 --- 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 e3a14d5dda9e..ae6888f74ae0 100644 --- 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 92f957f40ed9..e31ac4be1fba 100644 --- 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 ba3029cc89e5..9d7e88e84a28 100644 --- 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 3e235a1eeefd..3566eed36530 100644 --- 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 52634b97256d..7c3b42cfe2b0 100644 --- 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 0aa8a6c60bd4..a954c2192b01 100644 --- 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 8023233c3dbe..c6bcfcd83e51 100644 --- 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 @@ -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 c70bde3eb1cd..2e5737ce9c5c 100644 --- 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 #include @@ -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 3723493be1ab..6ff8ef41e94d 100644 --- 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 804cc4c1a0b4..72406a3c235a 100644 --- 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 f87de2bc26a8..1b750293e4ea 100644 --- 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 ee0cbba6a5ea..b72456241585 100644 --- 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 527b5bb5711c..77f796bbee5b 100644 --- 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 6824a88caabe..2719df3bae84 100644 --- 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 26c56c506267..f89d748ba408 100644 --- a/scripts/qapi-commands.py +++ b/scripts/qapi-commands.py @@ -294,6 +294,7 @@ def visit_command(self, name, info, arg_type, ret_type, #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 @@ def visit_command(self, name, info, arg_type, ret_type, 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 9d7134658d83..c710968dc225 100644 --- a/scripts/qapi-event.py +++ b/scripts/qapi-event.py @@ -210,6 +210,7 @@ def visit_event(self, name, info, arg_type, boxed): #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 @@ def visit_event(self, name, info, arg_type, boxed): 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 5cb63eae4135..b5e431e769da 100644 --- 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 75e155ffb1c4..75429129fde0 100644 --- 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 212a5f0697e9..27201c4f91de 100644 --- 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 3934e62ef7cd..7aa5af428cea 100644 --- 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 885d0e3de688..7a3670643cbe 100644 --- 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 65456c9e379b..8b5ab1fd020a 100644 --- 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 c9ac997555f1..313030a14cf4 100644 --- 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 991bc1aec2f0..306d4c06de14 100644 --- 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 ded1c54c0638..cd4e20e1ea55 100644 --- 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 16d60818a785..b65374c6347a 100644 --- 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 fe7847cbd5b6..811169453ab4 100644 --- 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 9efad9574960..d0abad40f5e9 100644 --- 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 8158854e1706..68aca9cb389a 100644 --- 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 71ebb5c02c15..ebdf32c2e29d 100644 --- 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 f98bed7a2d13..187d68fb7e34 100644 --- 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 cc9661af47ef..908f9b981f6e 100644 --- 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 847703cb1492..9dab7ac61ece 100644 --- 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 2616d33c29d4..8ab43d742a44 100644 --- 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 911e3f6e8df3..54e68a1ad24e 100644 --- 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 d0c4bf2b9df0..94eb4df28d4b 100644 --- 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 250647336518..95f7839aef40 100644 --- 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 cc1bb1afdfd1..b37d695c28f7 100644 --- 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 e67c7289ebbd..5c5b661f8a36 100644 --- a/tests/test-qga.c +++ b/tests/test-qga.c @@ -5,6 +5,7 @@ #include #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 e5ee69e9af9f..801234134380 100644 --- 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 20bf9a54140c..2e6f7f422fba 100644 --- 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 7cf86707ec9d..09a56d2d0667 100644 --- 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 cebeb793b028..31372777aee4 100644 --- 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 a7940a4639e4..e9a3cb7ac3ab 100644 --- 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 95eb449cfc1f..128fce302fd0 100644 --- 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 ea634dc05a60..41148394572a 100644 --- 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 68ff954578d3..7190e680dc15 100644 --- 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 49f4f0c2216f..6062d4e942fd 100644 --- 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 a5f1cbb3ca47..8bef0fb0383a 100644 --- 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 4085282a7a5c..212ae90d0036 100644 --- 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 230c699a513e..10cae120cca9 100644 --- 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"