From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59398) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egT3K-00046U-F9 for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1egT3H-0000Za-8j for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:10 -0500 Received: from mx1.redhat.com ([209.132.183.28]:64889) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1egT3H-0000Yk-1Z for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:07 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 36CC5780E9 for ; Tue, 30 Jan 2018 10:22:06 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-148.ams2.redhat.com [10.36.116.148]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CB7135C3FA for ; Tue, 30 Jan 2018 10:22:05 +0000 (UTC) From: Markus Armbruster Date: Tue, 30 Jan 2018 11:21:49 +0100 Message-Id: <20180130102202.28519-6-armbru@redhat.com> In-Reply-To: <20180130102202.28519-1-armbru@redhat.com> References: <20180130102202.28519-1-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 05/18] Include qmp-commands.h exactly where needed List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Markus Armbruster --- 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 - ui/cocoa.m | 1 - 12 files changed, 2 insertions(+), 11 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 88a78d31eb..7474d6eeeb 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 632a938dcc..78c18f34a7 100644 --- a/hw/xen/xen-common.c +++ b/hw/xen/xen-common.c @@ -10,7 +10,6 @@ #include "qemu/osdep.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 8751c468ed..90b38aecdd 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) diff --git a/ui/cocoa.m b/ui/cocoa.m index 6be9848391..19e1e827d2 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -31,7 +31,6 @@ #include "ui/console.h" #include "ui/input.h" #include "sysemu/sysemu.h" -#include "qmp-commands.h" #include "sysemu/blockdev.h" #include "qemu-version.h" #include -- 2.13.6