Include qmp-commands.h exactly where needed

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-7-armbru@redhat.com>
[OSX breakage fixed]

diff --git a/block.c b/block.c
index 2a8bc276c7b030e5778dc86b1ef8422cf5d132ab..a97f709252cd15078d172e6e5d372a0fc06d7f55 100644 (file)
--- a/block.c
+++ b/block.c
@@ -39,7 +39,6 @@
 #include "qemu/notify.h"
 #include "qemu/coroutine.h"
 #include "block/qapi.h"
-#include "qmp-commands.h"
 #include "qemu/timer.h"
 #include "qapi-event.h"
 #include "qemu/cutils.h"

diff --git a/blockjob.c b/blockjob.c
index d766fdc4ce54d14c8a045a66bec2e19a0a7e8d08..081f1d2b916f0236ff59a23b6828bdd792c63afa 100644 (file)
--- a/blockjob.c
+++ b/blockjob.c
@@ -34,7 +34,6 @@
 #include "qapi/qmp/qjson.h"
 #include "qemu/coroutine.h"
 #include "qemu/id.h"
-#include "qmp-commands.h"
 #include "qemu/timer.h"
 #include "qapi-event.h"
 

diff --git a/hw/acpi/acpi-stub.c b/hw/acpi/acpi-stub.c
index 7dfc8af316ee9c3709b7ec56d1f19d43e31f6e0d..4c9d081ed48e10fdf6a56d81a442ed66acd44253 100644 (file)
--- a/hw/acpi/acpi-stub.c
+++ b/hw/acpi/acpi-stub.c
@@ -21,7 +21,6 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
-#include "qmp-commands.h"
 #include "hw/acpi/acpi.h"
 
 void acpi_table_add(const QemuOpts *opts, Error **errp)

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 32a876be5608b02515b082cb96fb6775acad26fd..659be6b7466333ffce9da559e0f561f6f08c614a 100644 (file)
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -74,7 +74,6 @@
 #include "hw/compat.h"
 #include "qemu/cutils.h"
 #include "hw/ppc/spapr_cpu_core.h"
-#include "qmp-commands.h"
 
 #include <libfdt.h>
 

diff --git a/hw/s390x/s390-stattrib.c b/hw/s390x/s390-stattrib.c
index 2902f54f11b311b7dc4b25887df5c5409103eade..c6c06b2780997315ddb2dacb5639d44b6c6c5a97 100644 (file)
--- a/hw/s390x/s390-stattrib.c
+++ b/hw/s390x/s390-stattrib.c
@@ -12,7 +12,6 @@
 #include "qemu/osdep.h"
 #include "hw/boards.h"
 #include "cpu.h"
-#include "qmp-commands.h"
 #include "migration/qemu-file.h"
 #include "migration/register.h"
 #include "hw/s390x/storage-attributes.h"

diff --git a/hw/smbios/smbios-stub.c b/hw/smbios/smbios-stub.c
index 61becef4ae0952ce75abafb4586304f1c6082073..d3a385441a984854cc572b50ed141a0376a52139 100644 (file)
--- a/hw/smbios/smbios-stub.c
+++ b/hw/smbios/smbios-stub.c
@@ -23,7 +23,6 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
-#include "qmp-commands.h"
 #include "hw/smbios/smbios.h"
 
 void smbios_entry_add(QemuOpts *opts, Error **errp)

diff --git a/hw/xen/xen-common.c b/hw/xen/xen-common.c
index afa1e3f404b2cc4b929f529333c0d709d01d3282..83099dd1b10c53c55de344b712eb56ac256e3826 100644 (file)
--- a/hw/xen/xen-common.c
+++ b/hw/xen/xen-common.c
@@ -11,7 +11,6 @@
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
 #include "hw/xen/xen_backend.h"
-#include "qmp-commands.h"
 #include "chardev/char.h"
 #include "sysemu/accel.h"
 #include "migration/misc.h"

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

diff --git a/qga/guest-agent-core.h b/qga/guest-agent-core.h
index 3e8a4acff22d14f81303b904a42489653bd34ee0..6f4d214cb9ffccd9d3d561144b42d1b1dece748c 100644 (file)
--- a/qga/guest-agent-core.h
+++ b/qga/guest-agent-core.h
@@ -12,7 +12,7 @@
  */
 #include "qapi/qmp/dispatch.h"
 #include "qemu-common.h"
-#include "qga-qmp-commands.h"
+#include "qga-qapi-types.h"
 
 #define QGA_READ_COUNT_DEFAULT 4096
 

diff --git a/qga/main.c b/qga/main.c
index 57083ca10c55499ecb0182523a456d5e8a53c633..804cc4c1a0b41b161ed1b7c574d502c5c849fbca 100644 (file)
--- a/qga/main.c
+++ b/qga/main.c
@@ -23,6 +23,7 @@
 #include "qapi/qmp/qjson.h"
 #include "qga/guest-agent-core.h"
 #include "qemu/module.h"
+#include "qga-qmp-commands.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/error.h"
 #include "qapi/qmp/dispatch.h"

diff --git a/stubs/dump.c b/stubs/dump.c
index d9ee23f1eb6eae427aa59a1b2920f5cc416655ba..8e5032c3afa4f50802dc5ab4a7d9644f895138cf 100644 (file)
--- a/stubs/dump.c
+++ b/stubs/dump.c
@@ -14,7 +14,6 @@
 #include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "sysemu/dump-arch.h"
-#include "qmp-commands.h"
 
 int cpu_get_dump_info(ArchDumpInfo *info,
                       const struct GuestPhysBlockList *guest_phys_blocks)