From abb297ed4408e3859776a1a3c91d99225b9795b9 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 1 Feb 2018 12:18:33 +0100 Subject: [PATCH] Include qmp-commands.h exactly where needed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Markus Armbruster Message-Id: <20180201111846.21846-7-armbru@redhat.com> [OSX breakage fixed] --- block.c | 1 - blockjob.c | 1 - hw/acpi/acpi-stub.c | 1 - hw/ppc/spapr.c | 1 - hw/s390x/s390-stattrib.c | 1 - hw/smbios/smbios-stub.c | 1 - hw/xen/xen-common.c | 1 - include/sysemu/arch_init.h | 1 - qga/guest-agent-core.h | 2 +- qga/main.c | 1 + stubs/dump.c | 1 - 11 files changed, 2 insertions(+), 10 deletions(-) diff --git a/block.c b/block.c index 2a8bc276c7..a97f709252 100644 --- 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 d766fdc4ce..081f1d2b91 100644 --- 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 7dfc8af316..4c9d081ed4 100644 --- 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 32a876be56..659be6b746 100644 --- 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 diff --git a/hw/s390x/s390-stattrib.c b/hw/s390x/s390-stattrib.c index 2902f54f11..c6c06b2780 100644 --- 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 61becef4ae..d3a385441a 100644 --- 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 afa1e3f404..83099dd1b1 100644 --- 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 f999bfd3be..4b88f99060 100644 --- 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 3e8a4acff2..6f4d214cb9 100644 --- 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 57083ca10c..804cc4c1a0 100644 --- 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 d9ee23f1eb..8e5032c3af 100644 --- 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)