From nobody Sun Apr 28 12:31:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1517307944260261.1465476066297; Tue, 30 Jan 2018 02:25:44 -0800 (PST) Received: from localhost ([::1]:55127 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egT6l-0006ax-3i for importer@patchew.org; Tue, 30 Jan 2018 05:25:43 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59520) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egT3R-00049q-MT for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1egT3L-0000c1-7q for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:17 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50736) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1egT3K-0000YQ-Uw for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:11 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BDF6D3AD83 for ; Tue, 30 Jan 2018 10:22:04 +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 2E1527D533 for ; Tue, 30 Jan 2018 10:22:04 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 97ACD1138646; Tue, 30 Jan 2018 11:22:02 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 30 Jan 2018 11:21:45 +0100 Message-Id: <20180130102202.28519-2-armbru@redhat.com> In-Reply-To: <20180130102202.28519-1-armbru@redhat.com> References: <20180130102202.28519-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 30 Jan 2018 10:22:04 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 01/18] Clean up includes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Clean up includes so that osdep.h is included first and headers which it implies are not included manually. This commit was created with scripts/clean-includes, with the change to target/s390x/gen-features.c manually reverted, and blank lines around deletions collapsed. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- block/parallels.h | 1 - hw/block/vhost-user-blk.c | 1 - hw/ide/sii3112.c | 1 + hw/nvram/eeprom_at24c.c | 3 +-- hw/tpm/tpm_emulator.c | 4 ---- hw/tpm/tpm_int.h | 2 -- hw/tpm/tpm_ioctl.h | 2 -- hw/xtensa/xtensa_memory.h | 1 - include/exec/tb-lookup.h | 2 -- include/hw/intc/xlnx-pmu-iomod-intc.h | 1 - include/hw/intc/xlnx-zynqmp-ipi.h | 1 - include/hw/nvram/fw_cfg.h | 1 - include/hw/pci-bridge/simba.h | 1 - include/hw/xtensa/xtensa-isa.h | 2 -- include/qapi/clone-visitor.h | 1 - include/sysemu/hvf.h | 2 -- include/ui/console.h | 1 - io/channel-websock.c | 3 --- linux-user/syscall.c | 1 - scsi/pr-helper.h | 2 -- target/i386/hvf/vmx.h | 1 - target/i386/hvf/x86hvf.c | 3 --- target/xtensa/core-dc232b/xtensa-modules.c | 1 + target/xtensa/core-dc233c/xtensa-modules.c | 1 + target/xtensa/core-de212/xtensa-modules.c | 1 + target/xtensa/core-fsf/xtensa-modules.c | 1 + target/xtensa/core-sample_controller/xtensa-modules.c | 1 + target/xtensa/xtensa-isa.c | 4 +--- tests/migration/stress.c | 10 +--------- tests/ptimer-test.c | 4 ++-- trace/control-internal.h | 2 -- 31 files changed, 11 insertions(+), 51 deletions(-) diff --git a/block/parallels.h b/block/parallels.h index 4b044079ef..5aa101cfc8 100644 --- a/block/parallels.h +++ b/block/parallels.h @@ -32,7 +32,6 @@ #ifndef BLOCK_PARALLELS_H #define BLOCK_PARALLELS_H #include "qemu/coroutine.h" -#include "qemu/typedefs.h" =20 #define HEADS_NUMBER 16 #define SEC_IN_CYL 32 diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c index b53b4c9c57..f840f07dfe 100644 --- a/hw/block/vhost-user-blk.c +++ b/hw/block/vhost-user-blk.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/error-report.h" -#include "qemu/typedefs.h" #include "qemu/cutils.h" #include "qom/object.h" #include "hw/qdev-core.h" diff --git a/hw/ide/sii3112.c b/hw/ide/sii3112.c index 17aa930e39..a5d1776756 100644 --- a/hw/ide/sii3112.c +++ b/hw/ide/sii3112.c @@ -12,6 +12,7 @@ * http://wiki.osdev.org/User:Quok/Silicon_Image_Datasheets */ =20 +#include "qemu/osdep.h" #include #include #include "trace.h" diff --git a/hw/nvram/eeprom_at24c.c b/hw/nvram/eeprom_at24c.c index efa3621ac6..22183f5360 100644 --- a/hw/nvram/eeprom_at24c.c +++ b/hw/nvram/eeprom_at24c.c @@ -7,9 +7,8 @@ * the LICENSE file in the top-level directory. */ =20 -#include - #include "qemu/osdep.h" + #include "qapi/error.h" #include "hw/hw.h" #include "hw/i2c/i2c.h" diff --git a/hw/tpm/tpm_emulator.c b/hw/tpm/tpm_emulator.c index 35c78de5a9..7be79e7296 100644 --- a/hw/tpm/tpm_emulator.c +++ b/hw/tpm/tpm_emulator.c @@ -40,10 +40,6 @@ #include "qapi/clone-visitor.h" #include "chardev/char-fe.h" =20 -#include -#include -#include -#include =20 #define DEBUG_TPM 0 =20 diff --git a/hw/tpm/tpm_int.h b/hw/tpm/tpm_int.h index abbca5191a..a4c77fbd7e 100644 --- a/hw/tpm/tpm_int.h +++ b/hw/tpm/tpm_int.h @@ -12,8 +12,6 @@ #ifndef TPM_TPM_INT_H #define TPM_TPM_INT_H =20 -#include "qemu/osdep.h" - #define TPM_STANDARD_CMDLINE_OPTS \ { \ .name =3D "type", \ diff --git a/hw/tpm/tpm_ioctl.h b/hw/tpm/tpm_ioctl.h index 54c8d345ad..59a0b0595d 100644 --- a/hw/tpm/tpm_ioctl.h +++ b/hw/tpm/tpm_ioctl.h @@ -8,9 +8,7 @@ #ifndef _TPM_IOCTL_H_ #define _TPM_IOCTL_H_ =20 -#include #include -#include #include =20 /* diff --git a/hw/xtensa/xtensa_memory.h b/hw/xtensa/xtensa_memory.h index cab4d172d4..e9aa08749d 100644 --- a/hw/xtensa/xtensa_memory.h +++ b/hw/xtensa/xtensa_memory.h @@ -28,7 +28,6 @@ #ifndef _XTENSA_MEMORY_H #define _XTENSA_MEMORY_H =20 -#include "qemu/osdep.h" #include "qemu-common.h" #include "cpu.h" #include "exec/memory.h" diff --git a/include/exec/tb-lookup.h b/include/exec/tb-lookup.h index 296138591a..492cb68289 100644 --- a/include/exec/tb-lookup.h +++ b/include/exec/tb-lookup.h @@ -7,8 +7,6 @@ #ifndef EXEC_TB_LOOKUP_H #define EXEC_TB_LOOKUP_H =20 -#include "qemu/osdep.h" - #ifdef NEED_CPU_H #include "cpu.h" #else diff --git a/include/hw/intc/xlnx-pmu-iomod-intc.h b/include/hw/intc/xlnx-p= mu-iomod-intc.h index 1fdba73b9f..01c9d040b8 100644 --- a/include/hw/intc/xlnx-pmu-iomod-intc.h +++ b/include/hw/intc/xlnx-pmu-iomod-intc.h @@ -25,7 +25,6 @@ #ifndef XLNX_PMU_IO_INTC_H #define XLNX_PMU_IO_INTC_H =20 -#include "qemu/osdep.h" #include "hw/sysbus.h" #include "hw/register.h" =20 diff --git a/include/hw/intc/xlnx-zynqmp-ipi.h b/include/hw/intc/xlnx-zynqm= p-ipi.h index 4afa4ff313..866c719c6f 100644 --- a/include/hw/intc/xlnx-zynqmp-ipi.h +++ b/include/hw/intc/xlnx-zynqmp-ipi.h @@ -25,7 +25,6 @@ #ifndef XLNX_ZYNQMP_IPI_H #define XLNX_ZYNQMP_IPI_H =20 -#include "qemu/osdep.h" #include "hw/sysbus.h" #include "hw/register.h" =20 diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h index 7ccbae5fba..b2259cc4a3 100644 --- a/include/hw/nvram/fw_cfg.h +++ b/include/hw/nvram/fw_cfg.h @@ -1,7 +1,6 @@ #ifndef FW_CFG_H #define FW_CFG_H =20 -#include "qemu/typedefs.h" #include "exec/hwaddr.h" #include "hw/nvram/fw_cfg_keys.h" #include "hw/sysbus.h" diff --git a/include/hw/pci-bridge/simba.h b/include/hw/pci-bridge/simba.h index fac56ab1cf..e13ba27d0b 100644 --- a/include/hw/pci-bridge/simba.h +++ b/include/hw/pci-bridge/simba.h @@ -24,7 +24,6 @@ * THE SOFTWARE. */ =20 -#include "qemu/osdep.h" #include "hw/pci/pci_bridge.h" =20 =20 diff --git a/include/hw/xtensa/xtensa-isa.h b/include/hw/xtensa/xtensa-isa.h index 353f82ba25..bd68ada640 100644 --- a/include/hw/xtensa/xtensa-isa.h +++ b/include/hw/xtensa/xtensa-isa.h @@ -25,8 +25,6 @@ #ifndef XTENSA_LIBISA_H #define XTENSA_LIBISA_H =20 -#include - #ifdef __cplusplus extern "C" { #endif diff --git a/include/qapi/clone-visitor.h b/include/qapi/clone-visitor.h index a4915c7d57..b119d3daa9 100644 --- a/include/qapi/clone-visitor.h +++ b/include/qapi/clone-visitor.h @@ -11,7 +11,6 @@ #ifndef QAPI_CLONE_VISITOR_H #define QAPI_CLONE_VISITOR_H =20 -#include "qemu/typedefs.h" #include "qapi/visitor.h" #include "qapi-visit.h" =20 diff --git a/include/sysemu/hvf.h b/include/sysemu/hvf.h index e4e43f6468..241118845c 100644 --- a/include/sysemu/hvf.h +++ b/include/sysemu/hvf.h @@ -12,8 +12,6 @@ #ifndef _HVF_H #define _HVF_H =20 -#include "config-host.h" -#include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/bitops.h" #include "exec/memory.h" diff --git a/include/ui/console.h b/include/ui/console.h index 7b35778444..b153a584da 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -5,7 +5,6 @@ #include "qom/object.h" #include "qapi/qmp/qdict.h" #include "qemu/notify.h" -#include "qemu/typedefs.h" #include "qapi-types.h" #include "qemu/error-report.h" #include "qapi/error.h" diff --git a/io/channel-websock.c b/io/channel-websock.c index 87ebdebfc0..7fd6bb68ba 100644 --- a/io/channel-websock.c +++ b/io/channel-websock.c @@ -26,9 +26,6 @@ #include "trace.h" #include "qemu/iov.h" =20 -#include - - /* Max amount to allow in rawinput/encoutput buffers */ #define QIO_CHANNEL_WEBSOCK_MAX_BUFFER 8192 =20 diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 74378947f0..779e590726 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -48,7 +48,6 @@ int __clone2(int (*fn)(void *), void *child_stack_base, #include #include #include -#include #include #include #include diff --git a/scsi/pr-helper.h b/scsi/pr-helper.h index 96c50a9e5f..096d1f1df6 100644 --- a/scsi/pr-helper.h +++ b/scsi/pr-helper.h @@ -26,8 +26,6 @@ #ifndef QEMU_PR_HELPER_H #define QEMU_PR_HELPER_H 1 =20 -#include - #define PR_HELPER_CDB_SIZE 16 #define PR_HELPER_SENSE_SIZE 96 #define PR_HELPER_DATA_SIZE 8192 diff --git a/target/i386/hvf/vmx.h b/target/i386/hvf/vmx.h index 9dfcd2f2eb..f3e6e86999 100644 --- a/target/i386/hvf/vmx.h +++ b/target/i386/hvf/vmx.h @@ -22,7 +22,6 @@ #ifndef VMX_H #define VMX_H =20 -#include #include #include #include "vmcs.h" diff --git a/target/i386/hvf/x86hvf.c b/target/i386/hvf/x86hvf.c index 7803e09a28..6c88939b96 100644 --- a/target/i386/hvf/x86hvf.c +++ b/target/i386/hvf/x86hvf.c @@ -29,11 +29,8 @@ =20 #include "hw/i386/apic_internal.h" =20 -#include -#include #include #include -#include =20 void hvf_set_segment(struct CPUState *cpu, struct vmx_segment *vmx_seg, SegmentCache *qseg, bool is_tr) diff --git a/target/xtensa/core-dc232b/xtensa-modules.c b/target/xtensa/cor= e-dc232b/xtensa-modules.c index 2e103cd2f5..f6f4afb535 100644 --- a/target/xtensa/core-dc232b/xtensa-modules.c +++ b/target/xtensa/core-dc232b/xtensa-modules.c @@ -18,6 +18,7 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ =20 +#include "qemu/osdep.h" #include #include "xtensa-isa-internal.h" =20 diff --git a/target/xtensa/core-dc233c/xtensa-modules.c b/target/xtensa/cor= e-dc233c/xtensa-modules.c index 2728311c9a..5e1f124f9c 100644 --- a/target/xtensa/core-dc233c/xtensa-modules.c +++ b/target/xtensa/core-dc233c/xtensa-modules.c @@ -21,6 +21,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ =20 +#include "qemu/osdep.h" #include #include "xtensa-isa-internal.h" =20 diff --git a/target/xtensa/core-de212/xtensa-modules.c b/target/xtensa/core= -de212/xtensa-modules.c index 4a8735889e..4493b9ff1e 100644 --- a/target/xtensa/core-de212/xtensa-modules.c +++ b/target/xtensa/core-de212/xtensa-modules.c @@ -21,6 +21,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ =20 +#include "qemu/osdep.h" #include #include "xtensa-isa-internal.h" =20 diff --git a/target/xtensa/core-fsf/xtensa-modules.c b/target/xtensa/core-f= sf/xtensa-modules.c index 238800d823..ee6dfe2ef3 100644 --- a/target/xtensa/core-fsf/xtensa-modules.c +++ b/target/xtensa/core-fsf/xtensa-modules.c @@ -18,6 +18,7 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ =20 +#include "qemu/osdep.h" #include #include "xtensa-isa-internal.h" =20 diff --git a/target/xtensa/core-sample_controller/xtensa-modules.c b/target= /xtensa/core-sample_controller/xtensa-modules.c index 2f000199b8..d3377118b2 100644 --- a/target/xtensa/core-sample_controller/xtensa-modules.c +++ b/target/xtensa/core-sample_controller/xtensa-modules.c @@ -21,6 +21,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ =20 +#include "qemu/osdep.h" #include #include "xtensa-isa-internal.h" =20 diff --git a/target/xtensa/xtensa-isa.c b/target/xtensa/xtensa-isa.c index e0076a694f..630b4f9da1 100644 --- a/target/xtensa/xtensa-isa.c +++ b/target/xtensa/xtensa-isa.c @@ -22,9 +22,7 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ =20 -#include -#include -#include +#include "qemu/osdep.h" #include "xtensa-isa.h" #include "xtensa-isa-internal.h" =20 diff --git a/tests/migration/stress.c b/tests/migration/stress.c index cf8ce8b16d..49a03aab7b 100644 --- a/tests/migration/stress.c +++ b/tests/migration/stress.c @@ -17,21 +17,13 @@ * License along with this library; if not, see . */ =20 -#include +#include "qemu/osdep.h" #include -#include -#include -#include -#include #include #include #include -#include #include -#include #include -#include -#include =20 const char *argv0; =20 diff --git a/tests/ptimer-test.c b/tests/ptimer-test.c index 5d1a2a8188..41488896f7 100644 --- a/tests/ptimer-test.c +++ b/tests/ptimer-test.c @@ -8,9 +8,9 @@ * */ =20 -#include - #include "qemu/osdep.h" +#include + #include "qemu/main-loop.h" #include "hw/ptimer.h" =20 diff --git a/trace/control-internal.h b/trace/control-internal.h index a9d395a587..c7fbe2d3bf 100644 --- a/trace/control-internal.h +++ b/trace/control-internal.h @@ -10,8 +10,6 @@ #ifndef TRACE__CONTROL_INTERNAL_H #define TRACE__CONTROL_INTERNAL_H =20 -#include /* size_t */ - #include "qom/cpu.h" =20 =20 --=20 2.13.6 From nobody Sun Apr 28 12:31:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1517308636351398.96869461556014; Tue, 30 Jan 2018 02:37:16 -0800 (PST) Received: from localhost ([::1]:55547 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egTHt-0007fG-HT for importer@patchew.org; Tue, 30 Jan 2018 05:37:13 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59549) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egT3X-0004Be-39 for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1egT3L-0000c8-9P for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:23 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44328) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1egT3K-0000YP-VY for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:11 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B68D9356C4 for ; Tue, 30 Jan 2018 10:22:04 +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 2D86B60C90 for ; Tue, 30 Jan 2018 10:22:04 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 9C5C51138648; Tue, 30 Jan 2018 11:22:02 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 30 Jan 2018 11:21:46 +0100 Message-Id: <20180130102202.28519-3-armbru@redhat.com> In-Reply-To: <20180130102202.28519-1-armbru@redhat.com> References: <20180130102202.28519-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Tue, 30 Jan 2018 10:22:04 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 02/18] Drop superfluous includes of qapi-types.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- backends/cryptodev.c | 1 - backends/hostmem.c | 1 - hmp.h | 1 - include/block/block.h | 1 - include/block/block_int.h | 1 - include/block/qapi.h | 1 - include/hw/acpi/acpi_dev_interface.h | 1 - include/migration/failover.h | 1 - include/net/net.h | 1 - include/net/slirp.h | 1 - include/net/tap.h | 1 - include/qapi/qmp/qlit.h | 1 - include/sysemu/dump.h | 1 - include/sysemu/replay.h | 1 - include/sysemu/sysemu.h | 1 - include/sysemu/tpm.h | 1 - include/sysemu/tpm_backend.h | 1 - include/ui/console.h | 1 - migration/migration.h | 1 - net/clients.h | 1 - net/tap_int.h | 1 - qapi/qmp-dispatch.c | 1 - qemu-keymap.c | 1 - target/i386/cpu.c | 1 - tests/test-clone-visitor.c | 1 - tests/test-qapi-util.c | 1 - tests/test-qmp-event.c | 1 - tests/test-qobject-input-visitor.c | 1 - tests/test-qobject-output-visitor.c | 1 - tests/test-string-input-visitor.c | 1 - tests/test-string-output-visitor.c | 1 - tests/test-visitor-serialization.c | 2 -- ui/input-legacy.c | 1 - ui/input.c | 1 - ui/vnc.h | 1 - 35 files changed, 36 deletions(-) diff --git a/backends/cryptodev.c b/backends/cryptodev.c index 67edfa5328..d0dff1a463 100644 --- a/backends/cryptodev.c +++ b/backends/cryptodev.c @@ -26,7 +26,6 @@ #include "hw/boards.h" #include "qapi/error.h" #include "qapi/visitor.h" -#include "qapi-types.h" #include "qapi-visit.h" #include "qemu/config-file.h" #include "qom/object_interfaces.h" diff --git a/backends/hostmem.c b/backends/hostmem.c index ee2c2d5bfd..81d14554a7 100644 --- a/backends/hostmem.c +++ b/backends/hostmem.c @@ -14,7 +14,6 @@ #include "hw/boards.h" #include "qapi/error.h" #include "qapi/visitor.h" -#include "qapi-types.h" #include "qapi-visit.h" #include "qemu/config-file.h" #include "qom/object_interfaces.h" diff --git a/hmp.h b/hmp.h index a6f56b1f29..dbb40ebbfa 100644 --- a/hmp.h +++ b/hmp.h @@ -16,7 +16,6 @@ =20 #include "qemu-common.h" #include "qemu/readline.h" -#include "qapi-types.h" #include "qapi/qmp/qdict.h" =20 void hmp_info_name(Monitor *mon, const QDict *qdict); diff --git a/include/block/block.h b/include/block/block.h index 9b12774ddf..0608834396 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -9,7 +9,6 @@ #include "block/dirty-bitmap.h" #include "block/blockjob.h" #include "qapi/qmp/qobject.h" -#include "qapi-types.h" #include "qemu/hbitmap.h" =20 /* block.c */ diff --git a/include/block/block_int.h b/include/block/block_int.h index 29cafa4236..6499f7c16a 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -31,7 +31,6 @@ #include "qemu/coroutine.h" #include "qemu/stats64.h" #include "qemu/timer.h" -#include "qapi-types.h" #include "qemu/hbitmap.h" #include "block/snapshot.h" #include "qemu/main-loop.h" diff --git a/include/block/qapi.h b/include/block/qapi.h index 82ba4b63a0..83bdb098bd 100644 --- a/include/block/qapi.h +++ b/include/block/qapi.h @@ -25,7 +25,6 @@ #ifndef BLOCK_QAPI_H #define BLOCK_QAPI_H =20 -#include "qapi-types.h" #include "block/block.h" #include "block/snapshot.h" =20 diff --git a/include/hw/acpi/acpi_dev_interface.h b/include/hw/acpi/acpi_de= v_interface.h index 3c2e4e95a5..dabf4c4fc9 100644 --- a/include/hw/acpi/acpi_dev_interface.h +++ b/include/hw/acpi/acpi_dev_interface.h @@ -2,7 +2,6 @@ #define ACPI_DEV_INTERFACE_H =20 #include "qom/object.h" -#include "qapi-types.h" #include "hw/boards.h" =20 /* These values are part of guest ABI, and can not be changed */ diff --git a/include/migration/failover.h b/include/migration/failover.h index ad91ef2381..9283d602e6 100644 --- a/include/migration/failover.h +++ b/include/migration/failover.h @@ -14,7 +14,6 @@ #define QEMU_FAILOVER_H =20 #include "qemu-common.h" -#include "qapi-types.h" =20 void failover_init_state(void); FailoverStatus failover_set_state(FailoverStatus old_state, diff --git a/include/net/net.h b/include/net/net.h index 4afac1a9dd..eefb259e0a 100644 --- a/include/net/net.h +++ b/include/net/net.h @@ -7,7 +7,6 @@ #include "qemu/option.h" #include "net/queue.h" #include "migration/vmstate.h" -#include "qapi-types.h" =20 #define MAC_FMT "%02X:%02X:%02X:%02X:%02X:%02X" #define MAC_ARG(x) ((uint8_t *)(x))[0], ((uint8_t *)(x))[1], \ diff --git a/include/net/slirp.h b/include/net/slirp.h index 0c98e463db..865d2fca36 100644 --- a/include/net/slirp.h +++ b/include/net/slirp.h @@ -27,7 +27,6 @@ #include "qemu-common.h" #include "qapi/qmp/qdict.h" #include "qemu/option.h" -#include "qapi-types.h" =20 #ifdef CONFIG_SLIRP =20 diff --git a/include/net/tap.h b/include/net/tap.h index 5da4edc692..ce6f8418ac 100644 --- a/include/net/tap.h +++ b/include/net/tap.h @@ -27,7 +27,6 @@ #define QEMU_NET_TAP_H =20 #include "qemu-common.h" -#include "qapi-types.h" #include "standard-headers/linux/virtio_net.h" =20 int tap_enable(NetClientState *nc); diff --git a/include/qapi/qmp/qlit.h b/include/qapi/qmp/qlit.h index b18406bce9..56f9d97bd9 100644 --- a/include/qapi/qmp/qlit.h +++ b/include/qapi/qmp/qlit.h @@ -14,7 +14,6 @@ #ifndef QLIT_H #define QLIT_H =20 -#include "qapi-types.h" #include "qobject.h" =20 typedef struct QLitDictEntry QLitDictEntry; diff --git a/include/sysemu/dump.h b/include/sysemu/dump.h index df43bd0e07..c14bcfe8c6 100644 --- a/include/sysemu/dump.h +++ b/include/sysemu/dump.h @@ -38,7 +38,6 @@ =20 #include "sysemu/dump-arch.h" #include "sysemu/memory_mapping.h" -#include "qapi-types.h" =20 typedef struct QEMU_PACKED MakedumpfileHeader { char signature[16]; /* =3D "makedumpfile" */ diff --git a/include/sysemu/replay.h b/include/sysemu/replay.h index fa14d0ec0b..dc8ae7b6b1 100644 --- a/include/sysemu/replay.h +++ b/include/sysemu/replay.h @@ -12,7 +12,6 @@ * */ =20 -#include "qapi-types.h" #include "sysemu.h" =20 /* replay clock kinds */ diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 1c925309e3..36fd371c93 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -5,7 +5,6 @@ #include "qemu/option.h" #include "qemu/queue.h" #include "qemu/timer.h" -#include "qapi-types.h" #include "qemu/notify.h" #include "qemu/main-loop.h" #include "qemu/bitmap.h" diff --git a/include/sysemu/tpm.h b/include/sysemu/tpm.h index 852e02687c..00be220248 100644 --- a/include/sysemu/tpm.h +++ b/include/sysemu/tpm.h @@ -13,7 +13,6 @@ #define QEMU_TPM_H =20 #include "qom/object.h" -#include "qapi-types.h" =20 int tpm_config_parse(QemuOptsList *opts_list, const char *optarg); int tpm_init(void); diff --git a/include/sysemu/tpm_backend.h b/include/sysemu/tpm_backend.h index 0d6c994a62..3c3960fa90 100644 --- a/include/sysemu/tpm_backend.h +++ b/include/sysemu/tpm_backend.h @@ -15,7 +15,6 @@ =20 #include "qom/object.h" #include "qemu-common.h" -#include "qapi-types.h" #include "qemu/option.h" #include "sysemu/tpm.h" =20 diff --git a/include/ui/console.h b/include/ui/console.h index b153a584da..d3312be322 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -5,7 +5,6 @@ #include "qom/object.h" #include "qapi/qmp/qdict.h" #include "qemu/notify.h" -#include "qapi-types.h" #include "qemu/error-report.h" #include "qapi/error.h" =20 diff --git a/migration/migration.h b/migration/migration.h index 786d971ce2..7e3dbed057 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -16,7 +16,6 @@ =20 #include "qemu-common.h" #include "qemu/thread.h" -#include "qapi-types.h" #include "exec/cpu-common.h" #include "qemu/coroutine_int.h" #include "hw/qdev.h" diff --git a/net/clients.h b/net/clients.h index 5cae479730..a6ef267e19 100644 --- a/net/clients.h +++ b/net/clients.h @@ -25,7 +25,6 @@ #define QEMU_NET_CLIENTS_H =20 #include "net/net.h" -#include "qapi-types.h" =20 int net_init_dump(const Netdev *netdev, const char *name, NetClientState *peer, Error **errp); diff --git a/net/tap_int.h b/net/tap_int.h index ae6888f74a..e3a14d5dda 100644 --- a/net/tap_int.h +++ b/net/tap_int.h @@ -27,7 +27,6 @@ #define NET_TAP_INT_H =20 #include "qemu-common.h" -#include "qapi-types.h" =20 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 b41fa174fe..7d18524f3c 100644 --- a/qapi/qmp-dispatch.c +++ b/qapi/qmp-dispatch.c @@ -17,7 +17,6 @@ #include "qapi/qmp/dispatch.h" #include "qapi/qmp/json-parser.h" #include "qapi/qmp/qjson.h" -#include "qapi-types.h" #include "qapi/qmp/qerror.h" =20 static QDict *qmp_dispatch_check_obj(const QObject *request, Error **errp) diff --git a/qemu-keymap.c b/qemu-keymap.c index 49e9167b86..6216371aa1 100644 --- a/qemu-keymap.c +++ b/qemu-keymap.c @@ -11,7 +11,6 @@ */ #include "qemu/osdep.h" #include "qemu-common.h" -#include "qapi-types.h" #include "qemu/notify.h" #include "ui/input.h" =20 diff --git a/target/i386/cpu.c b/target/i386/cpu.c index a49d2221ad..050644f820 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -32,7 +32,6 @@ #include "qapi/qmp/qerror.h" #include "qapi/qmp/types.h" =20 -#include "qapi-types.h" #include "qapi-visit.h" #include "qapi/visitor.h" #include "qom/qom-qobject.h" diff --git a/tests/test-clone-visitor.c b/tests/test-clone-visitor.c index ac6afc562e..6b6d4aaeba 100644 --- a/tests/test-clone-visitor.c +++ b/tests/test-clone-visitor.c @@ -11,7 +11,6 @@ =20 #include "qemu-common.h" #include "qapi/clone-visitor.h" -#include "test-qapi-types.h" #include "test-qapi-visit.h" #include "qapi/qmp/types.h" =20 diff --git a/tests/test-qapi-util.c b/tests/test-qapi-util.c index 4b5e4f8bd3..847f305cff 100644 --- a/tests/test-qapi-util.c +++ b/tests/test-qapi-util.c @@ -12,7 +12,6 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "test-qapi-types.h" =20 static void test_qapi_enum_parse(void) { diff --git a/tests/test-qmp-event.c b/tests/test-qmp-event.c index 9fb3c5e81e..46825b4f3f 100644 --- a/tests/test-qmp-event.c +++ b/tests/test-qmp-event.c @@ -14,7 +14,6 @@ #include "qemu/osdep.h" =20 #include "qemu-common.h" -#include "test-qapi-types.h" #include "test-qapi-visit.h" #include "test-qapi-event.h" #include "qapi/qmp/types.h" diff --git a/tests/test-qobject-input-visitor.c b/tests/test-qobject-input-= visitor.c index fe591814e4..ade6062e2c 100644 --- a/tests/test-qobject-input-visitor.c +++ b/tests/test-qobject-input-visitor.c @@ -16,7 +16,6 @@ #include "qemu-common.h" #include "qapi/error.h" #include "qapi/qobject-input-visitor.h" -#include "test-qapi-types.h" #include "test-qapi-visit.h" #include "qapi/qmp/types.h" #include "qapi/qmp/qjson.h" diff --git a/tests/test-qobject-output-visitor.c b/tests/test-qobject-outpu= t-visitor.c index d375100a52..1cff769b15 100644 --- a/tests/test-qobject-output-visitor.c +++ b/tests/test-qobject-output-visitor.c @@ -15,7 +15,6 @@ #include "qemu-common.h" #include "qapi/error.h" #include "qapi/qobject-output-visitor.h" -#include "test-qapi-types.h" #include "test-qapi-visit.h" #include "qapi/qmp/types.h" #include "qapi/qmp/qjson.h" diff --git a/tests/test-string-input-visitor.c b/tests/test-string-input-vi= sitor.c index 4f9c36bef1..4473944f3f 100644 --- a/tests/test-string-input-visitor.c +++ b/tests/test-string-input-visitor.c @@ -15,7 +15,6 @@ #include "qemu-common.h" #include "qapi/error.h" #include "qapi/string-input-visitor.h" -#include "test-qapi-types.h" #include "test-qapi-visit.h" #include "qapi/qmp/types.h" =20 diff --git a/tests/test-string-output-visitor.c b/tests/test-string-output-= visitor.c index 385cddb5d9..facb76ffc3 100644 --- a/tests/test-string-output-visitor.c +++ b/tests/test-string-output-visitor.c @@ -15,7 +15,6 @@ #include "qemu-common.h" #include "qapi/error.h" #include "qapi/string-output-visitor.h" -#include "test-qapi-types.h" #include "test-qapi-visit.h" #include "qapi/qmp/types.h" =20 diff --git a/tests/test-visitor-serialization.c b/tests/test-visitor-serial= ization.c index 4d47ceec7a..a3407d205d 100644 --- a/tests/test-visitor-serialization.c +++ b/tests/test-visitor-serialization.c @@ -15,7 +15,6 @@ #include =20 #include "qemu-common.h" -#include "test-qapi-types.h" #include "test-qapi-visit.h" #include "qapi/error.h" #include "qapi/qmp/types.h" @@ -24,7 +23,6 @@ #include "qapi/qobject-output-visitor.h" #include "qapi/string-input-visitor.h" #include "qapi/string-output-visitor.h" -#include "qapi-types.h" #include "qapi-visit.h" #include "qapi/dealloc-visitor.h" =20 diff --git a/ui/input-legacy.c b/ui/input-legacy.c index c75aba1549..92b37ccb90 100644 --- a/ui/input-legacy.c +++ b/ui/input-legacy.c @@ -26,7 +26,6 @@ #include "sysemu/sysemu.h" #include "ui/console.h" #include "qmp-commands.h" -#include "qapi-types.h" #include "ui/keymaps.h" #include "ui/input.h" =20 diff --git a/ui/input.c b/ui/input.c index e5b78aae9e..ab22c8423f 100644 --- a/ui/input.c +++ b/ui/input.c @@ -1,6 +1,5 @@ #include "qemu/osdep.h" #include "sysemu/sysemu.h" -#include "qapi-types.h" #include "qemu/error-report.h" #include "qmp-commands.h" #include "trace.h" diff --git a/ui/vnc.h b/ui/vnc.h index bbda0540a7..cfc3d0a570 100644 --- a/ui/vnc.h +++ b/ui/vnc.h @@ -42,7 +42,6 @@ #include "keymaps.h" #include "vnc-palette.h" #include "vnc-enc-zrle.h" -#include "qapi-types.h" =20 // #define _VNC_DEBUG 1 =20 --=20 2.13.6 From nobody Sun Apr 28 12:31:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1517308746696574.1552894027966; Tue, 30 Jan 2018 02:39:06 -0800 (PST) Received: from localhost ([::1]:55694 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egTJh-0000j3-Gi for importer@patchew.org; Tue, 30 Jan 2018 05:39:05 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59529) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egT3S-0004At-UL for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1egT3G-0000ZH-SZ for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:18 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59356) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1egT3G-0000YZ-EB for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:06 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 075C3A8AA for ; Tue, 30 Jan 2018 10:22:05 +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 2D80960C8B for ; Tue, 30 Jan 2018 10:22:04 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 9D295113864A; Tue, 30 Jan 2018 11:22:02 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 30 Jan 2018 11:21:47 +0100 Message-Id: <20180130102202.28519-4-armbru@redhat.com> In-Reply-To: <20180130102202.28519-1-armbru@redhat.com> References: <20180130102202.28519-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 30 Jan 2018 10:22:05 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 03/18] Include qapi/error.h exactly where needed X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This cleanup makes the number of objects depending on qapi/error.h drop from 1910 (out of 4739) to 1612 in my "build everything" tree. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- arch_init.c | 1 + audio/wavcapture.c | 1 + balloon.c | 1 + block.c | 2 ++ block/block-backend.c | 1 + block/iscsi.c | 1 + block/qapi.c | 1 + block/qcow2-cluster.c | 1 - block/qcow2.c | 2 ++ block/quorum.c | 1 + block/write-threshold.c | 1 + blockdev-nbd.c | 1 + blockdev.c | 1 + blockjob.c | 1 + chardev/char-ringbuf.c | 2 ++ chardev/char.c | 2 ++ chardev/spice.c | 1 + cpus.c | 2 ++ crypto/hash.c | 1 - crypto/hmac.c | 1 - crypto/ivgen-essiv.c | 1 - crypto/ivgen-plain.c | 1 - crypto/ivgen-plain64.c | 1 - crypto/random-gnutls.c | 1 + crypto/random-platform.c | 1 + docs/devel/qapi-code-gen.txt | 2 -- dump.c | 1 + fsdev/qemu-fsdev-throttle.h | 1 - fsdev/qemu-fsdev.c | 2 ++ hmp.c | 1 + hw/9pfs/9p-local.c | 1 + hw/9pfs/9p-proxy.c | 2 ++ hw/acpi/acpi-stub.c | 1 + hw/acpi/core.c | 2 ++ hw/acpi/memory_hotplug.c | 1 + hw/acpi/vmgenid.c | 1 + hw/adc/stm32f2xx_adc.c | 1 - hw/char/mcf_uart.c | 1 - hw/char/virtio-console.c | 1 + hw/core/qdev.c | 1 + hw/display/milkymist-tmu2.c | 1 + hw/display/qxl.c | 1 + hw/display/virtio-gpu-3d.c | 1 - hw/display/xlnx_dp.c | 1 + hw/i2c/ppc4xx_i2c.c | 1 - hw/i386/pc.c | 2 ++ hw/i386/pc_piix.c | 1 + hw/i386/pc_q35.c | 2 ++ hw/i386/xen/xen-hvm.c | 2 +- hw/ide/core.c | 2 ++ hw/intc/xics_pnv.c | 1 - hw/intc/xics_spapr.c | 1 - hw/ipmi/ipmi.c | 1 + hw/mips/mips_jazz.c | 1 + hw/mips/mips_malta.c | 1 + hw/misc/exynos4210_rng.c | 1 + hw/misc/mips_cmgcr.c | 1 - hw/misc/mps2-scc.c | 1 - hw/net/rocker/qmp-norocker.c | 1 + hw/net/rocker/rocker.c | 1 + hw/net/rocker/rocker_of_dpa.c | 1 + hw/net/virtio-net.c | 1 + hw/nios2/cpu_pic.c | 1 - hw/pci-bridge/i82801b11.c | 1 - hw/pci-bridge/ioh3420.c | 1 - hw/pci-bridge/xio3130_upstream.c | 1 - hw/pci-host/sabre.c | 1 - hw/pci/pci-stub.c | 1 + hw/pci/pci.c | 2 ++ hw/ppc/fdt.c | 1 - hw/ppc/pnv_bmc.c | 1 - hw/ppc/pnv_xscom.c | 1 - hw/ppc/ppc.c | 1 - hw/ppc/spapr_pci_vfio.c | 1 - hw/ppc/spapr_rtas.c | 1 + hw/ppc/spapr_rtc.c | 2 ++ hw/s390x/s390-skeys.c | 1 + hw/scsi/esp.c | 1 - hw/scsi/vhost-scsi-common.c | 1 - hw/sd/sdhci.c | 1 - hw/smbios/smbios-stub.c | 1 + hw/sparc64/niagara.c | 1 - hw/sparc64/sun4u_iommu.c | 1 - hw/ssi/stm32f2xx_spi.c | 1 - hw/timer/m48t59.c | 1 - hw/timer/mc146818rtc.c | 2 ++ hw/usb/ccid-card-passthru.c | 1 - hw/virtio/virtio-balloon.c | 1 + hw/watchdog/watchdog.c | 1 + include/crypto/random.h | 1 - include/crypto/xts.h | 1 - include/hw/ide/internal.h | 1 - include/ui/console.h | 1 - iothread.c | 1 + migration/colo-failover.c | 1 + migration/colo.c | 1 + migration/exec.c | 1 - migration/fd.c | 1 - migration/migration.c | 1 + migration/ram.c | 2 ++ migration/savevm.c | 1 + monitor.c | 2 ++ nbd/common.c | 1 - net/filter-replay.c | 1 - net/filter-rewriter.c | 1 - net/net.c | 2 ++ net/vde.c | 1 + net/vhost-user.c | 1 + numa.c | 1 + qdev-monitor.c | 1 + qga/commands-posix.c | 1 + qga/commands-win32.c | 2 ++ qga/commands.c | 1 + qga/main.c | 2 ++ qga/vss-win32.c | 1 + qmp.c | 1 + qobject/qnum.c | 1 - replay/replay-input.c | 1 - scripts/qapi-commands.py | 3 ++- scripts/qapi-event.py | 2 +- stubs/arch-query-cpu-def.c | 1 + stubs/arch-query-cpu-model-baseline.c | 1 + stubs/arch-query-cpu-model-comparison.c | 1 + stubs/arch-query-cpu-model-expansion.c | 1 + stubs/vmgenid.c | 1 + target/i386/cpu.c | 2 ++ target/i386/xsave_helper.c | 1 - target/nios2/helper.c | 1 - target/ppc/mmu-book3s-v3.c | 1 - target/ppc/mmu-hash64.c | 1 - target/ppc/mmu-radix64.c | 1 - target/ppc/mmu_helper.c | 1 - target/ppc/translate_init.c | 1 + target/s390x/excp_helper.c | 1 - target/s390x/helper.c | 1 - tests/check-qlist.c | 1 - tests/check-qnum.c | 1 - tests/io-channel-helpers.c | 1 - tests/test-aio-multithread.c | 1 - tests/test-qmp-commands.c | 1 + tests/test-qmp-event.c | 1 + tests/test-x86-cpuid-compat.c | 1 - tpm.c | 2 ++ trace/qmp.c | 1 + ui/console.c | 2 ++ ui/gtk.c | 1 + ui/input.c | 1 + ui/spice-core.c | 1 + ui/vnc.c | 1 + util/qemu-config.c | 1 + vl.c | 2 ++ 151 files changed, 117 insertions(+), 62 deletions(-) diff --git a/arch_init.c b/arch_init.c index a0b8ed6167..0fb8093f92 100644 --- a/arch_init.c +++ b/arch_init.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 "qemu-common.h" #include "cpu.h" diff --git a/audio/wavcapture.c b/audio/wavcapture.c index 5863803584..cf31ed652c 100644 --- a/audio/wavcapture.c +++ b/audio/wavcapture.c @@ -1,6 +1,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "monitor/monitor.h" +#include "qapi/error.h" #include "qemu/error-report.h" #include "audio.h" =20 diff --git a/balloon.c b/balloon.c index 1d720fff81..f8b5ca9870 100644 --- a/balloon.c +++ b/balloon.c @@ -31,6 +31,7 @@ #include "sysemu/balloon.h" #include "trace-root.h" #include "qmp-commands.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qapi/qmp/qjson.h" =20 diff --git a/block.c b/block.c index a8da4f2b25..2a8bc276c7 100644 --- a/block.c +++ b/block.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 "block/trace.h" #include "block/block_int.h" @@ -29,6 +30,7 @@ #include "qemu/error-report.h" #include "module_block.h" #include "qemu/module.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qapi/qmp/qbool.h" #include "qapi/qmp/qjson.h" diff --git a/block/block-backend.c b/block/block-backend.c index baef8e7abc..6a5fdb7f42 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -18,6 +18,7 @@ #include "sysemu/blockdev.h" #include "sysemu/sysemu.h" #include "qapi-event.h" +#include "qapi/error.h" #include "qemu/id.h" #include "trace.h" #include "migration/misc.h" diff --git a/block/iscsi.c b/block/iscsi.c index 6a1c53711a..9a1bf43cbc 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -38,6 +38,7 @@ #include "qemu/iov.h" #include "qemu/uuid.h" #include "qmp-commands.h" +#include "qapi/error.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 fc10f0a565..4fc9fd8082 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -29,6 +29,7 @@ #include "block/write-threshold.h" #include "qmp-commands.h" #include "qapi-visit.h" +#include "qapi/error.h" #include "qapi/qobject-output-visitor.h" #include "qapi/qmp/types.h" #include "sysemu/block-backend.h" diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index a3fec27bf9..3a979bcd82 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include =20 -#include "qapi/error.h" #include "qemu-common.h" #include "block/block_int.h" #include "block/qcow2.h" diff --git a/block/qcow2.c b/block/qcow2.c index 1f80961e1b..7645b3c6ae 100644 --- a/block/qcow2.c +++ b/block/qcow2.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 "block/block_int.h" #include "sysemu/block-backend.h" @@ -28,6 +29,7 @@ #include #include "block/qcow2.h" #include "qemu/error-report.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qapi/qmp/qbool.h" #include "qapi/qmp/types.h" diff --git a/block/quorum.c b/block/quorum.c index 272f9a5b77..ec427c39e7 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -16,6 +16,7 @@ #include "qemu/osdep.h" #include "qemu/cutils.h" #include "block/block_int.h" +#include "qapi/error.h" #include "qapi/qmp/qbool.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qerror.h" diff --git a/block/write-threshold.c b/block/write-threshold.c index 0bd1a01c86..a7146c8452 100644 --- a/block/write-threshold.c +++ b/block/write-threshold.c @@ -16,6 +16,7 @@ #include "block/write-threshold.h" #include "qemu/notify.h" #include "qapi-event.h" +#include "qapi/error.h" #include "qmp-commands.h" =20 =20 diff --git a/blockdev-nbd.c b/blockdev-nbd.c index 9e3c22109c..f3c3400e52 100644 --- a/blockdev-nbd.c +++ b/blockdev-nbd.c @@ -13,6 +13,7 @@ #include "sysemu/blockdev.h" #include "sysemu/block-backend.h" #include "hw/block/block.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "sysemu/sysemu.h" #include "qmp-commands.h" diff --git a/blockdev.c b/blockdev.c index 8e977eef11..ad82dbbeee 100644 --- a/blockdev.c +++ b/blockdev.c @@ -42,6 +42,7 @@ #include "qemu/config-file.h" #include "qapi/qmp/types.h" #include "qapi-visit.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qapi/qobject-output-visitor.h" #include "sysemu/sysemu.h" diff --git a/blockjob.c b/blockjob.c index f5cea84e73..d766fdc4ce 100644 --- a/blockjob.c +++ b/blockjob.c @@ -29,6 +29,7 @@ #include "block/blockjob_int.h" #include "block/block_int.h" #include "sysemu/block-backend.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qapi/qmp/qjson.h" #include "qemu/coroutine.h" diff --git a/chardev/char-ringbuf.c b/chardev/char-ringbuf.c index df52b04d22..c1fa4c3f87 100644 --- a/chardev/char-ringbuf.c +++ b/chardev/char-ringbuf.c @@ -21,9 +21,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "chardev/char.h" #include "qmp-commands.h" +#include "qapi/error.h" #include "qemu/base64.h" =20 /* Ring buffer chardev */ diff --git a/chardev/char.c b/chardev/char.c index 3e14de1920..51f269796a 100644 --- a/chardev/char.c +++ b/chardev/char.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 "qemu/cutils.h" #include "monitor/monitor.h" @@ -30,6 +31,7 @@ #include "chardev/char.h" #include "qmp-commands.h" #include "qapi-visit.h" +#include "qapi/error.h" #include "sysemu/replay.h" #include "qemu/help_option.h" =20 diff --git a/chardev/spice.c b/chardev/spice.c index a312078812..bbdf649904 100644 --- a/chardev/spice.c +++ b/chardev/spice.c @@ -2,6 +2,7 @@ #include "trace.h" #include "ui/qemu-spice.h" #include "chardev/char.h" +#include "qapi/error.h" #include "qemu/error-report.h" #include #include diff --git a/cpus.c b/cpus.c index 2cb0af9b22..e3b2da1572 100644 --- a/cpus.c +++ b/cpus.c @@ -23,11 +23,13 @@ */ =20 /* Needed early for CONFIG_BSD etc. */ + #include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/config-file.h" #include "cpu.h" #include "monitor/monitor.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qemu/error-report.h" #include "sysemu/sysemu.h" diff --git a/crypto/hash.c b/crypto/hash.c index 8dab25d9ea..b97323cf90 100644 --- a/crypto/hash.c +++ b/crypto/hash.c @@ -19,7 +19,6 @@ */ =20 #include "qemu/osdep.h" -#include "qapi/error.h" #include "crypto/hash.h" #include "hashpriv.h" =20 diff --git a/crypto/hmac.c b/crypto/hmac.c index f6c2d8db60..4de7e8c9cb 100644 --- a/crypto/hmac.c +++ b/crypto/hmac.c @@ -10,7 +10,6 @@ */ =20 #include "qemu/osdep.h" -#include "qapi/error.h" #include "crypto/hmac.h" #include "hmacpriv.h" =20 diff --git a/crypto/ivgen-essiv.c b/crypto/ivgen-essiv.c index ad4d926c19..aeaa8fcd5b 100644 --- a/crypto/ivgen-essiv.c +++ b/crypto/ivgen-essiv.c @@ -19,7 +19,6 @@ */ =20 #include "qemu/osdep.h" -#include "qapi/error.h" #include "qemu/bswap.h" #include "crypto/ivgen-essiv.h" =20 diff --git a/crypto/ivgen-plain.c b/crypto/ivgen-plain.c index 9b9b4ad0bf..bf2fb7aac4 100644 --- a/crypto/ivgen-plain.c +++ b/crypto/ivgen-plain.c @@ -19,7 +19,6 @@ */ =20 #include "qemu/osdep.h" -#include "qapi/error.h" #include "qemu/bswap.h" #include "crypto/ivgen-plain.h" =20 diff --git a/crypto/ivgen-plain64.c b/crypto/ivgen-plain64.c index 6c6b1b44c3..e4679a1e6e 100644 --- a/crypto/ivgen-plain64.c +++ b/crypto/ivgen-plain64.c @@ -19,7 +19,6 @@ */ =20 #include "qemu/osdep.h" -#include "qapi/error.h" #include "qemu/bswap.h" #include "crypto/ivgen-plain.h" =20 diff --git a/crypto/random-gnutls.c b/crypto/random-gnutls.c index 5350003a0b..445fd6a30b 100644 --- a/crypto/random-gnutls.c +++ b/crypto/random-gnutls.c @@ -21,6 +21,7 @@ #include "qemu/osdep.h" =20 #include "crypto/random.h" +#include "qapi/error.h" =20 #include #include diff --git a/crypto/random-platform.c b/crypto/random-platform.c index 92eed0ee78..7541b4cae7 100644 --- a/crypto/random-platform.c +++ b/crypto/random-platform.c @@ -21,6 +21,7 @@ #include "qemu/osdep.h" =20 #include "crypto/random.h" +#include "qapi/error.h" =20 #ifdef _WIN32 #include diff --git a/docs/devel/qapi-code-gen.txt b/docs/devel/qapi-code-gen.txt index 06ab699066..5900b39b91 100644 --- a/docs/devel/qapi-code-gen.txt +++ b/docs/devel/qapi-code-gen.txt @@ -1170,7 +1170,6 @@ Example: #include "example-qapi-types.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/dispatch.h" - #include "qapi/error.h" =20 void example_qmp_init_marshal(QmpCommandList *cmds); UserDefOne *qmp_my_command(UserDefOneList *arg1, Error **errp); @@ -1263,7 +1262,6 @@ Example: #ifndef EXAMPLE_QAPI_EVENT_H #define EXAMPLE_QAPI_EVENT_H =20 - #include "qapi/error.h" #include "qapi/qmp/qdict.h" #include "example-qapi-types.h" =20 diff --git a/dump.c b/dump.c index e9dfed060a..7b13baa413 100644 --- a/dump.c +++ b/dump.c @@ -22,6 +22,7 @@ #include "sysemu/sysemu.h" #include "sysemu/memory_mapping.h" #include "sysemu/cpus.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qmp-commands.h" #include "qapi-event.h" diff --git a/fsdev/qemu-fsdev-throttle.h b/fsdev/qemu-fsdev-throttle.h index e418643ccb..4e83bdac25 100644 --- a/fsdev/qemu-fsdev-throttle.h +++ b/fsdev/qemu-fsdev-throttle.h @@ -18,7 +18,6 @@ #include "block/aio.h" #include "qemu/main-loop.h" #include "qemu/coroutine.h" -#include "qapi/error.h" #include "qemu/throttle.h" =20 typedef struct FsThrottle { diff --git a/fsdev/qemu-fsdev.c b/fsdev/qemu-fsdev.c index 941e309657..96e8683a09 100644 --- a/fsdev/qemu-fsdev.c +++ b/fsdev/qemu-fsdev.c @@ -10,7 +10,9 @@ * the COPYING file in the top-level directory. * */ + #include "qemu/osdep.h" +#include "qapi/error.h" #include "qemu-fsdev.h" #include "qemu/queue.h" #include "qemu-common.h" diff --git a/hmp.c b/hmp.c index 056bf70cf1..4fcf0e10d1 100644 --- a/hmp.c +++ b/hmp.c @@ -27,6 +27,7 @@ #include "qemu/sockets.h" #include "monitor/monitor.h" #include "monitor/qdev.h" +#include "qapi/error.h" #include "qapi/opts-visitor.h" #include "qapi/qmp/qerror.h" #include "qapi/string-input-visitor.h" diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c index b25c185ff0..c6d8af4fb8 100644 --- a/hw/9pfs/9p-local.c +++ b/hw/9pfs/9p-local.c @@ -23,6 +23,7 @@ #include #include #include "qemu/xattr.h" +#include "qapi/error.h" #include "qemu/cutils.h" #include "qemu/error-report.h" #include diff --git a/hw/9pfs/9p-proxy.c b/hw/9pfs/9p-proxy.c index f030c6a428..0f288b1300 100644 --- a/hw/9pfs/9p-proxy.c +++ b/hw/9pfs/9p-proxy.c @@ -9,10 +9,12 @@ * This work is licensed under the terms of the GNU GPL, version 2. See * the COPYING file in the top-level directory. */ + #include "qemu/osdep.h" #include #include #include "9p.h" +#include "qapi/error.h" #include "qemu/cutils.h" #include "qemu/error-report.h" #include "fsdev/qemu-fsdev.h" diff --git a/hw/acpi/acpi-stub.c b/hw/acpi/acpi-stub.c index 26bd22f7ec..7dfc8af316 100644 --- a/hw/acpi/acpi-stub.c +++ b/hw/acpi/acpi-stub.c @@ -19,6 +19,7 @@ */ =20 #include "qemu/osdep.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qmp-commands.h" #include "hw/acpi/acpi.h" diff --git a/hw/acpi/core.c b/hw/acpi/core.c index eb9b76f70b..5ee55414c1 100644 --- a/hw/acpi/core.c +++ b/hw/acpi/core.c @@ -18,12 +18,14 @@ * Contributions after 2012-01-13 are licensed under the terms of the * GNU GPL, version 2 or (at your option) any later version. */ + #include "qemu/osdep.h" #include "sysemu/sysemu.h" #include "hw/hw.h" #include "hw/acpi/acpi.h" #include "hw/nvram/fw_cfg.h" #include "qemu/config-file.h" +#include "qapi/error.h" #include "qapi/opts-visitor.h" #include "qapi-visit.h" #include "qapi-event.h" diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c index cda2c9dd06..ea958a0e99 100644 --- a/hw/acpi/memory_hotplug.c +++ b/hw/acpi/memory_hotplug.c @@ -6,6 +6,7 @@ #include "hw/qdev-core.h" #include "trace.h" #include "qapi-event.h" +#include "qapi/error.h" =20 #define MEMORY_SLOTS_NUMBER "MDNR" #define MEMORY_HOTPLUG_IO_REGION "HPMR" diff --git a/hw/acpi/vmgenid.c b/hw/acpi/vmgenid.c index ba6f47b67b..f25eafc0ec 100644 --- a/hw/acpi/vmgenid.c +++ b/hw/acpi/vmgenid.c @@ -11,6 +11,7 @@ */ =20 #include "qemu/osdep.h" +#include "qapi/error.h" #include "qmp-commands.h" #include "hw/acpi/acpi.h" #include "hw/acpi/aml-build.h" diff --git a/hw/adc/stm32f2xx_adc.c b/hw/adc/stm32f2xx_adc.c index 13f31ad2f7..329a8aa673 100644 --- a/hw/adc/stm32f2xx_adc.c +++ b/hw/adc/stm32f2xx_adc.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "hw/hw.h" -#include "qapi/error.h" #include "qemu/log.h" #include "hw/adc/stm32f2xx_adc.h" =20 diff --git a/hw/char/mcf_uart.c b/hw/char/mcf_uart.c index 56fa402b58..faae083e78 100644 --- a/hw/char/mcf_uart.c +++ b/hw/char/mcf_uart.c @@ -11,7 +11,6 @@ #include "hw/m68k/mcf.h" #include "chardev/char-fe.h" #include "exec/address-spaces.h" -#include "qapi/error.h" =20 typedef struct { SysBusDevice parent_obj; diff --git a/hw/char/virtio-console.c b/hw/char/virtio-console.c index 172c72d06c..4be5d4ee52 100644 --- a/hw/char/virtio-console.c +++ b/hw/char/virtio-console.c @@ -16,6 +16,7 @@ #include "trace.h" #include "hw/virtio/virtio-serial.h" #include "qapi-event.h" +#include "qapi/error.h" =20 #define TYPE_VIRTIO_CONSOLE_SERIAL_PORT "virtserialport" #define VIRTIO_CONSOLE(obj) \ diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 2456035d1a..f93f7d9388 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -28,6 +28,7 @@ #include "qemu/osdep.h" #include "hw/qdev.h" #include "sysemu/sysemu.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qapi/visitor.h" #include "qapi/qmp/qjson.h" diff --git a/hw/display/milkymist-tmu2.c b/hw/display/milkymist-tmu2.c index 59120ddb67..3ce44fdfce 100644 --- a/hw/display/milkymist-tmu2.c +++ b/hw/display/milkymist-tmu2.c @@ -28,6 +28,7 @@ #include "hw/hw.h" #include "hw/sysbus.h" #include "trace.h" +#include "qapi/error.h" #include "qemu/error-report.h" #include "qapi/error.h" =20 diff --git a/hw/display/qxl.c b/hw/display/qxl.c index b9fa067f6e..a71714ccb4 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -21,6 +21,7 @@ #include "qemu/osdep.h" #include =20 +#include "qapi/error.h" #include "qemu-common.h" #include "qemu/timer.h" #include "qemu/queue.h" diff --git a/hw/display/virtio-gpu-3d.c b/hw/display/virtio-gpu-3d.c index 8c106a662d..7db84efe89 100644 --- a/hw/display/virtio-gpu-3d.c +++ b/hw/display/virtio-gpu-3d.c @@ -17,7 +17,6 @@ #include "trace.h" #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-gpu.h" -#include "qapi/error.h" =20 #ifdef CONFIG_VIRGL =20 diff --git a/hw/display/xlnx_dp.c b/hw/display/xlnx_dp.c index ead4e1a0e4..6715b9cc2b 100644 --- a/hw/display/xlnx_dp.c +++ b/hw/display/xlnx_dp.c @@ -23,6 +23,7 @@ */ =20 #include "qemu/osdep.h" +#include "qapi/error.h" #include "qemu/log.h" #include "hw/display/xlnx_dp.h" =20 diff --git a/hw/i2c/ppc4xx_i2c.c b/hw/i2c/ppc4xx_i2c.c index e873a445da..ab64d196be 100644 --- a/hw/i2c/ppc4xx_i2c.c +++ b/hw/i2c/ppc4xx_i2c.c @@ -25,7 +25,6 @@ */ =20 #include "qemu/osdep.h" -#include "qapi/error.h" #include "qemu-common.h" #include "qemu/log.h" #include "cpu.h" diff --git a/hw/i386/pc.c b/hw/i386/pc.c index ccc50baa85..f610253953 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.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 "hw/hw.h" #include "hw/i386/pc.h" @@ -64,6 +65,7 @@ #include "hw/pci/pci_host.h" #include "acpi-build.h" #include "hw/mem/pc-dimm.h" +#include "qapi/error.h" #include "qapi/visitor.h" #include "qapi-visit.h" #include "qom/cpu.h" diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index a25619dfbf..456dc9e9f0 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -47,6 +47,7 @@ #include "exec/address-spaces.h" #include "hw/acpi/acpi.h" #include "cpu.h" +#include "qapi/error.h" #include "qemu/error-report.h" #ifdef CONFIG_XEN #include diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index ed3a0b8ff7..aba7541a82 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -27,6 +27,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/loader.h" @@ -48,6 +49,7 @@ #include "hw/ide/pci.h" #include "hw/ide/ahci.h" #include "hw/usb.h" +#include "qapi/error.h" #include "qemu/error-report.h" #include "sysemu/numa.h" =20 diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c index 8028bed6fd..bfdbe55580 100644 --- a/hw/i386/xen/xen-hvm.c +++ b/hw/i386/xen/xen-hvm.c @@ -17,7 +17,7 @@ #include "hw/xen/xen_common.h" #include "hw/xen/xen_backend.h" #include "qmp-commands.h" - +#include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/range.h" #include "sysemu/xen-mapcache.h" diff --git a/hw/ide/core.c b/hw/ide/core.c index 5be72d41dc..257b429381 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.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 "hw/hw.h" #include "hw/pci/pci.h" @@ -33,6 +34,7 @@ #include "sysemu/dma.h" #include "hw/block/block.h" #include "sysemu/block-backend.h" +#include "qapi/error.h" #include "qemu/cutils.h" =20 #include "hw/ide/internal.h" diff --git a/hw/intc/xics_pnv.c b/hw/intc/xics_pnv.c index 2a955a8946..c87de2189c 100644 --- a/hw/intc/xics_pnv.c +++ b/hw/intc/xics_pnv.c @@ -19,7 +19,6 @@ =20 #include "qemu/osdep.h" #include "sysemu/sysemu.h" -#include "qapi/error.h" #include "qemu/log.h" #include "hw/ppc/xics.h" =20 diff --git a/hw/intc/xics_spapr.c b/hw/intc/xics_spapr.c index 5a0967caf4..2e27b92b87 100644 --- a/hw/intc/xics_spapr.c +++ b/hw/intc/xics_spapr.c @@ -34,7 +34,6 @@ #include "hw/ppc/xics.h" #include "hw/ppc/fdt.h" #include "qapi/visitor.h" -#include "qapi/error.h" =20 /* * Guest interfaces diff --git a/hw/ipmi/ipmi.c b/hw/ipmi/ipmi.c index b27babd504..adbbf6e4a6 100644 --- a/hw/ipmi/ipmi.c +++ b/hw/ipmi/ipmi.c @@ -28,6 +28,7 @@ #include "sysemu/sysemu.h" #include "qmp-commands.h" #include "qom/object_interfaces.h" +#include "qapi/error.h" #include "qapi/visitor.h" =20 static uint32_t ipmi_current_uuid =3D 1; diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c index 0d2c0683ba..84a2a62be9 100644 --- a/hw/mips/mips_jazz.c +++ b/hw/mips/mips_jazz.c @@ -45,6 +45,7 @@ #include "hw/sysbus.h" #include "exec/address-spaces.h" #include "sysemu/qtest.h" +#include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/help_option.h" =20 diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 37f19428d6..e57b24c198 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -51,6 +51,7 @@ #include "hw/sysbus.h" /* SysBusDevice */ #include "qemu/host-utils.h" #include "sysemu/qtest.h" +#include "qapi/error.h" #include "qemu/error-report.h" #include "hw/empty_slot.h" #include "sysemu/kvm.h" diff --git a/hw/misc/exynos4210_rng.c b/hw/misc/exynos4210_rng.c index 31ebe38e26..4ecbebd2d7 100644 --- a/hw/misc/exynos4210_rng.c +++ b/hw/misc/exynos4210_rng.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "crypto/random.h" #include "hw/sysbus.h" +#include "qapi/error.h" #include "qemu/log.h" =20 #define DEBUG_EXYNOS_RNG 0 diff --git a/hw/misc/mips_cmgcr.c b/hw/misc/mips_cmgcr.c index 211f6097fd..d019d41a3c 100644 --- a/hw/misc/mips_cmgcr.c +++ b/hw/misc/mips_cmgcr.c @@ -10,7 +10,6 @@ */ =20 #include "qemu/osdep.h" -#include "qapi/error.h" #include "qemu/log.h" #include "hw/hw.h" #include "hw/sysbus.h" diff --git a/hw/misc/mps2-scc.c b/hw/misc/mps2-scc.c index 32be2a9df1..6a9d251f18 100644 --- a/hw/misc/mps2-scc.c +++ b/hw/misc/mps2-scc.c @@ -19,7 +19,6 @@ =20 #include "qemu/osdep.h" #include "qemu/log.h" -#include "qapi/error.h" #include "trace.h" #include "hw/sysbus.h" #include "hw/registerfields.h" diff --git a/hw/net/rocker/qmp-norocker.c b/hw/net/rocker/qmp-norocker.c index 6acbcdb02b..94c1e480ae 100644 --- a/hw/net/rocker/qmp-norocker.c +++ b/hw/net/rocker/qmp-norocker.c @@ -18,6 +18,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "qmp-commands.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" =20 RockerSwitch *qmp_query_rocker(const char *name, Error **errp) diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c index 823a29df03..a2a76c2a74 100644 --- a/hw/net/rocker/rocker.c +++ b/hw/net/rocker/rocker.c @@ -21,6 +21,7 @@ #include "hw/pci/msix.h" #include "net/net.h" #include "net/eth.h" +#include "qapi/error.h" #include "qemu/iov.h" #include "qemu/bitops.h" #include "qmp-commands.h" diff --git a/hw/net/rocker/rocker_of_dpa.c b/hw/net/rocker/rocker_of_dpa.c index 191a58e0a7..9339df2d09 100644 --- a/hw/net/rocker/rocker_of_dpa.c +++ b/hw/net/rocker/rocker_of_dpa.c @@ -16,6 +16,7 @@ =20 #include "qemu/osdep.h" #include "net/eth.h" +#include "qapi/error.h" #include "qemu/iov.h" #include "qemu/timer.h" #include "qmp-commands.h" diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 38674b08aa..0dd3cb8de4 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -22,6 +22,7 @@ #include "hw/virtio/virtio-net.h" #include "net/vhost_net.h" #include "hw/virtio/virtio-bus.h" +#include "qapi/error.h" #include "qapi/qmp/qjson.h" #include "qapi-event.h" #include "hw/virtio/virtio-access.h" diff --git a/hw/nios2/cpu_pic.c b/hw/nios2/cpu_pic.c index 0f95987ef3..6bccce2f32 100644 --- a/hw/nios2/cpu_pic.c +++ b/hw/nios2/cpu_pic.c @@ -19,7 +19,6 @@ */ =20 #include "qemu/osdep.h" -#include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" =20 diff --git a/hw/pci-bridge/i82801b11.c b/hw/pci-bridge/i82801b11.c index cb522bf30c..b24c33ceb5 100644 --- a/hw/pci-bridge/i82801b11.c +++ b/hw/pci-bridge/i82801b11.c @@ -44,7 +44,6 @@ #include "qemu/osdep.h" #include "hw/pci/pci.h" #include "hw/i386/ich9.h" -#include "qapi/error.h" =20 =20 /*************************************************************************= ****/ diff --git a/hw/pci-bridge/ioh3420.c b/hw/pci-bridge/ioh3420.c index 5f56a2feb6..79fa84d7b9 100644 --- a/hw/pci-bridge/ioh3420.c +++ b/hw/pci-bridge/ioh3420.c @@ -25,7 +25,6 @@ #include "hw/pci/msi.h" #include "hw/pci/pcie.h" #include "ioh3420.h" -#include "qapi/error.h" =20 #define PCI_DEVICE_ID_IOH_EPORT 0x3420 /* D0:F0 express mode */ #define PCI_DEVICE_ID_IOH_REV 0x2 diff --git a/hw/pci-bridge/xio3130_upstream.c b/hw/pci-bridge/xio3130_upstr= eam.c index 227997ce46..df5692501b 100644 --- a/hw/pci-bridge/xio3130_upstream.c +++ b/hw/pci-bridge/xio3130_upstream.c @@ -24,7 +24,6 @@ #include "hw/pci/msi.h" #include "hw/pci/pcie.h" #include "xio3130_upstream.h" -#include "qapi/error.h" =20 #define PCI_DEVICE_ID_TI_XIO3130U 0x8232 /* upstream port */ #define XIO3130_REVISION 0x2 diff --git a/hw/pci-host/sabre.c b/hw/pci-host/sabre.c index 2268a41dd9..e2f4ee480e 100644 --- a/hw/pci-host/sabre.c +++ b/hw/pci-host/sabre.c @@ -34,7 +34,6 @@ #include "hw/pci-host/sabre.h" #include "sysemu/sysemu.h" #include "exec/address-spaces.h" -#include "qapi/error.h" #include "qemu/log.h" #include "trace.h" =20 diff --git a/hw/pci/pci-stub.c b/hw/pci/pci-stub.c index d5ce00748e..74ce7316da 100644 --- a/hw/pci/pci-stub.c +++ b/hw/pci/pci-stub.c @@ -21,6 +21,7 @@ #include "qemu/osdep.h" #include "sysemu/sysemu.h" #include "monitor/monitor.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "hw/pci/pci.h" #include "qmp-commands.h" diff --git a/hw/pci/pci.c b/hw/pci/pci.c index e8f9fc1c27..dec558311d 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.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 "hw/hw.h" #include "hw/pci/pci.h" @@ -40,6 +41,7 @@ #include "exec/address-spaces.h" #include "hw/hotplug.h" #include "hw/boards.h" +#include "qapi/error.h" #include "qemu/cutils.h" =20 //#define DEBUG_PCI diff --git a/hw/ppc/fdt.c b/hw/ppc/fdt.c index 38a7234b46..2ffc5866e4 100644 --- a/hw/ppc/fdt.c +++ b/hw/ppc/fdt.c @@ -8,7 +8,6 @@ */ =20 #include "qemu/osdep.h" -#include "qapi/error.h" #include "target/ppc/cpu.h" =20 #include "hw/ppc/fdt.h" diff --git a/hw/ppc/pnv_bmc.c b/hw/ppc/pnv_bmc.c index b2cf441ee7..4b76d34f0a 100644 --- a/hw/ppc/pnv_bmc.c +++ b/hw/ppc/pnv_bmc.c @@ -20,7 +20,6 @@ #include "hw/hw.h" #include "sysemu/sysemu.h" #include "target/ppc/cpu.h" -#include "qapi/error.h" #include "qemu/log.h" #include "hw/ipmi/ipmi.h" #include "hw/ppc/fdt.h" diff --git a/hw/ppc/pnv_xscom.c b/hw/ppc/pnv_xscom.c index 99c40efecd..46fae41f32 100644 --- a/hw/ppc/pnv_xscom.c +++ b/hw/ppc/pnv_xscom.c @@ -17,7 +17,6 @@ * License along with this library; if not, see . */ #include "qemu/osdep.h" -#include "qapi/error.h" #include "hw/hw.h" #include "qemu/log.h" #include "sysemu/hw_accel.h" diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c index 7ec35de5ae..ec4be25f49 100644 --- a/hw/ppc/ppc.c +++ b/hw/ppc/ppc.c @@ -33,7 +33,6 @@ #include "hw/timer/m48t59.h" #include "qemu/log.h" #include "qemu/error-report.h" -#include "qapi/error.h" #include "hw/loader.h" #include "sysemu/kvm.h" #include "kvm_ppc.h" diff --git a/hw/ppc/spapr_pci_vfio.c b/hw/ppc/spapr_pci_vfio.c index 053efb03bd..71491dbd28 100644 --- a/hw/ppc/spapr_pci_vfio.c +++ b/hw/ppc/spapr_pci_vfio.c @@ -19,7 +19,6 @@ =20 #include "qemu/osdep.h" #include -#include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" #include "hw/ppc/spapr.h" diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c index 4bb939d3d1..b61e2892eb 100644 --- a/hw/ppc/spapr_rtas.c +++ b/hw/ppc/spapr_rtas.c @@ -24,6 +24,7 @@ * THE SOFTWARE. * */ + #include "qemu/osdep.h" #include "cpu.h" #include "qemu/log.h" diff --git a/hw/ppc/spapr_rtc.c b/hw/ppc/spapr_rtc.c index 9ec3078691..cc5edc33fd 100644 --- a/hw/ppc/spapr_rtc.c +++ b/hw/ppc/spapr_rtc.c @@ -25,12 +25,14 @@ * THE SOFTWARE. * */ + #include "qemu/osdep.h" #include "cpu.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" #include "hw/ppc/spapr.h" #include "qapi-event.h" +#include "qapi/error.h" #include "qemu/cutils.h" =20 void spapr_rtc_read(sPAPRRTCState *rtc, struct tm *tm, uint32_t *ns) diff --git a/hw/s390x/s390-skeys.c b/hw/s390x/s390-skeys.c index 53ad5d38d4..fd994f86b1 100644 --- a/hw/s390x/s390-skeys.c +++ b/hw/s390x/s390-skeys.c @@ -13,6 +13,7 @@ #include "hw/boards.h" #include "qmp-commands.h" #include "hw/s390x/storage-keys.h" +#include "qapi/error.h" #include "qemu/error-report.h" #include "sysemu/kvm.h" #include "migration/register.h" diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index ee586e7d6c..45975c21e8 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -27,7 +27,6 @@ #include "hw/sysbus.h" #include "hw/scsi/esp.h" #include "trace.h" -#include "qapi/error.h" #include "qemu/log.h" =20 /* diff --git a/hw/scsi/vhost-scsi-common.c b/hw/scsi/vhost-scsi-common.c index d434b3e99a..77e9897244 100644 --- a/hw/scsi/vhost-scsi-common.c +++ b/hw/scsi/vhost-scsi-common.c @@ -16,7 +16,6 @@ */ =20 #include "qemu/osdep.h" -#include "qapi/error.h" #include "qemu/error-report.h" #include "migration/migration.h" #include "hw/virtio/vhost.h" diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index fac7fa5c72..37b217269b 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -32,7 +32,6 @@ #include "qemu/bitops.h" #include "hw/sd/sdhci.h" #include "sdhci-internal.h" -#include "qapi/error.h" #include "qemu/log.h" #include "trace.h" =20 diff --git a/hw/smbios/smbios-stub.c b/hw/smbios/smbios-stub.c index 308739410f..61becef4ae 100644 --- a/hw/smbios/smbios-stub.c +++ b/hw/smbios/smbios-stub.c @@ -21,6 +21,7 @@ */ =20 #include "qemu/osdep.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qmp-commands.h" #include "hw/smbios/smbios.h" diff --git a/hw/sparc64/niagara.c b/hw/sparc64/niagara.c index 7a723326c5..b6d4b14d17 100644 --- a/hw/sparc64/niagara.c +++ b/hw/sparc64/niagara.c @@ -23,7 +23,6 @@ */ =20 #include "qemu/osdep.h" -#include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" #include "hw/hw.h" diff --git a/hw/sparc64/sun4u_iommu.c b/hw/sparc64/sun4u_iommu.c index 4cf8e69be9..eb3aaa87e6 100644 --- a/hw/sparc64/sun4u_iommu.c +++ b/hw/sparc64/sun4u_iommu.c @@ -28,7 +28,6 @@ #include "hw/sysbus.h" #include "hw/sparc/sun4u_iommu.h" #include "exec/address-spaces.h" -#include "qapi/error.h" #include "qemu/log.h" #include "trace.h" =20 diff --git a/hw/ssi/stm32f2xx_spi.c b/hw/ssi/stm32f2xx_spi.c index 69514da9fb..930c616de3 100644 --- a/hw/ssi/stm32f2xx_spi.c +++ b/hw/ssi/stm32f2xx_spi.c @@ -23,7 +23,6 @@ */ =20 #include "qemu/osdep.h" -#include "qapi/error.h" #include "qemu/log.h" #include "hw/ssi/stm32f2xx_spi.h" =20 diff --git a/hw/timer/m48t59.c b/hw/timer/m48t59.c index 844aad540e..742c576443 100644 --- a/hw/timer/m48t59.c +++ b/hw/timer/m48t59.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/timer/m48t59.h" -#include "qapi/error.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" #include "hw/sysbus.h" diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index 35a05a64cc..9d93a16e0f 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.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 "qemu/cutils.h" #include "qemu/bcd.h" @@ -29,6 +30,7 @@ #include "sysemu/sysemu.h" #include "sysemu/replay.h" #include "hw/timer/mc146818rtc.h" +#include "qapi/error.h" #include "qapi/visitor.h" #include "qapi-event.h" #include "qmp-commands.h" diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c index 085ed2c667..b7dd3602dc 100644 --- a/hw/usb/ccid-card-passthru.c +++ b/hw/usb/ccid-card-passthru.c @@ -9,7 +9,6 @@ */ =20 #include "qemu/osdep.h" -#include "qapi/error.h" #include #include "chardev/char-fe.h" #include "qemu/error-report.h" diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c index 14e08d20d0..e05df206fc 100644 --- a/hw/virtio/virtio-balloon.c +++ b/hw/virtio/virtio-balloon.c @@ -23,6 +23,7 @@ #include "hw/virtio/virtio-balloon.h" #include "sysemu/kvm.h" #include "exec/address-spaces.h" +#include "qapi/error.h" #include "qapi/visitor.h" #include "qapi-event.h" #include "trace.h" diff --git a/hw/watchdog/watchdog.c b/hw/watchdog/watchdog.c index 670114ecfe..25dcb25ff1 100644 --- a/hw/watchdog/watchdog.c +++ b/hw/watchdog/watchdog.c @@ -23,6 +23,7 @@ #include "qemu/option.h" #include "qemu/config-file.h" #include "qemu/queue.h" +#include "qapi/error.h" #include "qapi/qmp/types.h" #include "sysemu/sysemu.h" #include "sysemu/watchdog.h" diff --git a/include/crypto/random.h b/include/crypto/random.h index a07229ce96..32bb9c0038 100644 --- a/include/crypto/random.h +++ b/include/crypto/random.h @@ -22,7 +22,6 @@ #define QCRYPTO_RANDOM_H =20 #include "qemu-common.h" -#include "qapi/error.h" =20 =20 /** diff --git a/include/crypto/xts.h b/include/crypto/xts.h index da32ab82b6..719971afb7 100644 --- a/include/crypto/xts.h +++ b/include/crypto/xts.h @@ -27,7 +27,6 @@ #define QCRYPTO_XTS_H =20 #include "qemu-common.h" -#include "qapi/error.h" =20 =20 #define XTS_BLOCK_SIZE 16 diff --git a/include/hw/ide/internal.h b/include/hw/ide/internal.h index 31851b44d1..88212f59df 100644 --- a/include/hw/ide/internal.h +++ b/include/hw/ide/internal.h @@ -12,7 +12,6 @@ #include "sysemu/sysemu.h" #include "hw/block/block.h" #include "scsi/constants.h" -#include "qapi/error.h" =20 /* debug IDE devices */ #define USE_DMA_CDROM diff --git a/include/ui/console.h b/include/ui/console.h index d3312be322..7506dcbe61 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -6,7 +6,6 @@ #include "qapi/qmp/qdict.h" #include "qemu/notify.h" #include "qemu/error-report.h" -#include "qapi/error.h" =20 #ifdef CONFIG_OPENGL # include diff --git a/iothread.c b/iothread.c index d8b6c1fb27..4b9bbde4cd 100644 --- a/iothread.c +++ b/iothread.c @@ -19,6 +19,7 @@ #include "block/block.h" #include "sysemu/iothread.h" #include "qmp-commands.h" +#include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/rcu.h" #include "qemu/main-loop.h" diff --git a/migration/colo-failover.c b/migration/colo-failover.c index 6563862b36..891785cb63 100644 --- a/migration/colo-failover.c +++ b/migration/colo-failover.c @@ -16,6 +16,7 @@ #include "qemu/main-loop.h" #include "migration.h" #include "qmp-commands.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qemu/error-report.h" #include "trace.h" diff --git a/migration/colo.c b/migration/colo.c index dee3aa8bf7..245a46d59d 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -12,6 +12,7 @@ =20 #include "qemu/osdep.h" #include "sysemu/sysemu.h" +#include "qapi/error.h" #include "qemu-file-channel.h" #include "migration.h" #include "qemu-file.h" diff --git a/migration/exec.c b/migration/exec.c index f3be1baf2e..4d7d486382 100644 --- a/migration/exec.c +++ b/migration/exec.c @@ -18,7 +18,6 @@ */ =20 #include "qemu/osdep.h" -#include "qapi/error.h" #include "channel.h" #include "exec.h" #include "io/channel-command.h" diff --git a/migration/fd.c b/migration/fd.c index 30de4b9847..6b2bdaa953 100644 --- a/migration/fd.c +++ b/migration/fd.c @@ -15,7 +15,6 @@ */ =20 #include "qemu/osdep.h" -#include "qapi/error.h" #include "channel.h" #include "fd.h" #include "monitor/monitor.h" diff --git a/migration/migration.c b/migration/migration.c index c99a4e62d7..79ec88dba2 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -30,6 +30,7 @@ #include "qemu-file.h" #include "migration/vmstate.h" #include "block/block.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qemu/rcu.h" #include "block.h" diff --git a/migration/ram.c b/migration/ram.c index cb1950f3eb..d67f564919 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -25,6 +25,7 @@ * 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 @@ -42,6 +43,7 @@ #include "postcopy-ram.h" #include "migration/page_cache.h" #include "qemu/error-report.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "trace.h" #include "exec/ram_addr.h" diff --git a/migration/savevm.c b/migration/savevm.c index b7908f62be..3f68a7a259 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -40,6 +40,7 @@ #include "qemu-file.h" #include "savevm.h" #include "postcopy-ram.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qemu/error-report.h" #include "sysemu/cpus.h" diff --git a/monitor.c b/monitor.c index b9da5e20d1..2de69f648f 100644 --- a/monitor.c +++ b/monitor.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 #include "qemu-common.h" @@ -70,6 +71,7 @@ #include "hmp.h" #include "qemu/thread.h" #include "block/qapi.h" +#include "qapi/error.h" #include "qapi/qmp-event.h" #include "qapi-event.h" #include "qmp-introspect.h" diff --git a/nbd/common.c b/nbd/common.c index 6047d71748..6295526dd1 100644 --- a/nbd/common.c +++ b/nbd/common.c @@ -17,7 +17,6 @@ */ =20 #include "qemu/osdep.h" -#include "qapi/error.h" #include "trace.h" #include "nbd-internal.h" =20 diff --git a/net/filter-replay.c b/net/filter-replay.c index cff65f86e5..09e68fd8f5 100644 --- a/net/filter-replay.c +++ b/net/filter-replay.c @@ -11,7 +11,6 @@ =20 #include "qemu/osdep.h" #include "clients.h" -#include "qapi/error.h" #include "qemu-common.h" #include "qemu/error-report.h" #include "qemu/iov.h" diff --git a/net/filter-rewriter.c b/net/filter-rewriter.c index 2be388f539..3ea3798276 100644 --- a/net/filter-rewriter.c +++ b/net/filter-rewriter.c @@ -15,7 +15,6 @@ #include "net/filter.h" #include "net/net.h" #include "qemu-common.h" -#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qemu/error-report.h" #include "qapi-visit.h" diff --git a/net/net.c b/net/net.c index 2b81c93193..63068ce8e2 100644 --- a/net/net.c +++ b/net/net.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" =20 #include "net/net.h" @@ -43,6 +44,7 @@ #include "qemu/iov.h" #include "qemu/main-loop.h" #include "qapi-visit.h" +#include "qapi/error.h" #include "qapi/opts-visitor.h" #include "sysemu/sysemu.h" #include "sysemu/qtest.h" diff --git a/net/vde.c b/net/vde.c index e50e5d6394..19ddad5674 100644 --- a/net/vde.c +++ b/net/vde.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" =20 #include diff --git a/net/vhost-user.c b/net/vhost-user.c index c23927c912..fd766504ab 100644 --- a/net/vhost-user.c +++ b/net/vhost-user.c @@ -13,6 +13,7 @@ #include "net/vhost_net.h" #include "net/vhost-user.h" #include "chardev/char-fe.h" +#include "qapi/error.h" #include "qemu/config-file.h" #include "qemu/error-report.h" #include "qmp-commands.h" diff --git a/numa.c b/numa.c index 83675a03f3..cc5d3f2947 100644 --- a/numa.c +++ b/numa.c @@ -30,6 +30,7 @@ #include "qom/cpu.h" #include "qemu/error-report.h" #include "qapi-visit.h" +#include "qapi/error.h" #include "qapi/opts-visitor.h" #include "hw/boards.h" #include "sysemu/hostmem.h" diff --git a/qdev-monitor.c b/qdev-monitor.c index c436616446..0aa8a6c60b 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -24,6 +24,7 @@ #include "monitor/qdev.h" #include "qmp-commands.h" #include "sysemu/arch_init.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qemu/config-file.h" #include "qemu/error-report.h" diff --git a/qga/commands-posix.c b/qga/commands-posix.c index e809e382eb..88807f3c78 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -18,6 +18,7 @@ #include #include "qga/guest-agent-core.h" #include "qga-qmp-commands.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qemu/queue.h" #include "qemu/host-utils.h" diff --git a/qga/commands-win32.c b/qga/commands-win32.c index d79974f212..bedae32957 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -14,6 +14,7 @@ #ifndef _WIN32_WINNT # define _WIN32_WINNT 0x0600 #endif + #include "qemu/osdep.h" #include #include @@ -34,6 +35,7 @@ #include "qga/guest-agent-core.h" #include "qga/vss-win32.h" #include "qga-qmp-commands.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qemu/queue.h" #include "qemu/host-utils.h" diff --git a/qga/commands.c b/qga/commands.c index ff89e805cf..6d710dbb20 100644 --- a/qga/commands.c +++ b/qga/commands.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "qga/guest-agent-core.h" #include "qga-qmp-commands.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qemu/base64.h" #include "qemu/cutils.h" diff --git a/qga/main.c b/qga/main.c index 62a62755bd..57083ca10c 100644 --- a/qga/main.c +++ b/qga/main.c @@ -10,6 +10,7 @@ * This work is licensed under the terms of the GNU GPL, version 2 or late= r. * See the COPYING file in the top-level directory. */ + #include "qemu/osdep.h" #include #include @@ -23,6 +24,7 @@ #include "qga/guest-agent-core.h" #include "qemu/module.h" #include "qapi/qmp/qerror.h" +#include "qapi/error.h" #include "qapi/qmp/dispatch.h" #include "qga/channel.h" #include "qemu/bswap.h" diff --git a/qga/vss-win32.c b/qga/vss-win32.c index dcb27567bb..0199c2a792 100644 --- a/qga/vss-win32.c +++ b/qga/vss-win32.c @@ -12,6 +12,7 @@ =20 #include "qemu/osdep.h" #include +#include "qapi/error.h" #include "qemu/error-report.h" #include "qga/guest-agent-core.h" #include "qga/vss-win32.h" diff --git a/qmp.c b/qmp.c index 52cfd2d81c..a56faf1b9a 100644 --- a/qmp.c +++ b/qmp.c @@ -30,6 +30,7 @@ #include "sysemu/blockdev.h" #include "sysemu/block-backend.h" #include "qom/qom-qobject.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qapi/qmp/qobject.h" #include "qapi/qobject-input-visitor.h" diff --git a/qobject/qnum.c b/qobject/qnum.c index 410686a611..517610d9da 100644 --- a/qobject/qnum.c +++ b/qobject/qnum.c @@ -13,7 +13,6 @@ */ =20 #include "qemu/osdep.h" -#include "qapi/error.h" #include "qapi/qmp/qnum.h" #include "qapi/qmp/qobject.h" #include "qemu-common.h" diff --git a/replay/replay-input.c b/replay/replay-input.c index bd93554d8e..3ab1536bf7 100644 --- a/replay/replay-input.c +++ b/replay/replay-input.c @@ -10,7 +10,6 @@ */ =20 #include "qemu/osdep.h" -#include "qapi/error.h" #include "qemu-common.h" #include "sysemu/replay.h" #include "replay-internal.h" diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py index 974d0a4a80..dc7c418923 100644 --- a/scripts/qapi-commands.py +++ b/scripts/qapi-commands.py @@ -289,6 +289,7 @@ h_comment =3D ''' c_comment, h_comment) =20 fdef.write(mcgen(''' + #include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/module.h" @@ -297,6 +298,7 @@ fdef.write(mcgen(''' #include "qapi/qobject-output-visitor.h" #include "qapi/qobject-input-visitor.h" #include "qapi/dealloc-visitor.h" +#include "qapi/error.h" #include "%(prefix)sqapi-types.h" #include "%(prefix)sqapi-visit.h" #include "%(prefix)sqmp-commands.h" @@ -308,7 +310,6 @@ fdecl.write(mcgen(''' #include "%(prefix)sqapi-types.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/dispatch.h" -#include "qapi/error.h" =20 void %(c_prefix)sqmp_init_marshal(QmpCommandList *cmds); ''', diff --git a/scripts/qapi-event.py b/scripts/qapi-event.py index 07b4b70199..9d7134658d 100644 --- a/scripts/qapi-event.py +++ b/scripts/qapi-event.py @@ -209,6 +209,7 @@ fdef.write(mcgen(''' #include "qemu-common.h" #include "%(prefix)sqapi-event.h" #include "%(prefix)sqapi-visit.h" +#include "qapi/error.h" #include "qapi/qobject-output-visitor.h" #include "qapi/qmp-event.h" =20 @@ -216,7 +217,6 @@ fdef.write(mcgen(''' prefix=3Dprefix)) =20 fdecl.write(mcgen(''' -#include "qapi/error.h" #include "qapi/util.h" #include "qapi/qmp/qdict.h" #include "%(prefix)sqapi-types.h" diff --git a/stubs/arch-query-cpu-def.c b/stubs/arch-query-cpu-def.c index cefe4beb82..d436f95314 100644 --- a/stubs/arch-query-cpu-def.c +++ b/stubs/arch-query-cpu-def.c @@ -1,6 +1,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "sysemu/arch_init.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" =20 CpuDefinitionInfoList *arch_query_cpu_definitions(Error **errp) diff --git a/stubs/arch-query-cpu-model-baseline.c b/stubs/arch-query-cpu-m= odel-baseline.c index 094ec13c2c..0d066da328 100644 --- a/stubs/arch-query-cpu-model-baseline.c +++ b/stubs/arch-query-cpu-model-baseline.c @@ -1,6 +1,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "sysemu/arch_init.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" =20 CpuModelBaselineInfo *arch_query_cpu_model_baseline(CpuModelInfo *modela, diff --git a/stubs/arch-query-cpu-model-comparison.c b/stubs/arch-query-cpu= -model-comparison.c index d5486ae980..8eb311a26c 100644 --- a/stubs/arch-query-cpu-model-comparison.c +++ b/stubs/arch-query-cpu-model-comparison.c @@ -1,6 +1,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "sysemu/arch_init.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" =20 CpuModelCompareInfo *arch_query_cpu_model_comparison(CpuModelInfo *modela, diff --git a/stubs/arch-query-cpu-model-expansion.c b/stubs/arch-query-cpu-= model-expansion.c index ae7cf554d1..26273a8b10 100644 --- a/stubs/arch-query-cpu-model-expansion.c +++ b/stubs/arch-query-cpu-model-expansion.c @@ -1,6 +1,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "sysemu/arch_init.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" =20 CpuModelExpansionInfo *arch_query_cpu_model_expansion(CpuModelExpansionTyp= e type, diff --git a/stubs/vmgenid.c b/stubs/vmgenid.c index c64eb7a16e..3c8fe55bdf 100644 --- a/stubs/vmgenid.c +++ b/stubs/vmgenid.c @@ -1,5 +1,6 @@ #include "qemu/osdep.h" #include "qmp-commands.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" =20 GuidInfo *qmp_query_vm_generation_id(Error **errp) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 050644f820..ae44c9d8ad 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ + #include "qemu/osdep.h" #include "qemu/cutils.h" =20 @@ -29,6 +30,7 @@ #include "qemu/error-report.h" #include "qemu/option.h" #include "qemu/config-file.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qapi/qmp/types.h" =20 diff --git a/target/i386/xsave_helper.c b/target/i386/xsave_helper.c index ca735eee77..52ea7e654b 100644 --- a/target/i386/xsave_helper.c +++ b/target/i386/xsave_helper.c @@ -3,7 +3,6 @@ * See the COPYING file in the top-level directory. */ #include "qemu/osdep.h" -#include "qapi/error.h" =20 #include "qemu-common.h" #include "cpu.h" diff --git a/target/nios2/helper.c b/target/nios2/helper.c index a169c91eaa..a8b8ec662a 100644 --- a/target/nios2/helper.c +++ b/target/nios2/helper.c @@ -22,7 +22,6 @@ =20 #include "cpu.h" #include "qemu/host-utils.h" -#include "qapi/error.h" #include "exec/exec-all.h" #include "exec/log.h" #include "exec/helper-proto.h" diff --git a/target/ppc/mmu-book3s-v3.c b/target/ppc/mmu-book3s-v3.c index e7798b3582..b60df4408f 100644 --- a/target/ppc/mmu-book3s-v3.c +++ b/target/ppc/mmu-book3s-v3.c @@ -18,7 +18,6 @@ */ =20 #include "qemu/osdep.h" -#include "qapi/error.h" #include "cpu.h" #include "mmu-hash64.h" #include "mmu-book3s-v3.h" diff --git a/target/ppc/mmu-hash64.c b/target/ppc/mmu-hash64.c index 14d34e512f..c9b72b7429 100644 --- a/target/ppc/mmu-hash64.c +++ b/target/ppc/mmu-hash64.c @@ -18,7 +18,6 @@ * License along with this library; if not, see . */ #include "qemu/osdep.h" -#include "qapi/error.h" #include "cpu.h" #include "exec/exec-all.h" #include "exec/helper-proto.h" diff --git a/target/ppc/mmu-radix64.c b/target/ppc/mmu-radix64.c index bbd37e3c7d..ab76cbc835 100644 --- a/target/ppc/mmu-radix64.c +++ b/target/ppc/mmu-radix64.c @@ -18,7 +18,6 @@ */ =20 #include "qemu/osdep.h" -#include "qapi/error.h" #include "cpu.h" #include "exec/exec-all.h" #include "exec/helper-proto.h" diff --git a/target/ppc/mmu_helper.c b/target/ppc/mmu_helper.c index 16ef5acaa2..5568d1642b 100644 --- a/target/ppc/mmu_helper.c +++ b/target/ppc/mmu_helper.c @@ -17,7 +17,6 @@ * License along with this library; if not, see . */ #include "qemu/osdep.h" -#include "qapi/error.h" #include "cpu.h" #include "exec/helper-proto.h" #include "sysemu/kvm.h" diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c index 55c99c97e3..2913af912a 100644 --- a/target/ppc/translate_init.c +++ b/target/ppc/translate_init.c @@ -29,6 +29,7 @@ #include "mmu-hash32.h" #include "mmu-hash64.h" #include "qemu/error-report.h" +#include "qapi/error.h" #include "qapi/visitor.h" #include "hw/qdev-properties.h" #include "hw/ppc/ppc.h" diff --git a/target/s390x/excp_helper.c b/target/s390x/excp_helper.c index e8f7a40c2b..6967fbfa25 100644 --- a/target/s390x/excp_helper.c +++ b/target/s390x/excp_helper.c @@ -19,7 +19,6 @@ */ =20 #include "qemu/osdep.h" -#include "qapi/error.h" #include "cpu.h" #include "internal.h" #include "qemu/timer.h" diff --git a/target/s390x/helper.c b/target/s390x/helper.c index 35d9741918..84aaef3a53 100644 --- a/target/s390x/helper.c +++ b/target/s390x/helper.c @@ -19,7 +19,6 @@ */ =20 #include "qemu/osdep.h" -#include "qapi/error.h" #include "cpu.h" #include "internal.h" #include "exec/gdbstub.h" diff --git a/tests/check-qlist.c b/tests/check-qlist.c index 894e9915e5..259980d523 100644 --- a/tests/check-qlist.c +++ b/tests/check-qlist.c @@ -11,7 +11,6 @@ */ #include "qemu/osdep.h" =20 -#include "qapi/error.h" #include "qapi/qmp/qnum.h" #include "qapi/qmp/qlist.h" =20 diff --git a/tests/check-qnum.c b/tests/check-qnum.c index d702d5da9c..2b667f7ad7 100644 --- a/tests/check-qnum.c +++ b/tests/check-qnum.c @@ -15,7 +15,6 @@ #include "qemu/osdep.h" =20 #include "qapi/qmp/qnum.h" -#include "qapi/error.h" #include "qemu-common.h" =20 /* diff --git a/tests/io-channel-helpers.c b/tests/io-channel-helpers.c index 5430e1389d..ab988ef4fe 100644 --- a/tests/io-channel-helpers.c +++ b/tests/io-channel-helpers.c @@ -20,7 +20,6 @@ =20 #include "qemu/osdep.h" #include "io-channel-helpers.h" -#include "qapi/error.h" #include "qemu/iov.h" =20 struct QIOChannelTest { diff --git a/tests/test-aio-multithread.c b/tests/test-aio-multithread.c index c8bec81520..6440d54ac3 100644 --- a/tests/test-aio-multithread.c +++ b/tests/test-aio-multithread.c @@ -12,7 +12,6 @@ =20 #include "qemu/osdep.h" #include "block/aio.h" -#include "qapi/error.h" #include "qemu/coroutine.h" #include "qemu/thread.h" #include "qemu/error-report.h" diff --git a/tests/test-qmp-commands.c b/tests/test-qmp-commands.c index 904c89d4d4..52c1802eaf 100644 --- a/tests/test-qmp-commands.c +++ b/tests/test-qmp-commands.c @@ -2,6 +2,7 @@ #include "qemu-common.h" #include "qapi/qmp/types.h" #include "test-qmp-commands.h" +#include "qapi/error.h" #include "qapi/qmp/dispatch.h" #include "qemu/module.h" #include "qapi/qobject-input-visitor.h" diff --git a/tests/test-qmp-event.c b/tests/test-qmp-event.c index 46825b4f3f..5be2d8efcf 100644 --- a/tests/test-qmp-event.c +++ b/tests/test-qmp-event.c @@ -16,6 +16,7 @@ #include "qemu-common.h" #include "test-qapi-visit.h" #include "test-qapi-event.h" +#include "qapi/error.h" #include "qapi/qmp/types.h" #include "qapi/qmp/qobject.h" #include "qapi/qmp-event.h" diff --git a/tests/test-x86-cpuid-compat.c b/tests/test-x86-cpuid-compat.c index 58a2dd9fe8..c594b5bd97 100644 --- a/tests/test-x86-cpuid-compat.c +++ b/tests/test-x86-cpuid-compat.c @@ -1,6 +1,5 @@ #include "qemu/osdep.h" #include "qemu-common.h" -#include "qapi/error.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qnum.h" #include "qapi/qmp/qbool.h" diff --git a/tpm.c b/tpm.c index 61a434185a..d11b10bed8 100644 --- a/tpm.c +++ b/tpm.c @@ -11,8 +11,10 @@ * * Based on net.c */ + #include "qemu/osdep.h" =20 +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "sysemu/tpm_backend.h" #include "sysemu/tpm.h" diff --git a/trace/qmp.c b/trace/qmp.c index ac777d154f..ccd35cd840 100644 --- a/trace/qmp.c +++ b/trace/qmp.c @@ -8,6 +8,7 @@ */ =20 #include "qemu/osdep.h" +#include "qapi/error.h" #include "qmp-commands.h" #include "trace/control.h" =20 diff --git a/ui/console.c b/ui/console.c index c4c95abed7..f678979f86 100644 --- a/ui/console.c +++ b/ui/console.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 "qemu-common.h" #include "ui/console.h" #include "hw/qdev-core.h" +#include "qapi/error.h" #include "qemu/timer.h" #include "qmp-commands.h" #include "chardev/char-fe.h" diff --git a/ui/gtk.c b/ui/gtk.c index f0ad63e431..1537751afa 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -36,6 +36,7 @@ =20 #include "qemu/osdep.h" #include "qemu-common.h" +#include "qapi/error.h" #include "qemu/cutils.h" =20 #include "ui/console.h" diff --git a/ui/input.c b/ui/input.c index ab22c8423f..a5f1cbb3ca 100644 --- a/ui/input.c +++ b/ui/input.c @@ -1,5 +1,6 @@ #include "qemu/osdep.h" #include "sysemu/sysemu.h" +#include "qapi/error.h" #include "qemu/error-report.h" #include "qmp-commands.h" #include "trace.h" diff --git a/ui/spice-core.c b/ui/spice-core.c index 2baf0c7120..7a53db070c 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -30,6 +30,7 @@ #include "qemu-x509.h" #include "qemu/sockets.h" #include "qmp-commands.h" +#include "qapi/error.h" #include "qapi/qmp/qbool.h" #include "qapi/qmp/qstring.h" #include "qapi/qmp/qjson.h" diff --git a/ui/vnc.c b/ui/vnc.c index 33b087221f..8768691db8 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -34,6 +34,7 @@ #include "qemu/timer.h" #include "qemu/acl.h" #include "qemu/config-file.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qapi/qmp/types.h" #include "qmp-commands.h" diff --git a/util/qemu-config.c b/util/qemu-config.c index 029fec53a9..26ea248062 100644 --- a/util/qemu-config.c +++ b/util/qemu-config.c @@ -1,4 +1,5 @@ #include "qemu/osdep.h" +#include "qapi/error.h" #include "qemu-common.h" #include "qemu/error-report.h" #include "qemu/option.h" diff --git a/vl.c b/vl.c index e517a8d995..717625122f 100644 --- a/vl.c +++ b/vl.c @@ -21,7 +21,9 @@ * 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-version.h" #include "qemu/cutils.h" #include "qemu/help_option.h" --=20 2.13.6 From nobody Sun Apr 28 12:31:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1517308034111873.932112758701; Tue, 30 Jan 2018 02:27:14 -0800 (PST) Received: from localhost ([::1]:55141 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egT8D-0007uL-Ax for importer@patchew.org; Tue, 30 Jan 2018 05:27:13 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59449) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egT3M-00047j-Qj for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1egT3G-0000Yp-Fa for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37320) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1egT3G-0000YO-5u for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:06 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8BA136E771 for ; Tue, 30 Jan 2018 10:22:04 +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 2E0587C76F for ; Tue, 30 Jan 2018 10:22:04 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id A0E67113864E; Tue, 30 Jan 2018 11:22:02 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 30 Jan 2018 11:21:48 +0100 Message-Id: <20180130102202.28519-5-armbru@redhat.com> In-Reply-To: <20180130102202.28519-1-armbru@redhat.com> References: <20180130102202.28519-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 30 Jan 2018 10:22:04 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 04/18] Drop superfluous includes of qapi/qmp/qerror.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- backends/tpm.c | 1 - block/qcow.c | 1 - block/qed.c | 1 - blockdev-nbd.c | 1 - hw/s390x/s390-virtio-ccw.c | 1 - net/colo-compare.c | 1 - net/filter-mirror.c | 1 - net/filter-rewriter.c | 1 - qapi/qmp-dispatch.c | 1 - qemu-img.c | 1 - ui/vnc.c | 1 - 11 files changed, 11 deletions(-) diff --git a/backends/tpm.c b/backends/tpm.c index 91222c5164..0d129ee9e3 100644 --- a/backends/tpm.c +++ b/backends/tpm.c @@ -15,7 +15,6 @@ #include "qemu/osdep.h" #include "sysemu/tpm_backend.h" #include "qapi/error.h" -#include "qapi/qmp/qerror.h" #include "sysemu/tpm.h" #include "qemu/thread.h" #include "qemu/main-loop.h" diff --git a/block/qcow.c b/block/qcow.c index d552a6eba8..369241aae8 100644 --- a/block/qcow.c +++ b/block/qcow.c @@ -30,7 +30,6 @@ #include "qemu/module.h" #include "qemu/bswap.h" #include -#include "qapi/qmp/qerror.h" #include "qapi/qmp/qstring.h" #include "crypto/block.h" #include "migration/blocker.h" diff --git a/block/qed.c b/block/qed.c index 821dcaa055..7e2b34c3a7 100644 --- a/block/qed.c +++ b/block/qed.c @@ -18,7 +18,6 @@ #include "qemu/bswap.h" #include "trace.h" #include "qed.h" -#include "qapi/qmp/qerror.h" #include "sysemu/block-backend.h" =20 static int bdrv_qed_probe(const uint8_t *buf, int buf_size, diff --git a/blockdev-nbd.c b/blockdev-nbd.c index f3c3400e52..a3dabf2dd2 100644 --- a/blockdev-nbd.c +++ b/blockdev-nbd.c @@ -14,7 +14,6 @@ #include "sysemu/block-backend.h" #include "hw/block/block.h" #include "qapi/error.h" -#include "qapi/qmp/qerror.h" #include "sysemu/sysemu.h" #include "qmp-commands.h" #include "block/nbd.h" diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 3807dcb097..7d922ad732 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -33,7 +33,6 @@ #include "hw/s390x/css-bridge.h" #include "migration/register.h" #include "cpu_models.h" -#include "qapi/qmp/qerror.h" #include "hw/nmi.h" =20 S390CPU *s390_cpu_addr2state(uint16_t cpu_addr) diff --git a/net/colo-compare.c b/net/colo-compare.c index 0ebdec936c..3b955f3ec5 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -16,7 +16,6 @@ #include "qemu/error-report.h" #include "trace.h" #include "qemu-common.h" -#include "qapi/qmp/qerror.h" #include "qapi/error.h" #include "net/net.h" #include "net/eth.h" diff --git a/net/filter-mirror.c b/net/filter-mirror.c index ce0dc23c2a..bd78e25d12 100644 --- a/net/filter-mirror.c +++ b/net/filter-mirror.c @@ -14,7 +14,6 @@ #include "net/net.h" #include "qemu-common.h" #include "qapi/error.h" -#include "qapi/qmp/qerror.h" #include "qapi-visit.h" #include "qom/object.h" #include "qemu/main-loop.h" diff --git a/net/filter-rewriter.c b/net/filter-rewriter.c index 3ea3798276..6201494ceb 100644 --- a/net/filter-rewriter.c +++ b/net/filter-rewriter.c @@ -15,7 +15,6 @@ #include "net/filter.h" #include "net/net.h" #include "qemu-common.h" -#include "qapi/qmp/qerror.h" #include "qemu/error-report.h" #include "qapi-visit.h" #include "qom/object.h" diff --git a/qapi/qmp-dispatch.c b/qapi/qmp-dispatch.c index 7d18524f3c..8829c4a45a 100644 --- a/qapi/qmp-dispatch.c +++ b/qapi/qmp-dispatch.c @@ -17,7 +17,6 @@ #include "qapi/qmp/dispatch.h" #include "qapi/qmp/json-parser.h" #include "qapi/qmp/qjson.h" -#include "qapi/qmp/qerror.h" =20 static QDict *qmp_dispatch_check_obj(const QObject *request, Error **errp) { diff --git a/qemu-img.c b/qemu-img.c index 68b375f998..cf8db3d7b7 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -28,7 +28,6 @@ #include "qapi/error.h" #include "qapi-visit.h" #include "qapi/qobject-output-visitor.h" -#include "qapi/qmp/qerror.h" #include "qapi/qmp/qjson.h" #include "qapi/qmp/qbool.h" #include "qemu/cutils.h" diff --git a/ui/vnc.c b/ui/vnc.c index 8768691db8..9bcc2c0db9 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -35,7 +35,6 @@ #include "qemu/acl.h" #include "qemu/config-file.h" #include "qapi/error.h" -#include "qapi/qmp/qerror.h" #include "qapi/qmp/types.h" #include "qmp-commands.h" #include "ui/input.h" --=20 2.13.6 From nobody Sun Apr 28 12:31:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1517307862757244.60636542080772; Tue, 30 Jan 2018 02:24:22 -0800 (PST) Received: from localhost ([::1]:55124 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egT5R-0005Sf-Ug for importer@patchew.org; Tue, 30 Jan 2018 05:24:21 -0500 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) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id A4521113864F; Tue, 30 Jan 2018 11:22:02 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org 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> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 30 Jan 2018 10:22:06 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 05/18] Include qmp-commands.h exactly where needed X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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" =20 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" =20 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" =20 #include =20 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" =20 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 @@ =20 #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 =20 -#include "qmp-commands.h" #include "qemu/option.h" =20 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" =20 #define QGA_READ_COUNT_DEFAULT 4096 =20 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" =20 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 --=20 2.13.6 From nobody Sun Apr 28 12:31:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1517308349769757.8142047462221; Tue, 30 Jan 2018 02:32:29 -0800 (PST) Received: from localhost ([::1]:55302 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egTDJ-0003sT-2Z for importer@patchew.org; Tue, 30 Jan 2018 05:32:29 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59462) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egT3N-00047y-DR for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1egT3H-0000ZV-87 for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58984) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1egT3H-0000Yj-1E for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:07 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3339E780E7 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 CB7C96A03A for ; Tue, 30 Jan 2018 10:22:05 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id A735C1138650; Tue, 30 Jan 2018 11:22:02 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 30 Jan 2018 11:21:50 +0100 Message-Id: <20180130102202.28519-7-armbru@redhat.com> In-Reply-To: <20180130102202.28519-1-armbru@redhat.com> References: <20180130102202.28519-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 30 Jan 2018 10:22:06 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 06/18] Typedef the subtypes of QObject in qemu/typedefs.h, too X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This renders many inclusions of qapi/qmp/q*.h superfluous. They'll be dropped in the next few commits. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- include/qapi/qmp/qbool.h | 4 ++-- include/qapi/qmp/qdict.h | 4 ++-- include/qapi/qmp/qlist.h | 4 ++-- include/qapi/qmp/qnum.h | 4 ++-- include/qapi/qmp/qstring.h | 4 ++-- include/qemu/typedefs.h | 7 ++++++- 6 files changed, 16 insertions(+), 11 deletions(-) diff --git a/include/qapi/qmp/qbool.h b/include/qapi/qmp/qbool.h index f77ea86c4e..629c508d34 100644 --- a/include/qapi/qmp/qbool.h +++ b/include/qapi/qmp/qbool.h @@ -16,10 +16,10 @@ =20 #include "qapi/qmp/qobject.h" =20 -typedef struct QBool { +struct QBool { QObject base; bool value; -} QBool; +}; =20 QBool *qbool_from_bool(bool value); bool qbool_get_bool(const QBool *qb); diff --git a/include/qapi/qmp/qdict.h b/include/qapi/qmp/qdict.h index fc218e7be6..d0c298114e 100644 --- a/include/qapi/qmp/qdict.h +++ b/include/qapi/qmp/qdict.h @@ -27,11 +27,11 @@ typedef struct QDictEntry { QLIST_ENTRY(QDictEntry) next; } QDictEntry; =20 -typedef struct QDict { +struct QDict { QObject base; size_t size; QLIST_HEAD(,QDictEntry) table[QDICT_BUCKET_MAX]; -} QDict; +}; =20 /* Object API */ QDict *qdict_new(void); diff --git a/include/qapi/qmp/qlist.h b/include/qapi/qmp/qlist.h index ec3fcc1a4c..632b7ef2c1 100644 --- a/include/qapi/qmp/qlist.h +++ b/include/qapi/qmp/qlist.h @@ -23,10 +23,10 @@ typedef struct QListEntry { QTAILQ_ENTRY(QListEntry) next; } QListEntry; =20 -typedef struct QList { +struct QList { QObject base; QTAILQ_HEAD(,QListEntry) head; -} QList; +}; =20 #define qlist_append(qlist, obj) \ qlist_append_obj(qlist, QOBJECT(obj)) diff --git a/include/qapi/qmp/qnum.h b/include/qapi/qmp/qnum.h index c3d86794bb..15e3971c7f 100644 --- a/include/qapi/qmp/qnum.h +++ b/include/qapi/qmp/qnum.h @@ -44,7 +44,7 @@ typedef enum { * in range: qnum_get_try_int() / qnum_get_try_uint() check range and * convert under the hood. */ -typedef struct QNum { +struct QNum { QObject base; QNumKind kind; union { @@ -52,7 +52,7 @@ typedef struct QNum { uint64_t u64; double dbl; } u; -} QNum; +}; =20 QNum *qnum_from_int(int64_t value); QNum *qnum_from_uint(uint64_t value); diff --git a/include/qapi/qmp/qstring.h b/include/qapi/qmp/qstring.h index 65c05a9be5..98070ef3d6 100644 --- a/include/qapi/qmp/qstring.h +++ b/include/qapi/qmp/qstring.h @@ -15,12 +15,12 @@ =20 #include "qapi/qmp/qobject.h" =20 -typedef struct QString { +struct QString { QObject base; char *string; size_t length; size_t capacity; -} QString; +}; =20 QString *qstring_new(void); QString *qstring_from_str(const char *str); diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 9bd7a834ba..78e2f08c0b 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -92,8 +92,13 @@ typedef struct QemuOptsList QemuOptsList; typedef struct QEMUSGList QEMUSGList; typedef struct QEMUTimer QEMUTimer; typedef struct QEMUTimerListGroup QEMUTimerListGroup; -typedef struct QObject QObject; +typedef struct QBool QBool; +typedef struct QDict QDict; +typedef struct QList QList; typedef struct QNull QNull; +typedef struct QNum QNum; +typedef struct QObject QObject; +typedef struct QString QString; typedef struct RAMBlock RAMBlock; typedef struct Range Range; typedef struct SerialState SerialState; --=20 2.13.6 From nobody Sun Apr 28 12:31:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 151730820552474.57678685429175; Tue, 30 Jan 2018 02:30:05 -0800 (PST) Received: from localhost ([::1]:55244 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egTAp-0001p9-RH for importer@patchew.org; Tue, 30 Jan 2018 05:29:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59397) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egT3K-00046T-F0 for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1egT3H-0000aA-JS for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:10 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40012) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1egT3H-0000Z6-9n for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:07 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 79D58C03675C 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 EC1407089E for ; Tue, 30 Jan 2018 10:22:05 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id AA49C1138651; Tue, 30 Jan 2018 11:22:02 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 30 Jan 2018 11:21:51 +0100 Message-Id: <20180130102202.28519-8-armbru@redhat.com> In-Reply-To: <20180130102202.28519-1-armbru@redhat.com> References: <20180130102202.28519-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 30 Jan 2018 10:22:06 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 07/18] Eliminate qapi/qmp/types.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" qapi/qmp/types.h is a convenience header to include a number of qapi/qmp/ headers. Since we rarely need all of the headers qapi/qmp/types.h includes, we bypass it most of the time. Most of the places that use it don't need all the headers, either. Include the necessary headers directly, and drop qapi/qmp/types.h. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- block/qapi.c | 3 ++- block/qcow2.c | 3 ++- blockdev.c | 2 +- hw/pci/pcie_aer.c | 1 - hw/watchdog/watchdog.c | 1 - include/qapi/qmp/types.h | 24 ------------------------ monitor.c | 2 +- qapi/qapi-dealloc-visitor.c | 1 - qapi/qmp-dispatch.c | 1 - qapi/qobject-input-visitor.c | 2 +- qapi/qobject-output-visitor.c | 3 ++- qobject/json-parser.c | 3 ++- qobject/qjson.c | 2 +- qobject/qlit.c | 4 +++- qobject/qobject.c | 4 +++- scripts/qapi-commands.py | 1 - target/i386/cpu.c | 1 - tests/check-qjson.c | 2 +- tests/check-qobject.c | 3 ++- tests/cpu-plug-test.c | 1 - tests/qom-test.c | 1 - tests/test-clone-visitor.c | 1 - tests/test-qmp-commands.c | 3 ++- tests/test-qmp-event.c | 3 ++- tests/test-qobject-input-visitor.c | 2 +- tests/test-qobject-output-visitor.c | 2 +- tests/test-string-input-visitor.c | 1 - tests/test-string-output-visitor.c | 1 - tests/test-visitor-serialization.c | 1 - ui/vnc.c | 1 - util/qemu-option.c | 4 +++- 31 files changed, 30 insertions(+), 54 deletions(-) delete mode 100644 include/qapi/qmp/types.h diff --git a/block/qapi.c b/block/qapi.c index 4fc9fd8082..1ab4372519 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -31,7 +31,8 @@ #include "qapi-visit.h" #include "qapi/error.h" #include "qapi/qobject-output-visitor.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qbool.h" +#include "qapi/qmp/qstring.h" #include "sysemu/block-backend.h" #include "qemu/cutils.h" =20 diff --git a/block/qcow2.c b/block/qcow2.c index 7645b3c6ae..700c06245b 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -32,7 +32,8 @@ #include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qapi/qmp/qbool.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qstring.h" #include "qapi-event.h" #include "trace.h" #include "qemu/option_int.h" diff --git a/blockdev.c b/blockdev.c index ad82dbbeee..8a47459937 100644 --- a/blockdev.c +++ b/blockdev.c @@ -40,7 +40,7 @@ #include "qemu/error-report.h" #include "qemu/option.h" #include "qemu/config-file.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qstring.h" #include "qapi-visit.h" #include "qapi/error.h" #include "qapi/qmp/qerror.h" diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c index b009be7f17..071e5e9bbb 100644 --- a/hw/pci/pcie_aer.c +++ b/hw/pci/pcie_aer.c @@ -20,7 +20,6 @@ =20 #include "qemu/osdep.h" #include "sysemu/sysemu.h" -#include "qapi/qmp/types.h" #include "qapi/qmp/qjson.h" #include "monitor/monitor.h" #include "hw/pci/pci_bridge.h" diff --git a/hw/watchdog/watchdog.c b/hw/watchdog/watchdog.c index 25dcb25ff1..98a5dd6689 100644 --- a/hw/watchdog/watchdog.c +++ b/hw/watchdog/watchdog.c @@ -24,7 +24,6 @@ #include "qemu/config-file.h" #include "qemu/queue.h" #include "qapi/error.h" -#include "qapi/qmp/types.h" #include "sysemu/sysemu.h" #include "sysemu/watchdog.h" #include "qapi-event.h" diff --git a/include/qapi/qmp/types.h b/include/qapi/qmp/types.h deleted file mode 100644 index 749ac44dcb..0000000000 --- a/include/qapi/qmp/types.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Include all QEMU objects. - * - * Copyright (C) 2009 Red Hat Inc. - * - * Authors: - * Luiz Capitulino - * - * This work is licensed under the terms of the GNU LGPL, version 2.1 or l= ater. - * See the COPYING.LIB file in the top-level directory. - */ - -#ifndef QAPI_QMP_TYPES_H -#define QAPI_QMP_TYPES_H - -#include "qapi/qmp/qobject.h" -#include "qapi/qmp/qnum.h" -#include "qapi/qmp/qbool.h" -#include "qapi/qmp/qstring.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qlist.h" -#include "qapi/qmp/qnull.h" - -#endif /* QAPI_QMP_TYPES_H */ diff --git a/monitor.c b/monitor.c index 2de69f648f..f38640c1e4 100644 --- a/monitor.c +++ b/monitor.c @@ -53,7 +53,7 @@ #include "qemu/acl.h" #include "sysemu/tpm.h" #include "qapi/qmp/qerror.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qbool.h" #include "qapi/qmp/qjson.h" #include "qapi/qmp/json-streamer.h" #include "qapi/qmp/json-parser.h" diff --git a/qapi/qapi-dealloc-visitor.c b/qapi/qapi-dealloc-visitor.c index ed70a0158b..c7d5f80302 100644 --- a/qapi/qapi-dealloc-visitor.c +++ b/qapi/qapi-dealloc-visitor.c @@ -16,7 +16,6 @@ #include "qapi/dealloc-visitor.h" #include "qemu/queue.h" #include "qemu-common.h" -#include "qapi/qmp/types.h" #include "qapi/visitor-impl.h" =20 struct QapiDeallocVisitor diff --git a/qapi/qmp-dispatch.c b/qapi/qmp-dispatch.c index 8829c4a45a..92f957f40e 100644 --- a/qapi/qmp-dispatch.c +++ b/qapi/qmp-dispatch.c @@ -13,7 +13,6 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "qapi/qmp/types.h" #include "qapi/qmp/dispatch.h" #include "qapi/qmp/json-parser.h" #include "qapi/qmp/qjson.h" diff --git a/qapi/qobject-input-visitor.c b/qapi/qobject-input-visitor.c index ee9e47d911..8fb34c472e 100644 --- a/qapi/qobject-input-visitor.c +++ b/qapi/qobject-input-visitor.c @@ -20,7 +20,7 @@ #include "qemu/queue.h" #include "qemu-common.h" #include "qapi/qmp/qjson.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qbool.h" #include "qapi/qmp/qerror.h" #include "qemu/cutils.h" #include "qemu/option.h" diff --git a/qapi/qobject-output-visitor.c b/qapi/qobject-output-visitor.c index d325163e55..60398765df 100644 --- a/qapi/qobject-output-visitor.c +++ b/qapi/qobject-output-visitor.c @@ -17,7 +17,8 @@ #include "qapi/visitor-impl.h" #include "qemu/queue.h" #include "qemu-common.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qbool.h" +#include "qapi/qmp/qstring.h" =20 typedef struct QStackEntry { QObject *value; diff --git a/qobject/json-parser.c b/qobject/json-parser.c index 724ca240e4..30dfb9dc41 100644 --- a/qobject/json-parser.c +++ b/qobject/json-parser.c @@ -15,7 +15,8 @@ #include "qemu/cutils.h" #include "qapi/error.h" #include "qemu-common.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qbool.h" +#include "qapi/qmp/qstring.h" #include "qapi/qmp/json-parser.h" #include "qapi/qmp/json-lexer.h" #include "qapi/qmp/json-streamer.h" diff --git a/qobject/qjson.c b/qobject/qjson.c index 2e0930884e..fe89213247 100644 --- a/qobject/qjson.c +++ b/qobject/qjson.c @@ -17,7 +17,7 @@ #include "qapi/qmp/json-parser.h" #include "qapi/qmp/json-streamer.h" #include "qapi/qmp/qjson.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qbool.h" #include "qemu/unicode.h" =20 typedef struct JSONParsingState diff --git a/qobject/qlit.c b/qobject/qlit.c index 3c4882c784..dbf19225c8 100644 --- a/qobject/qlit.c +++ b/qobject/qlit.c @@ -16,7 +16,9 @@ #include "qemu/osdep.h" =20 #include "qapi/qmp/qlit.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qbool.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qstring.h" =20 static bool qlit_equal_qdict(const QLitObject *lhs, const QDict *qdict) { diff --git a/qobject/qobject.c b/qobject/qobject.c index b2a536041d..9b61ece06b 100644 --- a/qobject/qobject.c +++ b/qobject/qobject.c @@ -9,7 +9,9 @@ =20 #include "qemu/osdep.h" #include "qemu-common.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qbool.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qstring.h" =20 static void (*qdestroy[QTYPE__MAX])(QObject *) =3D { [QTYPE_NONE] =3D NULL, /* No such object exists */ diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py index dc7c418923..26c56c5062 100644 --- a/scripts/qapi-commands.py +++ b/scripts/qapi-commands.py @@ -293,7 +293,6 @@ fdef.write(mcgen(''' #include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/module.h" -#include "qapi/qmp/types.h" #include "qapi/visitor.h" #include "qapi/qobject-output-visitor.h" #include "qapi/qobject-input-visitor.h" diff --git a/target/i386/cpu.c b/target/i386/cpu.c index ae44c9d8ad..6627e98bdf 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -32,7 +32,6 @@ #include "qemu/config-file.h" #include "qapi/error.h" #include "qapi/qmp/qerror.h" -#include "qapi/qmp/types.h" =20 #include "qapi-visit.h" #include "qapi/visitor.h" diff --git a/tests/check-qjson.c b/tests/check-qjson.c index 59227934ce..7881009f1c 100644 --- a/tests/check-qjson.c +++ b/tests/check-qjson.c @@ -14,7 +14,7 @@ #include "qemu/osdep.h" =20 #include "qapi/error.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qbool.h" #include "qapi/qmp/qjson.h" #include "qapi/qmp/qlit.h" #include "qemu-common.h" diff --git a/tests/check-qobject.c b/tests/check-qobject.c index 710f9e6b0a..06b9c6ec34 100644 --- a/tests/check-qobject.c +++ b/tests/check-qobject.c @@ -8,7 +8,8 @@ */ #include "qemu/osdep.h" =20 -#include "qapi/qmp/types.h" +#include "qapi/qmp/qbool.h" +#include "qapi/qmp/qstring.h" #include "qemu-common.h" =20 #include diff --git a/tests/cpu-plug-test.c b/tests/cpu-plug-test.c index 05d82f76c4..65456c9e37 100644 --- a/tests/cpu-plug-test.c +++ b/tests/cpu-plug-test.c @@ -11,7 +11,6 @@ =20 #include "qemu-common.h" #include "libqtest.h" -#include "qapi/qmp/types.h" =20 struct PlugTestData { char *machine; diff --git a/tests/qom-test.c b/tests/qom-test.c index ab0595dc75..0ee990710c 100644 --- a/tests/qom-test.c +++ b/tests/qom-test.c @@ -12,7 +12,6 @@ #include "qemu-common.h" #include "qemu/cutils.h" #include "libqtest.h" -#include "qapi/qmp/types.h" =20 static const char *blacklist_x86[] =3D { "xenfv", "xenpv", NULL diff --git a/tests/test-clone-visitor.c b/tests/test-clone-visitor.c index 6b6d4aaeba..9aeaf86a07 100644 --- a/tests/test-clone-visitor.c +++ b/tests/test-clone-visitor.c @@ -12,7 +12,6 @@ #include "qemu-common.h" #include "qapi/clone-visitor.h" #include "test-qapi-visit.h" -#include "qapi/qmp/types.h" =20 static void test_clone_struct(void) { diff --git a/tests/test-qmp-commands.c b/tests/test-qmp-commands.c index 52c1802eaf..4794d1a9d8 100644 --- a/tests/test-qmp-commands.c +++ b/tests/test-qmp-commands.c @@ -1,6 +1,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qstring.h" #include "test-qmp-commands.h" #include "qapi/error.h" #include "qapi/qmp/dispatch.h" diff --git a/tests/test-qmp-event.c b/tests/test-qmp-event.c index 5be2d8efcf..b197dff453 100644 --- a/tests/test-qmp-event.c +++ b/tests/test-qmp-event.c @@ -17,8 +17,9 @@ #include "test-qapi-visit.h" #include "test-qapi-event.h" #include "qapi/error.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qbool.h" #include "qapi/qmp/qobject.h" +#include "qapi/qmp/qstring.h" #include "qapi/qmp-event.h" =20 typedef struct TestEventData { diff --git a/tests/test-qobject-input-visitor.c b/tests/test-qobject-input-= visitor.c index ade6062e2c..96405991bb 100644 --- a/tests/test-qobject-input-visitor.c +++ b/tests/test-qobject-input-visitor.c @@ -17,7 +17,7 @@ #include "qapi/error.h" #include "qapi/qobject-input-visitor.h" #include "test-qapi-visit.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qbool.h" #include "qapi/qmp/qjson.h" #include "test-qmp-introspect.h" #include "qmp-introspect.h" diff --git a/tests/test-qobject-output-visitor.c b/tests/test-qobject-outpu= t-visitor.c index 1cff769b15..a0b7fe6add 100644 --- a/tests/test-qobject-output-visitor.c +++ b/tests/test-qobject-output-visitor.c @@ -16,7 +16,7 @@ #include "qapi/error.h" #include "qapi/qobject-output-visitor.h" #include "test-qapi-visit.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qbool.h" #include "qapi/qmp/qjson.h" =20 typedef struct TestOutputVisitorData { diff --git a/tests/test-string-input-visitor.c b/tests/test-string-input-vi= sitor.c index 4473944f3f..88e0e1aa9a 100644 --- a/tests/test-string-input-visitor.c +++ b/tests/test-string-input-visitor.c @@ -16,7 +16,6 @@ #include "qapi/error.h" #include "qapi/string-input-visitor.h" #include "test-qapi-visit.h" -#include "qapi/qmp/types.h" =20 typedef struct TestInputVisitorData { Visitor *v; diff --git a/tests/test-string-output-visitor.c b/tests/test-string-output-= visitor.c index facb76ffc3..fa4b4ca288 100644 --- a/tests/test-string-output-visitor.c +++ b/tests/test-string-output-visitor.c @@ -16,7 +16,6 @@ #include "qapi/error.h" #include "qapi/string-output-visitor.h" #include "test-qapi-visit.h" -#include "qapi/qmp/types.h" =20 typedef struct TestOutputVisitorData { Visitor *ov; diff --git a/tests/test-visitor-serialization.c b/tests/test-visitor-serial= ization.c index a3407d205d..928a82b2e6 100644 --- a/tests/test-visitor-serialization.c +++ b/tests/test-visitor-serialization.c @@ -17,7 +17,6 @@ #include "qemu-common.h" #include "test-qapi-visit.h" #include "qapi/error.h" -#include "qapi/qmp/types.h" #include "qapi/qmp/qjson.h" #include "qapi/qobject-input-visitor.h" #include "qapi/qobject-output-visitor.h" diff --git a/ui/vnc.c b/ui/vnc.c index 9bcc2c0db9..8458e6d9fe 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -35,7 +35,6 @@ #include "qemu/acl.h" #include "qemu/config-file.h" #include "qapi/error.h" -#include "qapi/qmp/types.h" #include "qmp-commands.h" #include "ui/input.h" #include "qapi-event.h" diff --git a/util/qemu-option.c b/util/qemu-option.c index 553d3dc552..d790c1b85a 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -28,7 +28,9 @@ #include "qapi/error.h" #include "qemu-common.h" #include "qemu/error-report.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qbool.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qstring.h" #include "qapi/qmp/qerror.h" #include "qemu/option_int.h" #include "qemu/cutils.h" --=20 2.13.6 From nobody Sun Apr 28 12:31:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1517308266786768.5192866491105; Tue, 30 Jan 2018 02:31:06 -0800 (PST) Received: from localhost ([::1]:55266 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egTBx-0002oY-U1 for importer@patchew.org; Tue, 30 Jan 2018 05:31:05 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59454) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egT3N-00047q-2J for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1egT3H-0000a9-JN for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51504) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1egT3H-0000Z4-9R for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:07 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8097B61B8F 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 F14557C74D for ; Tue, 30 Jan 2018 10:22:05 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id AD4AE1138656; Tue, 30 Jan 2018 11:22:02 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 30 Jan 2018 11:21:52 +0100 Message-Id: <20180130102202.28519-9-armbru@redhat.com> In-Reply-To: <20180130102202.28519-1-armbru@redhat.com> References: <20180130102202.28519-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Tue, 30 Jan 2018 10:22:06 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 08/18] qdict qlist: Make most helper macros functions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The macro expansions of qdict_put_TYPE() and qlist_append_TYPE() need qbool.h, qnull.h, qnum.h and qstring.h to compile. We include qnull.h and qnum.h in the headers, but not qbool.h and qstring.h. Works, because we include those wherever the macros get used. Open-coding these helpers is of dubious value. Turn them into functions and drop the includes from the headers. This cleanup makes the number of objects depending on qapi/qmp/qnum.h from 4548 (out of 4739) to 46 in my "build everything" tree. For qapi/qmp/qnull.h, the number drops from 4549 to 21. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- block/qapi.c | 1 + blockdev.c | 1 + hw/i386/acpi-build.c | 1 + hw/ppc/spapr_drc.c | 1 + include/qapi/qmp/qdict.h | 16 ++++------------ include/qapi/qmp/qlist.h | 15 ++++----------- migration/migration.c | 1 + monitor.c | 1 + qapi/qapi-dealloc-visitor.c | 1 + qapi/qobject-input-visitor.c | 2 ++ qapi/qobject-output-visitor.c | 2 ++ qobject/json-parser.c | 2 ++ qobject/qdict.c | 21 +++++++++++++++++++++ qobject/qjson.c | 1 + qobject/qlist.c | 24 ++++++++++++++++++++++++ qobject/qlit.c | 1 + qobject/qobject.c | 2 ++ qom/object.c | 1 + target/ppc/translate.c | 1 + tests/check-qdict.c | 1 + tests/check-qjson.c | 2 ++ tests/check-qobject.c | 2 ++ tests/test-qmp-commands.c | 1 + tests/test-qmp-event.c | 1 + tests/test-qobject-input-visitor.c | 2 ++ tests/test-qobject-output-visitor.c | 2 ++ util/qemu-option.c | 1 + 27 files changed, 84 insertions(+), 23 deletions(-) diff --git a/block/qapi.c b/block/qapi.c index 1ab4372519..1e0cb2743d 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/qnum.h" #include "qapi/qmp/qstring.h" #include "sysemu/block-backend.h" #include "qemu/cutils.h" diff --git a/blockdev.c b/blockdev.c index 8a47459937..c487cf0e4b 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/qnum.h" #include "qapi/qmp/qstring.h" #include "qapi-visit.h" #include "qapi/error.h" diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index dc4b2b9ffe..7ff62de52f 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -22,6 +22,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" +#include "qapi/qmp/qnum.h" #include "acpi-build.h" #include "qemu-common.h" #include "qemu/bitmap.h" diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c index e3b122968e..aa251133de 100644 --- a/hw/ppc/spapr_drc.c +++ b/hw/ppc/spapr_drc.c @@ -12,6 +12,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" +#include "qapi/qmp/qnull.h" #include "cpu.h" #include "qemu/cutils.h" #include "hw/ppc/spapr_drc.h" diff --git a/include/qapi/qmp/qdict.h b/include/qapi/qmp/qdict.h index d0c298114e..3c1def00f7 100644 --- a/include/qapi/qmp/qdict.h +++ b/include/qapi/qmp/qdict.h @@ -15,8 +15,6 @@ =20 #include "qapi/qmp/qobject.h" #include "qapi/qmp/qlist.h" -#include "qapi/qmp/qnull.h" -#include "qapi/qmp/qnum.h" #include "qemu/queue.h" =20 #define QDICT_BUCKET_MAX 512 @@ -55,17 +53,11 @@ void qdict_destroy_obj(QObject *obj); #define qdict_put(qdict, key, obj) \ qdict_put_obj(qdict, key, QOBJECT(obj)) =20 -/* Helpers for int, bool, null, and string */ -#define qdict_put_int(qdict, key, value) \ - qdict_put(qdict, key, qnum_from_int(value)) -#define qdict_put_bool(qdict, key, value) \ - qdict_put(qdict, key, qbool_from_bool(value)) -#define qdict_put_str(qdict, key, value) \ - qdict_put(qdict, key, qstring_from_str(value)) -#define qdict_put_null(qdict, key) \ - qdict_put(qdict, key, qnull()) +void qdict_put_bool(QDict *qdict, const char *key, bool value); +void qdict_put_int(QDict *qdict, const char *key, int64_t value); +void qdict_put_null(QDict *qdict, const char *key); +void qdict_put_str(QDict *qdict, const char *key, const char *value); =20 -/* High level helpers */ double qdict_get_double(const QDict *qdict, const char *key); int64_t qdict_get_int(const QDict *qdict, const char *key); bool qdict_get_bool(const QDict *qdict, const char *key); diff --git a/include/qapi/qmp/qlist.h b/include/qapi/qmp/qlist.h index 632b7ef2c1..5fd976a398 100644 --- a/include/qapi/qmp/qlist.h +++ b/include/qapi/qmp/qlist.h @@ -14,8 +14,6 @@ #define QLIST_H =20 #include "qapi/qmp/qobject.h" -#include "qapi/qmp/qnum.h" -#include "qapi/qmp/qnull.h" #include "qemu/queue.h" =20 typedef struct QListEntry { @@ -31,15 +29,10 @@ struct QList { #define qlist_append(qlist, obj) \ qlist_append_obj(qlist, QOBJECT(obj)) =20 -/* Helpers for int, bool, and string */ -#define qlist_append_int(qlist, value) \ - qlist_append(qlist, qnum_from_int(value)) -#define qlist_append_bool(qlist, value) \ - qlist_append(qlist, qbool_from_bool(value)) -#define qlist_append_str(qlist, value) \ - qlist_append(qlist, qstring_from_str(value)) -#define qlist_append_null(qlist) \ - qlist_append(qlist, qnull()) +void qlist_append_bool(QList *qlist, bool value); +void qlist_append_int(QList *qlist, int64_t value); +void qlist_append_null(QList *qlist); +void qlist_append_str(QList *qlist, const char *value); =20 #define QLIST_FOREACH_ENTRY(qlist, var) \ for ((var) =3D ((qlist)->head.tqh_first); \ diff --git a/migration/migration.c b/migration/migration.c index 79ec88dba2..26865dc6df 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -32,6 +32,7 @@ #include "block/block.h" #include "qapi/error.h" #include "qapi/qmp/qerror.h" +#include "qapi/qmp/qnull.h" #include "qemu/rcu.h" #include "block.h" #include "postcopy-ram.h" diff --git a/monitor.c b/monitor.c index f38640c1e4..20f7b159b3 100644 --- a/monitor.c +++ b/monitor.c @@ -54,6 +54,7 @@ #include "sysemu/tpm.h" #include "qapi/qmp/qerror.h" #include "qapi/qmp/qbool.h" +#include "qapi/qmp/qnum.h" #include "qapi/qmp/qjson.h" #include "qapi/qmp/json-streamer.h" #include "qapi/qmp/json-parser.h" diff --git a/qapi/qapi-dealloc-visitor.c b/qapi/qapi-dealloc-visitor.c index c7d5f80302..fd23803166 100644 --- a/qapi/qapi-dealloc-visitor.c +++ b/qapi/qapi-dealloc-visitor.c @@ -14,6 +14,7 @@ =20 #include "qemu/osdep.h" #include "qapi/dealloc-visitor.h" +#include "qapi/qmp/qnull.h" #include "qemu/queue.h" #include "qemu-common.h" #include "qapi/visitor-impl.h" diff --git a/qapi/qobject-input-visitor.c b/qapi/qobject-input-visitor.c index 8fb34c472e..31183dcb62 100644 --- a/qapi/qobject-input-visitor.c +++ b/qapi/qobject-input-visitor.c @@ -22,6 +22,8 @@ #include "qapi/qmp/qjson.h" #include "qapi/qmp/qbool.h" #include "qapi/qmp/qerror.h" +#include "qapi/qmp/qnull.h" +#include "qapi/qmp/qnum.h" #include "qemu/cutils.h" #include "qemu/option.h" =20 diff --git a/qapi/qobject-output-visitor.c b/qapi/qobject-output-visitor.c index 60398765df..f0cc46b3cf 100644 --- a/qapi/qobject-output-visitor.c +++ b/qapi/qobject-output-visitor.c @@ -18,6 +18,8 @@ #include "qemu/queue.h" #include "qemu-common.h" #include "qapi/qmp/qbool.h" +#include "qapi/qmp/qnull.h" +#include "qapi/qmp/qnum.h" #include "qapi/qmp/qstring.h" =20 typedef struct QStackEntry { diff --git a/qobject/json-parser.c b/qobject/json-parser.c index 30dfb9dc41..8f4badc6d9 100644 --- a/qobject/json-parser.c +++ b/qobject/json-parser.c @@ -16,6 +16,8 @@ #include "qapi/error.h" #include "qemu-common.h" #include "qapi/qmp/qbool.h" +#include "qapi/qmp/qnull.h" +#include "qapi/qmp/qnum.h" #include "qapi/qmp/qstring.h" #include "qapi/qmp/json-parser.h" #include "qapi/qmp/json-lexer.h" diff --git a/qobject/qdict.c b/qobject/qdict.c index e8f15f1132..7e7ac24cf7 100644 --- a/qobject/qdict.c +++ b/qobject/qdict.c @@ -14,6 +14,7 @@ #include "qapi/qmp/qnum.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qbool.h" +#include "qapi/qmp/qnull.h" #include "qapi/qmp/qstring.h" #include "qapi/qmp/qobject.h" #include "qapi/error.h" @@ -143,6 +144,26 @@ void qdict_put_obj(QDict *qdict, const char *key, QObj= ect *value) } } =20 +void qdict_put_int(QDict *qdict, const char *key, int64_t value) +{ + qdict_put(qdict, key, qnum_from_int(value)); +} + +void qdict_put_bool(QDict *qdict, const char *key, bool value) +{ + qdict_put(qdict, key, qbool_from_bool(value)); +} + +void qdict_put_str(QDict *qdict, const char *key, const char *value) +{ + qdict_put(qdict, key, qstring_from_str(value)); +} + +void qdict_put_null(QDict *qdict, const char *key) +{ + qdict_put(qdict, key, qnull()); +} + /** * qdict_get(): Lookup for a given 'key' * diff --git a/qobject/qjson.c b/qobject/qjson.c index fe89213247..7fbb68b6ba 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/qnum.h" #include "qemu/unicode.h" =20 typedef struct JSONParsingState diff --git a/qobject/qlist.c b/qobject/qlist.c index 3ef57d31d1..268e46c8f0 100644 --- a/qobject/qlist.c +++ b/qobject/qlist.c @@ -11,8 +11,12 @@ */ =20 #include "qemu/osdep.h" +#include "qapi/qmp/qbool.h" #include "qapi/qmp/qlist.h" +#include "qapi/qmp/qnull.h" +#include "qapi/qmp/qnum.h" #include "qapi/qmp/qobject.h" +#include "qapi/qmp/qstring.h" #include "qemu/queue.h" #include "qemu-common.h" =20 @@ -64,6 +68,26 @@ void qlist_append_obj(QList *qlist, QObject *value) QTAILQ_INSERT_TAIL(&qlist->head, entry, next); } =20 +void qlist_append_int(QList *qlist, int64_t value) +{ + qlist_append(qlist, qnum_from_int(value)); +} + +void qlist_append_bool(QList *qlist, bool value) +{ + qlist_append(qlist, qbool_from_bool(value)); +} + +void qlist_append_str(QList *qlist, const char *value) +{ + qlist_append(qlist, qstring_from_str(value)); +} + +void qlist_append_null(QList *qlist) +{ + qlist_append(qlist, qnull()); +} + /** * qlist_iter(): Iterate over all the list's stored values. * diff --git a/qobject/qlit.c b/qobject/qlit.c index dbf19225c8..c2d0303425 100644 --- a/qobject/qlit.c +++ b/qobject/qlit.c @@ -17,6 +17,7 @@ =20 #include "qapi/qmp/qlit.h" #include "qapi/qmp/qbool.h" +#include "qapi/qmp/qnum.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" =20 diff --git a/qobject/qobject.c b/qobject/qobject.c index 9b61ece06b..5bbcd04812 100644 --- a/qobject/qobject.c +++ b/qobject/qobject.c @@ -10,6 +10,8 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "qapi/qmp/qbool.h" +#include "qapi/qmp/qnull.h" +#include "qapi/qmp/qnum.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" =20 diff --git a/qom/object.c b/qom/object.c index c58c52d518..d97f09c1fb 100644 --- a/qom/object.c +++ b/qom/object.c @@ -27,6 +27,7 @@ #include "qom/qom-qobject.h" #include "qapi/qmp/qobject.h" #include "qapi/qmp/qbool.h" +#include "qapi/qmp/qnum.h" #include "qapi/qmp/qstring.h" =20 #define MAX_INTERFACES 32 diff --git a/target/ppc/translate.c b/target/ppc/translate.c index 4132f67bb1..eeaad9e91f 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -24,6 +24,7 @@ #include "disas/disas.h" #include "exec/exec-all.h" #include "tcg-op.h" +#include "qapi/qmp/qnull.h" #include "qemu/host-utils.h" #include "exec/cpu_ldst.h" =20 diff --git a/tests/check-qdict.c b/tests/check-qdict.c index 35405778cc..1b1173634f 100644 --- a/tests/check-qdict.c +++ b/tests/check-qdict.c @@ -12,6 +12,7 @@ #include "qemu/osdep.h" =20 #include "qapi/qmp/qdict.h" +#include "qapi/qmp/qnum.h" #include "qapi/qmp/qstring.h" #include "qapi/error.h" #include "qemu-common.h" diff --git a/tests/check-qjson.c b/tests/check-qjson.c index 7881009f1c..26f5d4401e 100644 --- a/tests/check-qjson.c +++ b/tests/check-qjson.c @@ -17,6 +17,8 @@ #include "qapi/qmp/qbool.h" #include "qapi/qmp/qjson.h" #include "qapi/qmp/qlit.h" +#include "qapi/qmp/qnull.h" +#include "qapi/qmp/qnum.h" #include "qemu-common.h" =20 static void escaped_string(void) diff --git a/tests/check-qobject.c b/tests/check-qobject.c index 06b9c6ec34..9e1e82045f 100644 --- a/tests/check-qobject.c +++ b/tests/check-qobject.c @@ -9,6 +9,8 @@ #include "qemu/osdep.h" =20 #include "qapi/qmp/qbool.h" +#include "qapi/qmp/qnull.h" +#include "qapi/qmp/qnum.h" #include "qapi/qmp/qstring.h" #include "qemu-common.h" =20 diff --git a/tests/test-qmp-commands.c b/tests/test-qmp-commands.c index 4794d1a9d8..b5a3d88775 100644 --- a/tests/test-qmp-commands.c +++ b/tests/test-qmp-commands.c @@ -1,6 +1,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "qapi/qmp/qdict.h" +#include "qapi/qmp/qnum.h" #include "qapi/qmp/qstring.h" #include "test-qmp-commands.h" #include "qapi/error.h" diff --git a/tests/test-qmp-event.c b/tests/test-qmp-event.c index b197dff453..cad94778c7 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/qnum.h" #include "qapi/qmp/qobject.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 96405991bb..20bf9a5414 100644 --- a/tests/test-qobject-input-visitor.c +++ b/tests/test-qobject-input-visitor.c @@ -18,6 +18,8 @@ #include "qapi/qobject-input-visitor.h" #include "test-qapi-visit.h" #include "qapi/qmp/qbool.h" +#include "qapi/qmp/qnull.h" +#include "qapi/qmp/qnum.h" #include "qapi/qmp/qjson.h" #include "test-qmp-introspect.h" #include "qmp-introspect.h" diff --git a/tests/test-qobject-output-visitor.c b/tests/test-qobject-outpu= t-visitor.c index a0b7fe6add..4a24e12121 100644 --- a/tests/test-qobject-output-visitor.c +++ b/tests/test-qobject-output-visitor.c @@ -17,6 +17,8 @@ #include "qapi/qobject-output-visitor.h" #include "test-qapi-visit.h" #include "qapi/qmp/qbool.h" +#include "qapi/qmp/qnull.h" +#include "qapi/qmp/qnum.h" #include "qapi/qmp/qjson.h" =20 typedef struct TestOutputVisitorData { diff --git a/util/qemu-option.c b/util/qemu-option.c index d790c1b85a..a401e936da 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -30,6 +30,7 @@ #include "qemu/error-report.h" #include "qapi/qmp/qbool.h" #include "qapi/qmp/qdict.h" +#include "qapi/qmp/qnum.h" #include "qapi/qmp/qstring.h" #include "qapi/qmp/qerror.h" #include "qemu/option_int.h" --=20 2.13.6 From nobody Sun Apr 28 12:31:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1517308499371166.4722226307548; Tue, 30 Jan 2018 02:34:59 -0800 (PST) Received: from localhost ([::1]:55325 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egTFi-0005ih-GL for importer@patchew.org; Tue, 30 Jan 2018 05:34:58 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59470) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egT3N-000482-Sa for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1egT3H-0000Zm-Dk for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44330) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1egT3H-0000Yv-6A for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:07 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5AB5628213 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 F25FB60C8B for ; Tue, 30 Jan 2018 10:22:05 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id B044E1138657; Tue, 30 Jan 2018 11:22:02 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 30 Jan 2018 11:21:53 +0100 Message-Id: <20180130102202.28519-10-armbru@redhat.com> In-Reply-To: <20180130102202.28519-1-armbru@redhat.com> References: <20180130102202.28519-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Tue, 30 Jan 2018 10:22:06 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 09/18] Include qapi/qmp/qobject.h exactly where needed X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- include/block/block.h | 1 - include/qapi/qmp/dispatch.h | 1 - include/qapi/qmp/qjson.h | 1 - include/qapi/qobject-input-visitor.h | 1 - include/qapi/qobject-output-visitor.h | 1 - include/qapi/visitor.h | 2 +- qapi/qapi-visit-core.c | 1 - qmp.c | 1 - qobject/qbool.c | 1 - qobject/qdict.c | 1 - qobject/qlist.c | 1 - qobject/qnum.c | 1 - qobject/qstring.c | 1 - qom/object.c | 1 - tests/test-qmp-event.c | 1 - 15 files changed, 1 insertion(+), 15 deletions(-) diff --git a/include/block/block.h b/include/block/block.h index 0608834396..62ba19d78d 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -8,7 +8,6 @@ #include "block/accounting.h" #include "block/dirty-bitmap.h" #include "block/blockjob.h" -#include "qapi/qmp/qobject.h" #include "qemu/hbitmap.h" =20 /* block.c */ diff --git a/include/qapi/qmp/dispatch.h b/include/qapi/qmp/dispatch.h index 20578dcd48..47a0ff348b 100644 --- a/include/qapi/qmp/dispatch.h +++ b/include/qapi/qmp/dispatch.h @@ -14,7 +14,6 @@ #ifndef QAPI_QMP_DISPATCH_H #define QAPI_QMP_DISPATCH_H =20 -#include "qapi/qmp/qobject.h" #include "qapi/qmp/qdict.h" =20 typedef void (QmpCommandFunc)(QDict *, QObject **, Error **); diff --git a/include/qapi/qmp/qjson.h b/include/qapi/qmp/qjson.h index 6e84082d5f..6b38b0f074 100644 --- a/include/qapi/qmp/qjson.h +++ b/include/qapi/qmp/qjson.h @@ -14,7 +14,6 @@ #ifndef QJSON_H #define QJSON_H =20 -#include "qapi/qmp/qobject.h" #include "qapi/qmp/qstring.h" =20 QObject *qobject_from_json(const char *string, Error **errp); diff --git a/include/qapi/qobject-input-visitor.h b/include/qapi/qobject-in= put-visitor.h index daee18c6ac..95985e25e5 100644 --- a/include/qapi/qobject-input-visitor.h +++ b/include/qapi/qobject-input-visitor.h @@ -16,7 +16,6 @@ #define QOBJECT_INPUT_VISITOR_H =20 #include "qapi/visitor.h" -#include "qapi/qmp/qobject.h" =20 typedef struct QObjectInputVisitor QObjectInputVisitor; =20 diff --git a/include/qapi/qobject-output-visitor.h b/include/qapi/qobject-o= utput-visitor.h index e5a3490812..2b1726baf5 100644 --- a/include/qapi/qobject-output-visitor.h +++ b/include/qapi/qobject-output-visitor.h @@ -15,7 +15,6 @@ #define QOBJECT_OUTPUT_VISITOR_H =20 #include "qapi/visitor.h" -#include "qapi/qmp/qobject.h" =20 typedef struct QObjectOutputVisitor QObjectOutputVisitor; =20 diff --git a/include/qapi/visitor.h b/include/qapi/visitor.h index 62a51a54cb..ecff296c11 100644 --- a/include/qapi/visitor.h +++ b/include/qapi/visitor.h @@ -15,7 +15,7 @@ #ifndef QAPI_VISITOR_H #define QAPI_VISITOR_H =20 -#include "qapi/qmp/qobject.h" +#include "qapi-types.h" =20 /* * The QAPI schema defines both a set of C data types, and a QMP wire diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c index 3dcb968867..d9a113726f 100644 --- a/qapi/qapi-visit-core.c +++ b/qapi/qapi-visit-core.c @@ -15,7 +15,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu-common.h" -#include "qapi/qmp/qobject.h" #include "qapi/qmp/qerror.h" #include "qapi/visitor.h" #include "qapi/visitor-impl.h" diff --git a/qmp.c b/qmp.c index a56faf1b9a..f87de2bc26 100644 --- a/qmp.c +++ b/qmp.c @@ -32,7 +32,6 @@ #include "qom/qom-qobject.h" #include "qapi/error.h" #include "qapi/qmp/qerror.h" -#include "qapi/qmp/qobject.h" #include "qapi/qobject-input-visitor.h" #include "hw/boards.h" #include "qom/object_interfaces.h" diff --git a/qobject/qbool.c b/qobject/qbool.c index ac825fc5a2..e5a7a53879 100644 --- a/qobject/qbool.c +++ b/qobject/qbool.c @@ -13,7 +13,6 @@ =20 #include "qemu/osdep.h" #include "qapi/qmp/qbool.h" -#include "qapi/qmp/qobject.h" #include "qemu-common.h" =20 /** diff --git a/qobject/qdict.c b/qobject/qdict.c index 7e7ac24cf7..88f87d2527 100644 --- a/qobject/qdict.c +++ b/qobject/qdict.c @@ -16,7 +16,6 @@ #include "qapi/qmp/qbool.h" #include "qapi/qmp/qnull.h" #include "qapi/qmp/qstring.h" -#include "qapi/qmp/qobject.h" #include "qapi/error.h" #include "qemu/queue.h" #include "qemu-common.h" diff --git a/qobject/qlist.c b/qobject/qlist.c index 268e46c8f0..613a95c12b 100644 --- a/qobject/qlist.c +++ b/qobject/qlist.c @@ -15,7 +15,6 @@ #include "qapi/qmp/qlist.h" #include "qapi/qmp/qnull.h" #include "qapi/qmp/qnum.h" -#include "qapi/qmp/qobject.h" #include "qapi/qmp/qstring.h" #include "qemu/queue.h" #include "qemu-common.h" diff --git a/qobject/qnum.c b/qobject/qnum.c index 517610d9da..60c395c1bc 100644 --- a/qobject/qnum.c +++ b/qobject/qnum.c @@ -14,7 +14,6 @@ =20 #include "qemu/osdep.h" #include "qapi/qmp/qnum.h" -#include "qapi/qmp/qobject.h" #include "qemu-common.h" =20 /** diff --git a/qobject/qstring.c b/qobject/qstring.c index 74182a1c02..05b4bbc2d6 100644 --- a/qobject/qstring.c +++ b/qobject/qstring.c @@ -11,7 +11,6 @@ */ =20 #include "qemu/osdep.h" -#include "qapi/qmp/qobject.h" #include "qapi/qmp/qstring.h" #include "qemu-common.h" =20 diff --git a/qom/object.c b/qom/object.c index d97f09c1fb..5dcee4683c 100644 --- a/qom/object.c +++ b/qom/object.c @@ -25,7 +25,6 @@ /* TODO: replace QObject with a simpler visitor to avoid a dependency * of the QOM core on QObject? */ #include "qom/qom-qobject.h" -#include "qapi/qmp/qobject.h" #include "qapi/qmp/qbool.h" #include "qapi/qmp/qnum.h" #include "qapi/qmp/qstring.h" diff --git a/tests/test-qmp-event.c b/tests/test-qmp-event.c index cad94778c7..e5ee69e9af 100644 --- a/tests/test-qmp-event.c +++ b/tests/test-qmp-event.c @@ -19,7 +19,6 @@ #include "qapi/error.h" #include "qapi/qmp/qbool.h" #include "qapi/qmp/qnum.h" -#include "qapi/qmp/qobject.h" #include "qapi/qmp/qstring.h" #include "qapi/qmp-event.h" =20 --=20 2.13.6 From nobody Sun Apr 28 12:31:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1517307861093355.5569472525159; Tue, 30 Jan 2018 02:24:21 -0800 (PST) Received: from localhost ([::1]:55123 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egT5P-0005Mm-Hd for importer@patchew.org; Tue, 30 Jan 2018 05:24:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59400) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egT3K-00046X-Fp for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1egT3H-0000Zu-FA for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:10 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58752) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1egT3H-0000Yy-78 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 6569AC0587E1 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 042905C3FD for ; Tue, 30 Jan 2018 10:22:06 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id B36061138659; Tue, 30 Jan 2018 11:22:02 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 30 Jan 2018 11:21:54 +0100 Message-Id: <20180130102202.28519-11-armbru@redhat.com> In-Reply-To: <20180130102202.28519-1-armbru@redhat.com> References: <20180130102202.28519-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 30 Jan 2018 10:22:06 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 10/18] Include qapi/qmp/qlist.h exactly where needed X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This cleanup makes the number of objects depending on qapi/qmp/qlist.h drop from 4548 (out of 4739) to 16 in my "build everything" tree. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- block/qapi.c | 1 + block/rbd.c | 1 + blockdev.c | 1 + include/qapi/qmp/json-parser.h | 1 - include/qapi/qmp/qdict.h | 1 - qapi/qobject-input-visitor.c | 1 + qapi/qobject-output-visitor.c | 1 + qobject/json-parser.c | 1 + qobject/qdict.c | 1 + qobject/qjson.c | 1 + qobject/qlit.c | 1 + qobject/qobject.c | 1 + tests/check-qdict.c | 2 ++ tests/check-qlit.c | 1 + tests/check-qobject.c | 2 ++ tests/device-introspect-test.c | 1 + tests/libqtest.c | 2 ++ tests/numa-test.c | 1 + tests/qmp-test.c | 1 + tests/qom-test.c | 1 + tests/test-keyval.c | 1 + tests/test-qga.c | 1 + tests/test-qobject-output-visitor.c | 1 + tests/test-x86-cpuid-compat.c | 1 + ui/vnc-palette.h | 1 - util/keyval.c | 1 + util/qemu-config.c | 1 + 27 files changed, 27 insertions(+), 3 deletions(-) diff --git a/block/qapi.c b/block/qapi.c index 1e0cb2743d..12a8cb5a82 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/qlist.h" #include "qapi/qmp/qnum.h" #include "qapi/qmp/qstring.h" #include "sysemu/block-backend.h" diff --git a/block/rbd.c b/block/rbd.c index a76a5e8755..76b9e83cea 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -21,6 +21,7 @@ #include "qemu/cutils.h" #include "qapi/qmp/qstring.h" #include "qapi/qmp/qjson.h" +#include "qapi/qmp/qlist.h" =20 /* * When specifying the image filename use: diff --git a/blockdev.c b/blockdev.c index c487cf0e4b..90ef3166de 100644 --- a/blockdev.c +++ b/blockdev.c @@ -45,6 +45,7 @@ #include "qapi-visit.h" #include "qapi/error.h" #include "qapi/qmp/qerror.h" +#include "qapi/qmp/qlist.h" #include "qapi/qobject-output-visitor.h" #include "sysemu/sysemu.h" #include "sysemu/iothread.h" diff --git a/include/qapi/qmp/json-parser.h b/include/qapi/qmp/json-parser.h index 9987f8ca85..102f5c0068 100644 --- a/include/qapi/qmp/json-parser.h +++ b/include/qapi/qmp/json-parser.h @@ -15,7 +15,6 @@ #define QEMU_JSON_PARSER_H =20 #include "qemu-common.h" -#include "qapi/qmp/qlist.h" =20 QObject *json_parser_parse(GQueue *tokens, va_list *ap); QObject *json_parser_parse_err(GQueue *tokens, va_list *ap, Error **errp); diff --git a/include/qapi/qmp/qdict.h b/include/qapi/qmp/qdict.h index 3c1def00f7..ff6f7842c3 100644 --- a/include/qapi/qmp/qdict.h +++ b/include/qapi/qmp/qdict.h @@ -14,7 +14,6 @@ #define QDICT_H =20 #include "qapi/qmp/qobject.h" -#include "qapi/qmp/qlist.h" #include "qemu/queue.h" =20 #define QDICT_BUCKET_MAX 512 diff --git a/qapi/qobject-input-visitor.c b/qapi/qobject-input-visitor.c index 31183dcb62..3e235a1eee 100644 --- a/qapi/qobject-input-visitor.c +++ b/qapi/qobject-input-visitor.c @@ -22,6 +22,7 @@ #include "qapi/qmp/qjson.h" #include "qapi/qmp/qbool.h" #include "qapi/qmp/qerror.h" +#include "qapi/qmp/qlist.h" #include "qapi/qmp/qnull.h" #include "qapi/qmp/qnum.h" #include "qemu/cutils.h" diff --git a/qapi/qobject-output-visitor.c b/qapi/qobject-output-visitor.c index f0cc46b3cf..52634b9725 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/qlist.h" #include "qapi/qmp/qnull.h" #include "qapi/qmp/qnum.h" #include "qapi/qmp/qstring.h" diff --git a/qobject/json-parser.c b/qobject/json-parser.c index 8f4badc6d9..ee0cbba6a5 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/qlist.h" #include "qapi/qmp/qnull.h" #include "qapi/qmp/qnum.h" #include "qapi/qmp/qstring.h" diff --git a/qobject/qdict.c b/qobject/qdict.c index 88f87d2527..23df84f9cd 100644 --- a/qobject/qdict.c +++ b/qobject/qdict.c @@ -14,6 +14,7 @@ #include "qapi/qmp/qnum.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qbool.h" +#include "qapi/qmp/qlist.h" #include "qapi/qmp/qnull.h" #include "qapi/qmp/qstring.h" #include "qapi/error.h" diff --git a/qobject/qjson.c b/qobject/qjson.c index 7fbb68b6ba..527b5bb571 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/qlist.h" #include "qapi/qmp/qnum.h" #include "qemu/unicode.h" =20 diff --git a/qobject/qlit.c b/qobject/qlit.c index c2d0303425..948e0b860c 100644 --- a/qobject/qlit.c +++ b/qobject/qlit.c @@ -17,6 +17,7 @@ =20 #include "qapi/qmp/qlit.h" #include "qapi/qmp/qbool.h" +#include "qapi/qmp/qlist.h" #include "qapi/qmp/qnum.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" diff --git a/qobject/qobject.c b/qobject/qobject.c index 5bbcd04812..23600aa1c1 100644 --- a/qobject/qobject.c +++ b/qobject/qobject.c @@ -13,6 +13,7 @@ #include "qapi/qmp/qnull.h" #include "qapi/qmp/qnum.h" #include "qapi/qmp/qdict.h" +#include "qapi/qmp/qlist.h" #include "qapi/qmp/qstring.h" =20 static void (*qdestroy[QTYPE__MAX])(QObject *) =3D { diff --git a/tests/check-qdict.c b/tests/check-qdict.c index 1b1173634f..d11904ea0c 100644 --- a/tests/check-qdict.c +++ b/tests/check-qdict.c @@ -9,9 +9,11 @@ * This work is licensed under the terms of the GNU LGPL, version 2.1 or l= ater. * See the COPYING.LIB file in the top-level directory. */ + #include "qemu/osdep.h" =20 #include "qapi/qmp/qdict.h" +#include "qapi/qmp/qlist.h" #include "qapi/qmp/qnum.h" #include "qapi/qmp/qstring.h" #include "qapi/error.h" diff --git a/tests/check-qlit.c b/tests/check-qlit.c index c59ec1ab88..b8b5016af7 100644 --- a/tests/check-qlit.c +++ b/tests/check-qlit.c @@ -11,6 +11,7 @@ =20 #include "qapi/qmp/qbool.h" #include "qapi/qmp/qdict.h" +#include "qapi/qmp/qlist.h" #include "qapi/qmp/qlit.h" #include "qapi/qmp/qnum.h" #include "qapi/qmp/qstring.h" diff --git a/tests/check-qobject.c b/tests/check-qobject.c index 9e1e82045f..927966093a 100644 --- a/tests/check-qobject.c +++ b/tests/check-qobject.c @@ -6,9 +6,11 @@ * This work is licensed under the terms of the GNU LGPL, version 2.1 or l= ater. * See the COPYING.LIB file in the top-level directory. */ + #include "qemu/osdep.h" =20 #include "qapi/qmp/qbool.h" +#include "qapi/qmp/qlist.h" #include "qapi/qmp/qnull.h" #include "qapi/qmp/qnum.h" #include "qapi/qmp/qstring.h" diff --git a/tests/device-introspect-test.c b/tests/device-introspect-test.c index f7162c023f..2b3d01174d 100644 --- a/tests/device-introspect-test.c +++ b/tests/device-introspect-test.c @@ -22,6 +22,7 @@ #include "qapi/qmp/qstring.h" #include "qapi/qmp/qbool.h" #include "qapi/qmp/qdict.h" +#include "qapi/qmp/qlist.h" #include "libqtest.h" =20 const char common_args[] =3D "-nodefaults -machine none"; diff --git a/tests/libqtest.c b/tests/libqtest.c index 0ec8af2923..cd0cc57e80 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -14,6 +14,7 @@ * See the COPYING file in the top-level directory. * */ + #include "qemu/osdep.h" #include "libqtest.h" =20 @@ -25,6 +26,7 @@ #include "qapi/qmp/json-parser.h" #include "qapi/qmp/json-streamer.h" #include "qapi/qmp/qjson.h" +#include "qapi/qmp/qlist.h" =20 #define MAX_IRQ 256 #define SOCKET_TIMEOUT 50 diff --git a/tests/numa-test.c b/tests/numa-test.c index e1b6152244..8158854e17 100644 --- a/tests/numa-test.c +++ b/tests/numa-test.c @@ -11,6 +11,7 @@ =20 #include "qemu/osdep.h" #include "libqtest.h" +#include "qapi/qmp/qlist.h" =20 static char *make_cli(const char *generic_cli, const char *test_cli) { diff --git a/tests/qmp-test.c b/tests/qmp-test.c index 36feb2204b..cc9661af47 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/qlist.h" #include "qapi/qobject-input-visitor.h" #include "qapi/util.h" #include "qapi/visitor.h" diff --git a/tests/qom-test.c b/tests/qom-test.c index 0ee990710c..847703cb14 100644 --- a/tests/qom-test.c +++ b/tests/qom-test.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" =20 #include "qemu-common.h" +#include "qapi/qmp/qlist.h" #include "qemu/cutils.h" #include "libqtest.h" =20 diff --git a/tests/test-keyval.c b/tests/test-keyval.c index baf7e339ab..d0c4bf2b9d 100644 --- a/tests/test-keyval.c +++ b/tests/test-keyval.c @@ -12,6 +12,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" +#include "qapi/qmp/qlist.h" #include "qapi/qmp/qstring.h" #include "qapi/qobject-input-visitor.h" #include "test-qapi-visit.h" diff --git a/tests/test-qga.c b/tests/test-qga.c index fd6bc7690f..e67c7289eb 100644 --- a/tests/test-qga.c +++ b/tests/test-qga.c @@ -5,6 +5,7 @@ #include =20 #include "libqtest.h" +#include "qapi/qmp/qlist.h" =20 typedef struct { char *test_dir; diff --git a/tests/test-qobject-output-visitor.c b/tests/test-qobject-outpu= t-visitor.c index 4a24e12121..7cf86707ec 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/qlist.h" #include "qapi/qmp/qnull.h" #include "qapi/qmp/qnum.h" #include "qapi/qmp/qjson.h" diff --git a/tests/test-x86-cpuid-compat.c b/tests/test-x86-cpuid-compat.c index c594b5bd97..495dd1e7ef 100644 --- a/tests/test-x86-cpuid-compat.c +++ b/tests/test-x86-cpuid-compat.c @@ -1,6 +1,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "qapi/qmp/qdict.h" +#include "qapi/qmp/qlist.h" #include "qapi/qmp/qnum.h" #include "qapi/qmp/qbool.h" #include "libqtest.h" diff --git a/ui/vnc-palette.h b/ui/vnc-palette.h index 1bd4318f53..e9f0eaf73b 100644 --- a/ui/vnc-palette.h +++ b/ui/vnc-palette.h @@ -29,7 +29,6 @@ #ifndef VNC_PALETTE_H #define VNC_PALETTE_H =20 -#include "qapi/qmp/qlist.h" #include "qemu/queue.h" =20 #define VNC_PALETTE_HASH_SIZE 256 diff --git a/util/keyval.c b/util/keyval.c index 7dfc75cf01..4085282a7a 100644 --- a/util/keyval.c +++ b/util/keyval.c @@ -81,6 +81,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" +#include "qapi/qmp/qlist.h" #include "qapi/qmp/qstring.h" #include "qemu/cutils.h" #include "qemu/option.h" diff --git a/util/qemu-config.c b/util/qemu-config.c index 26ea248062..230c699a51 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/qlist.h" #include "qemu-common.h" #include "qemu/error-report.h" #include "qemu/option.h" --=20 2.13.6 From nobody Sun Apr 28 12:31:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1517308632118648.0221010715121; Tue, 30 Jan 2018 02:37:12 -0800 (PST) Received: from localhost ([::1]:55545 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egTHr-0007dS-4d for importer@patchew.org; Tue, 30 Jan 2018 05:37:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59528) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egT3S-0004As-U2 for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1egT3H-0000aT-Sl for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:18 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51506) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1egT3H-0000ZN-HK for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:07 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D721F61BB4 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 03E3B5D6A8 for ; Tue, 30 Jan 2018 10:22:06 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id B69C0113865A; Tue, 30 Jan 2018 11:22:02 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 30 Jan 2018 11:21:55 +0100 Message-Id: <20180130102202.28519-12-armbru@redhat.com> In-Reply-To: <20180130102202.28519-1-armbru@redhat.com> References: <20180130102202.28519-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Tue, 30 Jan 2018 10:22:06 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 11/18] Include qapi/qmp/qdict.h exactly where needed X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This cleanup makes the number of objects depending on qapi/qmp/qdict.h drop from 4547 (out of 4739) to 368 in my "build everything" tree. For qapi/qmp/qobject.h, the number drops from 4549 to 390. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- block/crypto.c | 1 + block/curl.c | 2 ++ block/file-win32.c | 1 + block/gluster.c | 1 + block/qcow.c | 2 ++ block/rbd.c | 1 + block/snapshot.c | 1 + block/ssh.c | 1 + block/vvfat.c | 2 ++ device-hotplug.c | 1 + hmp.h | 1 - hw/pci/pcie_aer.c | 1 + hw/s390x/s390-stattrib.c | 1 + hw/usb/xen-usb.c | 1 + include/block/block.h | 1 + include/block/dirty-bitmap.h | 1 + include/hw/block/block.h | 1 + include/hw/block/fdc.h | 1 + include/hw/loader.h | 1 - include/migration/colo.h | 1 + include/migration/failover.h | 1 + include/monitor/monitor.h | 1 - include/net/net.h | 2 +- include/net/slirp.h | 1 - include/qapi/qmp-event.h | 1 - include/qapi/qmp/dispatch.h | 2 +- include/qemu/config-file.h | 1 - include/qemu/option.h | 1 - include/qemu/throttle.h | 1 + include/qom/object_interfaces.h | 1 - include/scsi/pr-manager.h | 1 - include/sysemu/arch_init.h | 1 + include/ui/console.h | 1 - migration/ram.h | 1 + net/slirp.c | 2 ++ net/tap_int.h | 1 + qapi/qmp-dispatch.c | 1 + qapi/qmp-event.c | 1 + qapi/qobject-input-visitor.c | 1 + qapi/qobject-output-visitor.c | 1 + qemu-img.c | 2 ++ qemu-io.c | 2 ++ qemu-nbd.c | 1 + qobject/json-parser.c | 1 + qobject/qjson.c | 1 + qom/object_interfaces.c | 1 + target/i386/cpu.c | 1 + target/i386/monitor.c | 2 ++ target/s390x/cpu_models.c | 1 + tests/ahci-test.c | 1 + tests/check-qobject.c | 1 + tests/cpu-plug-test.c | 1 + tests/drive_del-test.c | 1 + tests/libqos/libqos.c | 1 + tests/libqos/pci-pc.c | 2 +- tests/libqtest.c | 1 + tests/libqtest.h | 2 -- tests/migration-test.c | 1 + tests/numa-test.c | 1 + tests/pvpanic-test.c | 1 + tests/q35-test.c | 1 + tests/qmp-test.c | 1 + tests/qom-test.c | 1 + tests/tco-test.c | 2 ++ tests/test-keyval.c | 1 + tests/test-netfilter.c | 1 + tests/test-qemu-opts.c | 1 + tests/test-qga.c | 1 + tests/test-qmp-event.c | 1 + tests/test-qobject-input-visitor.c | 1 + tests/test-qobject-output-visitor.c | 1 + tests/test-replication.c | 1 + tests/tmp105-test.c | 1 + tests/vhost-user-test.c | 1 + tests/virtio-net-test.c | 1 + tests/vmgenid-test.c | 1 + tests/wdt_ib700-test.c | 1 + util/keyval.c | 1 + 78 files changed, 75 insertions(+), 15 deletions(-) diff --git a/block/crypto.c b/block/crypto.c index 60ddf8623e..2626f8ae3a 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 35cf417f59..e0eb8ebb78 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-win32.c b/block/file-win32.c index 9e02214a69..2f1da48e71 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 0f4265a3a4..097b6930a5 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/qcow.c b/block/qcow.c index 369241aae8..0b32c04cd0 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 76b9e83cea..42be5ed49d 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" =20 diff --git a/block/snapshot.c b/block/snapshot.c index 8cb70dbad5..9294a9fcc4 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" =20 diff --git a/block/ssh.c b/block/ssh.c index b049a16eb9..c693a4a4c7 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 a690595f2c..93e76580b0 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/device-hotplug.c b/device-hotplug.c index 126f73c676..b10e8cc6d4 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.h b/hmp.h index dbb40ebbfa..4d633af86c 100644 --- a/hmp.h +++ b/hmp.h @@ -16,7 +16,6 @@ =20 #include "qemu-common.h" #include "qemu/readline.h" -#include "qapi/qmp/qdict.h" =20 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 071e5e9bbb..0b55392fe7 100644 --- a/hw/pci/pcie_aer.c +++ b/hw/pci/pcie_aer.c @@ -20,6 +20,7 @@ =20 #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-stattrib.c b/hw/s390x/s390-stattrib.c index c6c06b2780..a1d2135a60 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" =20 #define CMMA_BLOCK_SIZE (1 << 10) =20 diff --git a/hw/usb/xen-usb.c b/hw/usb/xen-usb.c index 584a6f2442..3b678685e1 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" =20 #include "hw/xen/io/ring.h" diff --git a/include/block/block.h b/include/block/block.h index 62ba19d78d..d2fc44dd30 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -2,6 +2,7 @@ #define BLOCK_H =20 #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 a591c27213..3da8486ab1 100644 --- a/include/block/dirty-bitmap.h +++ b/include/block/dirty-bitmap.h @@ -2,6 +2,7 @@ #define BLOCK_DIRTY_BITMAP_H =20 #include "qemu-common.h" +#include "qapi-types.h" #include "qemu/hbitmap.h" =20 BdrvDirtyBitmap *bdrv_create_dirty_bitmap(BlockDriverState *bs, diff --git a/include/hw/block/block.h b/include/hw/block/block.h index 64b9298829..f532d10e35 100644 --- a/include/hw/block/block.h +++ b/include/hw/block/block.h @@ -12,6 +12,7 @@ #define HW_BLOCK_H =20 #include "qemu-common.h" +#include "qapi-types.h" =20 /* Configuration */ =20 diff --git a/include/hw/block/fdc.h b/include/hw/block/fdc.h index 1749dabf25..68a0c904ea 100644 --- a/include/hw/block/fdc.h +++ b/include/hw/block/fdc.h @@ -2,6 +2,7 @@ #define HW_FDC_H =20 #include "qemu-common.h" +#include "qapi-types.h" =20 /* fdc.c */ #define MAX_FD 2 diff --git a/include/hw/loader.h b/include/hw/loader.h index 355fe0f5a2..5edbe02b1c 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" =20 /* loader.c */ diff --git a/include/migration/colo.h b/include/migration/colo.h index ff9874ea16..50ace16205 100644 --- a/include/migration/colo.h +++ b/include/migration/colo.h @@ -14,6 +14,7 @@ #define QEMU_COLO_H =20 #include "qemu-common.h" +#include "qapi-types.h" =20 void colo_info_init(void); =20 diff --git a/include/migration/failover.h b/include/migration/failover.h index 9283d602e6..ad91ef2381 100644 --- a/include/migration/failover.h +++ b/include/migration/failover.h @@ -14,6 +14,7 @@ #define QEMU_FAILOVER_H =20 #include "qemu-common.h" +#include "qapi-types.h" =20 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 83ea4a1aaf..ad64ad8e68 100644 --- a/include/monitor/monitor.h +++ b/include/monitor/monitor.h @@ -2,7 +2,6 @@ #define MONITOR_H =20 #include "qemu-common.h" -#include "qapi/qmp/qdict.h" #include "block/block.h" #include "qemu/readline.h" =20 diff --git a/include/net/net.h b/include/net/net.h index eefb259e0a..71f1119bc9 100644 --- a/include/net/net.h +++ b/include/net/net.h @@ -3,7 +3,7 @@ =20 #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 865d2fca36..9a492b84a4 100644 --- a/include/net/slirp.h +++ b/include/net/slirp.h @@ -25,7 +25,6 @@ #define QEMU_NET_SLIRP_H =20 #include "qemu-common.h" -#include "qapi/qmp/qdict.h" #include "qemu/option.h" =20 #ifdef CONFIG_SLIRP diff --git a/include/qapi/qmp-event.h b/include/qapi/qmp-event.h index 40fe3cbc12..0c87ad833e 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 =20 -#include "qapi/qmp/qdict.h" =20 typedef void (*QMPEventFuncEmit)(unsigned event, QDict *dict, Error **errp= ); =20 diff --git a/include/qapi/qmp/dispatch.h b/include/qapi/qmp/dispatch.h index 47a0ff348b..1e694b5ecf 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 =20 -#include "qapi/qmp/qdict.h" +#include "qemu/queue.h" =20 typedef void (QmpCommandFunc)(QDict *, QObject **, Error **); =20 diff --git a/include/qemu/config-file.h b/include/qemu/config-file.h index c80d5c8a33..449e631c86 100644 --- a/include/qemu/config-file.h +++ b/include/qemu/config-file.h @@ -2,7 +2,6 @@ #define QEMU_CONFIG_FILE_H =20 #include "qemu/option.h" -#include "qapi/qmp/qdict.h" =20 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 a88c5f02b1..b127fb6db6 100644 --- a/include/qemu/option.h +++ b/include/qemu/option.h @@ -27,7 +27,6 @@ #define QEMU_OPTION_H =20 #include "qemu/queue.h" -#include "qapi/qmp/qdict.h" =20 const char *get_opt_name(char *buf, int buf_size, const char *p, char deli= m); 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 8c93237866..03d45f44f8 100644 --- a/include/qemu/throttle.h +++ b/include/qemu/throttle.h @@ -26,6 +26,7 @@ #define THROTTLE_H =20 #include "qemu-common.h" +#include "qapi-types.h" #include "qemu/timer.h" =20 #define THROTTLE_VALUE_MAX 1000000000000000LL diff --git a/include/qom/object_interfaces.h b/include/qom/object_interface= s.h index d23e11bc53..4d513fb329 100644 --- a/include/qom/object_interfaces.h +++ b/include/qom/object_interfaces.h @@ -2,7 +2,6 @@ #define OBJECT_INTERFACES_H =20 #include "qom/object.h" -#include "qapi/qmp/qdict.h" #include "qapi/visitor.h" =20 #define TYPE_USER_CREATABLE "user-creatable" diff --git a/include/scsi/pr-manager.h b/include/scsi/pr-manager.h index b2b37d63bc..5d2f13a5e4 100644 --- a/include/scsi/pr-manager.h +++ b/include/scsi/pr-manager.h @@ -2,7 +2,6 @@ #define PR_MANAGER_H =20 #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 90b38aecdd..c9e786b6ac 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 =20 +#include "qapi-types.h" #include "qemu/option.h" =20 enum { diff --git a/include/ui/console.h b/include/ui/console.h index 7506dcbe61..c303b248da 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -3,7 +3,6 @@ =20 #include "ui/qemu-pixman.h" #include "qom/object.h" -#include "qapi/qmp/qdict.h" #include "qemu/notify.h" #include "qemu/error-report.h" =20 diff --git a/migration/ram.h b/migration/ram.h index 64d81e9f1d..f3a227b4fc 100644 --- a/migration/ram.h +++ b/migration/ram.h @@ -30,6 +30,7 @@ #define QEMU_MIGRATION_RAM_H =20 #include "qemu-common.h" +#include "qapi-types.h" #include "exec/cpu-common.h" =20 extern MigrationStats ram_counters; diff --git a/net/slirp.c b/net/slirp.c index cb8ca2312f..8481c2d65f 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" =20 @@ -41,6 +42,7 @@ #include "sysemu/sysemu.h" #include "qemu/cutils.h" #include "qapi/error.h" +#include "qapi/qmp/qdict.h" =20 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 e3a14d5dda..ae6888f74a 100644 --- a/net/tap_int.h +++ b/net/tap_int.h @@ -27,6 +27,7 @@ #define NET_TAP_INT_H =20 #include "qemu-common.h" +#include "qapi-types.h" =20 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 92f957f40e..e31ac4be1f 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" =20 static QDict *qmp_dispatch_check_obj(const QObject *request, Error **errp) diff --git a/qapi/qmp-event.c b/qapi/qmp-event.c index ba3029cc89..9d7e88e84a 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" =20 static QMPEventFuncEmit qmp_emit; diff --git a/qapi/qobject-input-visitor.c b/qapi/qobject-input-visitor.c index 3e235a1eee..3566eed365 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 52634b9725..7c3b42cfe2 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/qemu-img.c b/qemu-img.c index cf8db3d7b7..fc6b4ffc00 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 =20 @@ -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 c70bde3eb1..2e5737ce9c 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 late= r. * 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 3723493be1..6ff8ef41e9 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/qobject/json-parser.c b/qobject/json-parser.c index ee0cbba6a5..b724562415 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 527b5bb571..77f796bbee 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 6824a88caa..2719df3bae 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/target/i386/cpu.c b/target/i386/cpu.c index 6627e98bdf..36c555e372 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" =20 #include "qapi-visit.h" diff --git a/target/i386/monitor.c b/target/i386/monitor.c index 75e155ffb1..75429129fd 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 212a5f0697..27201c4f91 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 3934e62ef7..7aa5af428c 100644 --- a/tests/ahci-test.c +++ b/tests/ahci-test.c @@ -31,6 +31,7 @@ #include "libqos/pci-pc.h" =20 #include "qemu-common.h" +#include "qapi/qmp/qdict.h" #include "qemu/host-utils.h" =20 #include "hw/pci/pci_ids.h" diff --git a/tests/check-qobject.c b/tests/check-qobject.c index 927966093a..af75f9c5df 100644 --- a/tests/check-qobject.c +++ b/tests/check-qobject.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" =20 #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 65456c9e37..8b5ab1fd02 100644 --- a/tests/cpu-plug-test.c +++ b/tests/cpu-plug-test.c @@ -11,6 +11,7 @@ =20 #include "qemu-common.h" #include "libqtest.h" +#include "qapi/qmp/qdict.h" =20 struct PlugTestData { char *machine; diff --git a/tests/drive_del-test.c b/tests/drive_del-test.c index c9ac997555..313030a14c 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" =20 static void drive_add(void) { diff --git a/tests/libqos/libqos.c b/tests/libqos/libqos.c index 991bc1aec2..306d4c06de 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" =20 /*** Test Setup & Teardown ***/ =20 diff --git a/tests/libqos/pci-pc.c b/tests/libqos/pci-pc.c index ded1c54c06..cd4e20e1ea 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" =20 #include "qemu-common.h" diff --git a/tests/libqtest.c b/tests/libqtest.c index cd0cc57e80..78f2226fc6 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -25,6 +25,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" =20 diff --git a/tests/libqtest.h b/tests/libqtest.h index fe7847cbd5..811169453a 100644 --- a/tests/libqtest.h +++ b/tests/libqtest.h @@ -17,8 +17,6 @@ #ifndef LIBQTEST_H #define LIBQTEST_H =20 -#include "qapi/qmp/qdict.h" - typedef struct QTestState QTestState; =20 extern QTestState *global_qtest; diff --git a/tests/migration-test.c b/tests/migration-test.c index 799e24ebc6..baafabaa5d 100644 --- a/tests/migration-test.c +++ b/tests/migration-test.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" =20 #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 8158854e17..68aca9cb38 100644 --- a/tests/numa-test.c +++ b/tests/numa-test.c @@ -11,6 +11,7 @@ =20 #include "qemu/osdep.h" #include "libqtest.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qlist.h" =20 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 71ebb5c02c..ebdf32c2e2 100644 --- a/tests/pvpanic-test.c +++ b/tests/pvpanic-test.c @@ -9,6 +9,7 @@ =20 #include "qemu/osdep.h" #include "libqtest.h" +#include "qapi/qmp/qdict.h" =20 static void test_panic(void) { diff --git a/tests/q35-test.c b/tests/q35-test.c index f98bed7a2d..187d68fb7e 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" =20 #define TSEG_SIZE_TEST_GUEST_RAM_MBYTES 128 =20 diff --git a/tests/qmp-test.c b/tests/qmp-test.c index cc9661af47..908f9b981f 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 847703cb14..9dab7ac61e 100644 --- a/tests/qom-test.c +++ b/tests/qom-test.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" =20 #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 2616d33c29..8ab43d742a 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 late= r. * See the COPYING file in the top-level directory. */ + #include "qemu/osdep.h" =20 #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-keyval.c b/tests/test-keyval.c index d0c4bf2b9d..94eb4df28d 100644 --- a/tests/test-keyval.c +++ b/tests/test-keyval.c @@ -12,6 +12,7 @@ =20 #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 2506473365..95f7839aef 100644 --- a/tests/test-netfilter.c +++ b/tests/test-netfilter.c @@ -10,6 +10,7 @@ =20 #include "qemu/osdep.h" #include "libqtest.h" +#include "qapi/qmp/qdict.h" =20 /* 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 cc1bb1afdf..b37d695c28 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" =20 diff --git a/tests/test-qga.c b/tests/test-qga.c index e67c7289eb..5c5b661f8a 100644 --- a/tests/test-qga.c +++ b/tests/test-qga.c @@ -5,6 +5,7 @@ #include =20 #include "libqtest.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qlist.h" =20 typedef struct { diff --git a/tests/test-qmp-event.c b/tests/test-qmp-event.c index e5ee69e9af..8012341343 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 20bf9a5414..2e6f7f422f 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-outpu= t-visitor.c index 7cf86707ec..09a56d2d06 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 cebeb793b0..31372777ae 100644 --- a/tests/test-replication.c +++ b/tests/test-replication.c @@ -11,6 +11,7 @@ #include "qemu/osdep.h" =20 #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 a7940a4639..e9a3cb7ac3 100644 --- a/tests/tmp105-test.c +++ b/tests/tmp105-test.c @@ -11,6 +11,7 @@ =20 #include "libqtest.h" #include "libqos/i2c.h" +#include "qapi/qmp/qdict.h" #include "hw/misc/tmp105_regs.h" =20 #define OMAP2_I2C_1_BASE 0x48070000 diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c index ec6ac9dc9e..906451daa1 100644 --- a/tests/vhost-user-test.c +++ b/tests/vhost-user-test.c @@ -12,6 +12,7 @@ =20 #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 635b942c36..0e366e302e 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 68ff954578..7190e680dc 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" =20 #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 49f4f0c221..6062d4e942 100644 --- a/tests/wdt_ib700-test.c +++ b/tests/wdt_ib700-test.c @@ -9,6 +9,7 @@ =20 #include "qemu/osdep.h" #include "libqtest.h" +#include "qapi/qmp/qdict.h" #include "qemu/timer.h" =20 static void qmp_check_no_event(void) diff --git a/util/keyval.c b/util/keyval.c index 4085282a7a..212ae90d00 100644 --- a/util/keyval.c +++ b/util/keyval.c @@ -81,6 +81,7 @@ =20 #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" --=20 2.13.6 From nobody Sun Apr 28 12:31:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 15173078683891004.1922587114093; Tue, 30 Jan 2018 02:24:28 -0800 (PST) Received: from localhost ([::1]:55125 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egT5V-0005Uv-6K for importer@patchew.org; Tue, 30 Jan 2018 05:24:25 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59445) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egT3M-00047d-JT for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1egT3H-0000Zj-EM for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58750) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1egT3H-0000Yx-6M for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:07 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5F86DC057FA1 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 0422E70902 for ; Tue, 30 Jan 2018 10:22:06 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id B9CEB1138662; Tue, 30 Jan 2018 11:22:02 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 30 Jan 2018 11:21:56 +0100 Message-Id: <20180130102202.28519-13-armbru@redhat.com> In-Reply-To: <20180130102202.28519-1-armbru@redhat.com> References: <20180130102202.28519-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 30 Jan 2018 10:22:06 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 12/18] Include qapi/qmp/qstring.h exactly where needed X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- block.c | 1 + include/qapi/qmp/qjson.h | 2 -- monitor.c | 1 + qapi/qobject-input-visitor.c | 1 + qemu-img.c | 1 + qga/main.c | 1 + qobject/qjson.c | 1 + tests/check-qjson.c | 1 + tests/libqtest.c | 1 + tests/test-qobject-input-visitor.c | 1 + tests/test-qobject-output-visitor.c | 1 + tests/test-visitor-serialization.c | 1 + ui/spice-core.c | 1 - 13 files changed, 11 insertions(+), 3 deletions(-) diff --git a/block.c b/block.c index a97f709252..71d2dfb55e 100644 --- a/block.c +++ b/block.c @@ -34,6 +34,7 @@ #include "qapi/qmp/qerror.h" #include "qapi/qmp/qbool.h" #include "qapi/qmp/qjson.h" +#include "qapi/qmp/qstring.h" #include "sysemu/block-backend.h" #include "sysemu/sysemu.h" #include "qemu/notify.h" diff --git a/include/qapi/qmp/qjson.h b/include/qapi/qmp/qjson.h index 6b38b0f074..b274ac3a86 100644 --- a/include/qapi/qmp/qjson.h +++ b/include/qapi/qmp/qjson.h @@ -14,8 +14,6 @@ #ifndef QJSON_H #define QJSON_H =20 -#include "qapi/qmp/qstring.h" - QObject *qobject_from_json(const char *string, Error **errp); QObject *qobject_from_jsonf(const char *string, ...) GCC_FMT_ATTR(1, 2); QObject *qobject_from_jsonv(const char *string, va_list *ap, Error **errp) diff --git a/monitor.c b/monitor.c index 20f7b159b3..69737f2d9a 100644 --- a/monitor.c +++ b/monitor.c @@ -55,6 +55,7 @@ #include "qapi/qmp/qerror.h" #include "qapi/qmp/qbool.h" #include "qapi/qmp/qnum.h" +#include "qapi/qmp/qstring.h" #include "qapi/qmp/qjson.h" #include "qapi/qmp/json-streamer.h" #include "qapi/qmp/json-parser.h" diff --git a/qapi/qobject-input-visitor.c b/qapi/qobject-input-visitor.c index 3566eed365..023317b05f 100644 --- a/qapi/qobject-input-visitor.c +++ b/qapi/qobject-input-visitor.c @@ -26,6 +26,7 @@ #include "qapi/qmp/qlist.h" #include "qapi/qmp/qnull.h" #include "qapi/qmp/qnum.h" +#include "qapi/qmp/qstring.h" #include "qemu/cutils.h" #include "qemu/option.h" =20 diff --git a/qemu-img.c b/qemu-img.c index fc6b4ffc00..6ead3b7c3d 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -32,6 +32,7 @@ #include "qapi/qmp/qjson.h" #include "qapi/qmp/qbool.h" #include "qapi/qmp/qdict.h" +#include "qapi/qmp/qstring.h" #include "qemu/cutils.h" #include "qemu/config-file.h" #include "qemu/option.h" diff --git a/qga/main.c b/qga/main.c index 804cc4c1a0..64e0776bf2 100644 --- a/qga/main.c +++ b/qga/main.c @@ -21,6 +21,7 @@ #include "qapi/qmp/json-streamer.h" #include "qapi/qmp/json-parser.h" #include "qapi/qmp/qjson.h" +#include "qapi/qmp/qstring.h" #include "qga/guest-agent-core.h" #include "qemu/module.h" #include "qga-qmp-commands.h" diff --git a/qobject/qjson.c b/qobject/qjson.c index 77f796bbee..e1ce75651c 100644 --- a/qobject/qjson.c +++ b/qobject/qjson.c @@ -21,6 +21,7 @@ #include "qapi/qmp/qdict.h" #include "qapi/qmp/qlist.h" #include "qapi/qmp/qnum.h" +#include "qapi/qmp/qstring.h" #include "qemu/unicode.h" =20 typedef struct JSONParsingState diff --git a/tests/check-qjson.c b/tests/check-qjson.c index 26f5d4401e..a18ea47cb7 100644 --- a/tests/check-qjson.c +++ b/tests/check-qjson.c @@ -19,6 +19,7 @@ #include "qapi/qmp/qlit.h" #include "qapi/qmp/qnull.h" #include "qapi/qmp/qnum.h" +#include "qapi/qmp/qstring.h" #include "qemu-common.h" =20 static void escaped_string(void) diff --git a/tests/libqtest.c b/tests/libqtest.c index 78f2226fc6..a193ba224c 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -28,6 +28,7 @@ #include "qapi/qmp/qdict.h" #include "qapi/qmp/qjson.h" #include "qapi/qmp/qlist.h" +#include "qapi/qmp/qstring.h" =20 #define MAX_IRQ 256 #define SOCKET_TIMEOUT 50 diff --git a/tests/test-qobject-input-visitor.c b/tests/test-qobject-input-= visitor.c index 2e6f7f422f..3900be2610 100644 --- a/tests/test-qobject-input-visitor.c +++ b/tests/test-qobject-input-visitor.c @@ -21,6 +21,7 @@ #include "qapi/qmp/qdict.h" #include "qapi/qmp/qnull.h" #include "qapi/qmp/qnum.h" +#include "qapi/qmp/qstring.h" #include "qapi/qmp/qjson.h" #include "test-qmp-introspect.h" #include "qmp-introspect.h" diff --git a/tests/test-qobject-output-visitor.c b/tests/test-qobject-outpu= t-visitor.c index 09a56d2d06..1b8a9ee372 100644 --- a/tests/test-qobject-output-visitor.c +++ b/tests/test-qobject-output-visitor.c @@ -21,6 +21,7 @@ #include "qapi/qmp/qlist.h" #include "qapi/qmp/qnull.h" #include "qapi/qmp/qnum.h" +#include "qapi/qmp/qstring.h" #include "qapi/qmp/qjson.h" =20 typedef struct TestOutputVisitorData { diff --git a/tests/test-visitor-serialization.c b/tests/test-visitor-serial= ization.c index 928a82b2e6..dd7e51d4f5 100644 --- a/tests/test-visitor-serialization.c +++ b/tests/test-visitor-serialization.c @@ -18,6 +18,7 @@ #include "test-qapi-visit.h" #include "qapi/error.h" #include "qapi/qmp/qjson.h" +#include "qapi/qmp/qstring.h" #include "qapi/qobject-input-visitor.h" #include "qapi/qobject-output-visitor.h" #include "qapi/string-input-visitor.h" diff --git a/ui/spice-core.c b/ui/spice-core.c index 7a53db070c..c4d67e678c 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -32,7 +32,6 @@ #include "qmp-commands.h" #include "qapi/error.h" #include "qapi/qmp/qbool.h" -#include "qapi/qmp/qstring.h" #include "qapi/qmp/qjson.h" #include "qemu/notify.h" #include "migration/misc.h" --=20 2.13.6 From nobody Sun Apr 28 12:31:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1517308117772912.6544146558365; Tue, 30 Jan 2018 02:28:37 -0800 (PST) Received: from localhost ([::1]:55144 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egT9Y-0000fO-Kv for importer@patchew.org; Tue, 30 Jan 2018 05:28:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59536) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egT3V-0004BY-62 for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1egT3H-0000aJ-JY for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:21 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59376) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1egT3H-0000ZE-B6 for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:07 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A394319D057 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 4619F17DD4 for ; Tue, 30 Jan 2018 10:22:06 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id BCD651138663; Tue, 30 Jan 2018 11:22:02 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 30 Jan 2018 11:21:57 +0100 Message-Id: <20180130102202.28519-14-armbru@redhat.com> In-Reply-To: <20180130102202.28519-1-armbru@redhat.com> References: <20180130102202.28519-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 30 Jan 2018 10:22:06 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 13/18] Include qapi/qmp/qbool.h exactly where needed X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- block.c | 1 - block/blkdebug.c | 1 - block/curl.c | 1 - block/qcow2.c | 1 - block/quorum.c | 1 - block/vvfat.c | 1 - hw/usb/xen-usb.c | 1 - monitor.c | 1 - qemu-img.c | 1 - qemu-io.c | 1 - target/s390x/cpu_models.c | 1 - tests/check-qlit.c | 1 - tests/device-introspect-test.c | 1 - ui/spice-core.c | 1 - 14 files changed, 14 deletions(-) diff --git a/block.c b/block.c index 71d2dfb55e..924b084436 100644 --- a/block.c +++ b/block.c @@ -32,7 +32,6 @@ #include "qemu/module.h" #include "qapi/error.h" #include "qapi/qmp/qerror.h" -#include "qapi/qmp/qbool.h" #include "qapi/qmp/qjson.h" #include "qapi/qmp/qstring.h" #include "sysemu/block-backend.h" diff --git a/block/blkdebug.c b/block/blkdebug.c index e21669979d..356538482d 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -29,7 +29,6 @@ #include "qemu/config-file.h" #include "block/block_int.h" #include "qemu/module.h" -#include "qapi/qmp/qbool.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include "sysemu/qtest.h" diff --git a/block/curl.c b/block/curl.c index e0eb8ebb78..fbd62b3864 100644 --- a/block/curl.c +++ b/block/curl.c @@ -27,7 +27,6 @@ #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" diff --git a/block/qcow2.c b/block/qcow2.c index 700c06245b..a64a572785 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -31,7 +31,6 @@ #include "qemu/error-report.h" #include "qapi/error.h" #include "qapi/qmp/qerror.h" -#include "qapi/qmp/qbool.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include "qapi-event.h" diff --git a/block/quorum.c b/block/quorum.c index ec427c39e7..980403f63e 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -17,7 +17,6 @@ #include "qemu/cutils.h" #include "block/block_int.h" #include "qapi/error.h" -#include "qapi/qmp/qbool.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qerror.h" #include "qapi/qmp/qjson.h" diff --git a/block/vvfat.c b/block/vvfat.c index 93e76580b0..5dca227311 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -30,7 +30,6 @@ #include "qemu/module.h" #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" diff --git a/hw/usb/xen-usb.c b/hw/usb/xen-usb.c index 3b678685e1..e9eb1e902f 100644 --- a/hw/usb/xen-usb.c +++ b/hw/usb/xen-usb.c @@ -29,7 +29,6 @@ #include "hw/usb.h" #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" =20 diff --git a/monitor.c b/monitor.c index 69737f2d9a..02d9dd8708 100644 --- a/monitor.c +++ b/monitor.c @@ -53,7 +53,6 @@ #include "qemu/acl.h" #include "sysemu/tpm.h" #include "qapi/qmp/qerror.h" -#include "qapi/qmp/qbool.h" #include "qapi/qmp/qnum.h" #include "qapi/qmp/qstring.h" #include "qapi/qmp/qjson.h" diff --git a/qemu-img.c b/qemu-img.c index 6ead3b7c3d..778fab9979 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -30,7 +30,6 @@ #include "qapi-visit.h" #include "qapi/qobject-output-visitor.h" #include "qapi/qmp/qjson.h" -#include "qapi/qmp/qbool.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include "qemu/cutils.h" diff --git a/qemu-io.c b/qemu-io.c index 2e5737ce9c..f554ab614b 100644 --- a/qemu-io.c +++ b/qemu-io.c @@ -21,7 +21,6 @@ #include "qemu/readline.h" #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" diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c index 27201c4f91..584c409a19 100644 --- a/target/s390x/cpu_models.c +++ b/target/s390x/cpu_models.c @@ -20,7 +20,6 @@ #include "qemu/error-report.h" #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" diff --git a/tests/check-qlit.c b/tests/check-qlit.c index b8b5016af7..f012885534 100644 --- a/tests/check-qlit.c +++ b/tests/check-qlit.c @@ -9,7 +9,6 @@ =20 #include "qemu/osdep.h" =20 -#include "qapi/qmp/qbool.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qlist.h" #include "qapi/qmp/qlit.h" diff --git a/tests/device-introspect-test.c b/tests/device-introspect-test.c index 2b3d01174d..b80058fe98 100644 --- a/tests/device-introspect-test.c +++ b/tests/device-introspect-test.c @@ -20,7 +20,6 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "qapi/qmp/qstring.h" -#include "qapi/qmp/qbool.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qlist.h" #include "libqtest.h" diff --git a/ui/spice-core.c b/ui/spice-core.c index c4d67e678c..03f9e83456 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -31,7 +31,6 @@ #include "qemu/sockets.h" #include "qmp-commands.h" #include "qapi/error.h" -#include "qapi/qmp/qbool.h" #include "qapi/qmp/qjson.h" #include "qemu/notify.h" #include "migration/misc.h" --=20 2.13.6 From nobody Sun Apr 28 12:31:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1517308342415365.5370093443146; Tue, 30 Jan 2018 02:32:22 -0800 (PST) Received: from localhost ([::1]:55293 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egTDB-0003p7-KG for importer@patchew.org; Tue, 30 Jan 2018 05:32:21 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59426) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egT3L-000477-IV for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1egT3H-0000Zz-GT for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:11 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42766) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1egT3H-0000Z7-Af for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:07 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7D7F672664 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 49D8C6A03A for ; Tue, 30 Jan 2018 10:22:06 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id BFD031138664; Tue, 30 Jan 2018 11:22:02 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 30 Jan 2018 11:21:58 +0100 Message-Id: <20180130102202.28519-15-armbru@redhat.com> In-Reply-To: <20180130102202.28519-1-armbru@redhat.com> References: <20180130102202.28519-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 30 Jan 2018 10:22:06 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 14/18] Include qapi/qmp/qnum.h exactly where needed X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/check-qlit.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/check-qlit.c b/tests/check-qlit.c index f012885534..5d0f65b9c7 100644 --- a/tests/check-qlit.c +++ b/tests/check-qlit.c @@ -12,7 +12,6 @@ #include "qapi/qmp/qdict.h" #include "qapi/qmp/qlist.h" #include "qapi/qmp/qlit.h" -#include "qapi/qmp/qnum.h" #include "qapi/qmp/qstring.h" =20 static QLitObject qlit =3D QLIT_QDICT(((QLitDictEntry[]) { --=20 2.13.6 From nobody Sun Apr 28 12:31:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1517308041983108.4147965468793; Tue, 30 Jan 2018 02:27:21 -0800 (PST) Received: from localhost ([::1]:55142 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egT8H-0007yN-Hz for importer@patchew.org; Tue, 30 Jan 2018 05:27:17 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59423) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egT3L-000472-Fr 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 1egT3J-0000at-0n for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:11 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59394) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1egT3I-0000aa-RZ for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:08 -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 2A90219D385 for ; Tue, 30 Jan 2018 10:22:08 +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 E2CDA5C266 for ; Tue, 30 Jan 2018 10:22:07 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id C2D331138666; Tue, 30 Jan 2018 11:22:02 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 30 Jan 2018 11:21:59 +0100 Message-Id: <20180130102202.28519-16-armbru@redhat.com> In-Reply-To: <20180130102202.28519-1-armbru@redhat.com> References: <20180130102202.28519-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 30 Jan 2018 10:22:08 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 15/18] Include qapi/qmp/qnull.h exactly where needed X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- target/ppc/translate.c | 1 - target/ppc/translate_init.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/target/ppc/translate.c b/target/ppc/translate.c index eeaad9e91f..4132f67bb1 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -24,7 +24,6 @@ #include "disas/disas.h" #include "exec/exec-all.h" #include "tcg-op.h" -#include "qapi/qmp/qnull.h" #include "qemu/host-utils.h" #include "exec/cpu_ldst.h" =20 diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c index 2913af912a..434c42731d 100644 --- a/target/ppc/translate_init.c +++ b/target/ppc/translate_init.c @@ -30,6 +30,7 @@ #include "mmu-hash64.h" #include "qemu/error-report.h" #include "qapi/error.h" +#include "qapi/qmp/qnull.h" #include "qapi/visitor.h" #include "hw/qdev-properties.h" #include "hw/ppc/ppc.h" --=20 2.13.6 From nobody Sun Apr 28 12:31:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1517308490744202.42389157745856; Tue, 30 Jan 2018 02:34:50 -0800 (PST) Received: from localhost ([::1]:55324 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egTFZ-0005eZ-Te for importer@patchew.org; Tue, 30 Jan 2018 05:34:49 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59522) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egT3S-0004A5-2a for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1egT3I-0000an-VL for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:18 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40026) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1egT3I-0000aY-PX for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:08 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 26D11C0467D5 for ; Tue, 30 Jan 2018 10:22:08 +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 DC6ED7C857 for ; Tue, 30 Jan 2018 10:22:07 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id C5BBE1138667; Tue, 30 Jan 2018 11:22:02 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 30 Jan 2018 11:22:00 +0100 Message-Id: <20180130102202.28519-17-armbru@redhat.com> In-Reply-To: <20180130102202.28519-1-armbru@redhat.com> References: <20180130102202.28519-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 30 Jan 2018 10:22:08 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 16/18] Drop superfluous includes of qapi/qmp/dispatch.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- monitor.c | 1 - qga/main.c | 1 - tests/test-qmp-commands.c | 1 - 3 files changed, 3 deletions(-) diff --git a/monitor.c b/monitor.c index 02d9dd8708..6f70c8db9a 100644 --- a/monitor.c +++ b/monitor.c @@ -79,7 +79,6 @@ #include "sysemu/qtest.h" #include "sysemu/cpus.h" #include "qemu/cutils.h" -#include "qapi/qmp/dispatch.h" =20 #if defined(TARGET_S390X) #include "hw/s390x/storage-keys.h" diff --git a/qga/main.c b/qga/main.c index 64e0776bf2..30aa7f92f7 100644 --- a/qga/main.c +++ b/qga/main.c @@ -27,7 +27,6 @@ #include "qga-qmp-commands.h" #include "qapi/qmp/qerror.h" #include "qapi/error.h" -#include "qapi/qmp/dispatch.h" #include "qga/channel.h" #include "qemu/bswap.h" #include "qemu/help_option.h" diff --git a/tests/test-qmp-commands.c b/tests/test-qmp-commands.c index b5a3d88775..24660d0868 100644 --- a/tests/test-qmp-commands.c +++ b/tests/test-qmp-commands.c @@ -5,7 +5,6 @@ #include "qapi/qmp/qstring.h" #include "test-qmp-commands.h" #include "qapi/error.h" -#include "qapi/qmp/dispatch.h" #include "qemu/module.h" #include "qapi/qobject-input-visitor.h" #include "tests/test-qapi-types.h" --=20 2.13.6 From nobody Sun Apr 28 12:31:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1517308045707632.9627085468134; Tue, 30 Jan 2018 02:27:25 -0800 (PST) Received: from localhost ([::1]:55143 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egT8O-00084N-TS for importer@patchew.org; Tue, 30 Jan 2018 05:27:24 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59434) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egT3M-00047K-1z for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1egT3J-0000b4-9o for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:11 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50756) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1egT3J-0000ae-1K for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:09 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5FBD35BEB6 for ; Tue, 30 Jan 2018 10:22:08 +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 E29CA60C9C for ; Tue, 30 Jan 2018 10:22:07 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id C8C281138668; Tue, 30 Jan 2018 11:22:02 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 30 Jan 2018 11:22:01 +0100 Message-Id: <20180130102202.28519-18-armbru@redhat.com> In-Reply-To: <20180130102202.28519-1-armbru@redhat.com> References: <20180130102202.28519-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 30 Jan 2018 10:22:08 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 17/18] Drop superfluous includes of qapi/qmp/qjson.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- balloon.c | 1 - block/nbd.c | 1 - block/quorum.c | 1 - blockjob.c | 1 - hw/core/qdev.c | 1 - hw/net/virtio-net.c | 1 - hw/pci/pcie_aer.c | 1 - target/s390x/kvm.c | 1 - tests/test-qobject-output-visitor.c | 1 - ui/spice-core.c | 1 - vl.c | 1 - 11 files changed, 11 deletions(-) diff --git a/balloon.c b/balloon.c index f8b5ca9870..d8dd6fe773 100644 --- a/balloon.c +++ b/balloon.c @@ -33,7 +33,6 @@ #include "qmp-commands.h" #include "qapi/error.h" #include "qapi/qmp/qerror.h" -#include "qapi/qmp/qjson.h" =20 static QEMUBalloonEvent *balloon_event_fn; static QEMUBalloonStatus *balloon_stat_fn; diff --git a/block/nbd.c b/block/nbd.c index 8b8ba56cdd..fbec4ae320 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -36,7 +36,6 @@ #include "qapi/qobject-input-visitor.h" #include "qapi/qobject-output-visitor.h" #include "qapi/qmp/qdict.h" -#include "qapi/qmp/qjson.h" #include "qapi/qmp/qstring.h" #include "qemu/cutils.h" =20 diff --git a/block/quorum.c b/block/quorum.c index 980403f63e..2dc79bf7e2 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -19,7 +19,6 @@ #include "qapi/error.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qerror.h" -#include "qapi/qmp/qjson.h" #include "qapi/qmp/qlist.h" #include "qapi/qmp/qstring.h" #include "qapi-event.h" diff --git a/blockjob.c b/blockjob.c index 081f1d2b91..3f52f29f75 100644 --- a/blockjob.c +++ b/blockjob.c @@ -31,7 +31,6 @@ #include "sysemu/block-backend.h" #include "qapi/error.h" #include "qapi/qmp/qerror.h" -#include "qapi/qmp/qjson.h" #include "qemu/coroutine.h" #include "qemu/id.h" #include "qemu/timer.h" diff --git a/hw/core/qdev.c b/hw/core/qdev.c index f93f7d9388..e1143ad542 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -31,7 +31,6 @@ #include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qapi/visitor.h" -#include "qapi/qmp/qjson.h" #include "qemu/error-report.h" #include "hw/hotplug.h" #include "hw/boards.h" diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 0dd3cb8de4..369d40b378 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -23,7 +23,6 @@ #include "net/vhost_net.h" #include "hw/virtio/virtio-bus.h" #include "qapi/error.h" -#include "qapi/qmp/qjson.h" #include "qapi-event.h" #include "hw/virtio/virtio-access.h" #include "migration/misc.h" diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c index 0b55392fe7..939da0b778 100644 --- a/hw/pci/pcie_aer.c +++ b/hw/pci/pcie_aer.c @@ -21,7 +21,6 @@ #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" #include "hw/pci/pcie.h" diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c index 8736001156..bfff1fc88a 100644 --- a/target/s390x/kvm.c +++ b/target/s390x/kvm.c @@ -37,7 +37,6 @@ #include "sysemu/hw_accel.h" #include "hw/hw.h" #include "sysemu/device_tree.h" -#include "qapi/qmp/qjson.h" #include "exec/gdbstub.h" #include "exec/address-spaces.h" #include "trace.h" diff --git a/tests/test-qobject-output-visitor.c b/tests/test-qobject-outpu= t-visitor.c index 1b8a9ee372..3cf942414c 100644 --- a/tests/test-qobject-output-visitor.c +++ b/tests/test-qobject-output-visitor.c @@ -22,7 +22,6 @@ #include "qapi/qmp/qnull.h" #include "qapi/qmp/qnum.h" #include "qapi/qmp/qstring.h" -#include "qapi/qmp/qjson.h" =20 typedef struct TestOutputVisitorData { Visitor *ov; diff --git a/ui/spice-core.c b/ui/spice-core.c index 03f9e83456..64ed759be5 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -31,7 +31,6 @@ #include "qemu/sockets.h" #include "qmp-commands.h" #include "qapi/error.h" -#include "qapi/qmp/qjson.h" #include "qemu/notify.h" #include "migration/misc.h" #include "hw/hw.h" diff --git a/vl.c b/vl.c index 717625122f..581a54c323 100644 --- a/vl.c +++ b/vl.c @@ -98,7 +98,6 @@ int main(int argc, char **argv) #include "sysemu/hax.h" #include "qapi/qobject-input-visitor.h" #include "qapi-visit.h" -#include "qapi/qmp/qjson.h" #include "qemu/option.h" #include "qemu/config-file.h" #include "qemu-options.h" --=20 2.13.6 From nobody Sun Apr 28 12:31:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1517308424476898.571919809248; Tue, 30 Jan 2018 02:33:44 -0800 (PST) Received: from localhost ([::1]:55316 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egTEV-0004oR-Cb for importer@patchew.org; Tue, 30 Jan 2018 05:33:43 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59538) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egT3V-0004Bb-MN for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1egT3J-0000bP-Qb for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:21 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50758) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1egT3J-0000aj-FK for qemu-devel@nongnu.org; Tue, 30 Jan 2018 05:22:09 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B67F65BEBA for ; Tue, 30 Jan 2018 10:22:08 +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 DCE0E60C90 for ; Tue, 30 Jan 2018 10:22:07 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id CBE141138669; Tue, 30 Jan 2018 11:22:02 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 30 Jan 2018 11:22:02 +0100 Message-Id: <20180130102202.28519-19-armbru@redhat.com> In-Reply-To: <20180130102202.28519-1-armbru@redhat.com> References: <20180130102202.28519-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 30 Jan 2018 10:22:08 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 18/18] Move include qemu/option.h from qemu-common.h to actual users X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" qemu-common.h includes qemu/option.h, but most places that include the former don't actually need the latter. Drop the include, and add it to the places that actually need it. While there, drop superfluous includes of both headers. This cleanup makes the number of objects depending on qemu/option.h drop from 4542 (out of 4739) to 284 in my "build everything" tree. Signed-off-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- accel/accel.c | 2 +- block.c | 1 + block/blkdebug.c | 1 + block/blkverify.c | 1 + block/block-backend.c | 1 + block/crypto.c | 1 + block/curl.c | 2 +- block/file-posix.c | 2 ++ block/file-win32.c | 2 ++ block/gluster.c | 2 ++ block/iscsi-opts.c | 1 + block/iscsi.c | 2 +- block/nbd.c | 1 + block/nfs.c | 2 +- block/null.c | 1 + block/parallels.c | 3 ++- block/qcow.c | 2 +- block/qed.c | 1 + block/quorum.c | 1 + block/rbd.c | 1 + block/replication.c | 2 +- block/sheepdog.c | 1 + block/snapshot.c | 1 + block/ssh.c | 1 + block/throttle.c | 1 + block/vdi.c | 1 + block/vhdx.c | 2 +- block/vmdk.c | 1 + block/vpc.c | 3 ++- block/vvfat.c | 1 + chardev/char-file.c | 3 ++- chardev/char-mux.c | 3 ++- chardev/char-parallel.c | 2 ++ chardev/char-pipe.c | 2 ++ chardev/char-ringbuf.c | 1 + chardev/char-serial.c | 2 ++ chardev/char-socket.c | 2 ++ chardev/char-stdio.c | 3 ++- chardev/char-udp.c | 2 ++ chardev/char.c | 1 + chardev/spice.c | 1 + contrib/ivshmem-server/main.c | 2 +- cpus.c | 2 +- device-hotplug.c | 1 + device_tree.c | 2 +- fsdev/qemu-fsdev-throttle.c | 1 + fsdev/qemu-fsdev.c | 2 +- fsdev/qemu-fsdev.h | 1 - hw/9pfs/9p-handle.c | 1 + hw/9pfs/9p-local.c | 1 + hw/9pfs/9p-proxy.c | 1 + hw/9pfs/xen-9p-backend.c | 1 + hw/acpi/core.c | 1 + hw/arm/boot.c | 1 + hw/core/qdev.c | 1 + hw/i386/multiboot.c | 2 +- hw/i386/pc.c | 1 + hw/i386/pc_sysfw.c | 1 + hw/nvram/fw_cfg.c | 2 ++ hw/ppc/e500.c | 2 +- hw/ppc/virtex_ml507.c | 1 + hw/s390x/s390-virtio-ccw.c | 2 +- hw/scsi/scsi-bus.c | 1 + hw/smbios/smbios.c | 1 + hw/usb/xen-usb.c | 2 +- hw/vfio/pci.c | 1 + hw/xen/xen_devconfig.c | 1 + hw/xtensa/xtfpga.c | 2 +- include/block/block.h | 1 - include/block/block_int.h | 1 - include/block/nbd.h | 2 -- include/block/snapshot.h | 2 -- include/chardev/char.h | 2 -- include/hw/acpi/acpi.h | 1 - include/hw/qdev-core.h | 1 - include/hw/smbios/smbios.h | 1 - include/net/net.h | 2 -- include/net/slirp.h | 2 -- include/qapi/opts-visitor.h | 1 - include/qemu-common.h | 2 -- include/qemu/config-file.h | 1 - include/sysemu/arch_init.h | 1 - include/sysemu/hostmem.h | 1 - include/sysemu/numa.h | 1 - include/sysemu/sysemu.h | 1 - include/ui/qemu-spice.h | 1 - monitor.c | 2 +- net/net.c | 2 +- net/vhost-user.c | 1 + qdev-monitor.c | 1 + qemu-io-cmds.c | 1 + qemu-nbd.c | 2 +- qmp.c | 1 + qom/object_interfaces.c | 1 + replay/replay.c | 2 +- tests/test-char.c | 2 +- tests/test-qemu-opts.c | 1 + tests/test-replication.c | 1 + trace/control.c | 1 + ui/console.c | 2 +- ui/spice-core.c | 2 +- ui/spice-display.c | 2 +- ui/vnc.c | 1 + 103 files changed, 98 insertions(+), 54 deletions(-) diff --git a/accel/accel.c b/accel/accel.c index 8ae40e1e13..93e2434c87 100644 --- a/accel/accel.c +++ b/accel/accel.c @@ -26,7 +26,6 @@ #include "qemu/osdep.h" #include "sysemu/accel.h" #include "hw/boards.h" -#include "qemu-common.h" #include "sysemu/arch_init.h" #include "sysemu/sysemu.h" #include "sysemu/kvm.h" @@ -34,6 +33,7 @@ #include "hw/xen/xen.h" #include "qom/object.h" #include "qemu/error-report.h" +#include "qemu/option.h" =20 static const TypeInfo accel_type =3D { .name =3D TYPE_ACCEL, diff --git a/block.c b/block.c index 924b084436..7269481050 100644 --- a/block.c +++ b/block.c @@ -37,6 +37,7 @@ #include "sysemu/block-backend.h" #include "sysemu/sysemu.h" #include "qemu/notify.h" +#include "qemu/option.h" #include "qemu/coroutine.h" #include "block/qapi.h" #include "qemu/timer.h" diff --git a/block/blkdebug.c b/block/blkdebug.c index 356538482d..d83f23febd 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -29,6 +29,7 @@ #include "qemu/config-file.h" #include "block/block_int.h" #include "qemu/module.h" +#include "qemu/option.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include "sysemu/qtest.h" diff --git a/block/blkverify.c b/block/blkverify.c index 06369f9eac..331365be33 100644 --- a/block/blkverify.c +++ b/block/blkverify.c @@ -14,6 +14,7 @@ #include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include "qemu/cutils.h" +#include "qemu/option.h" =20 typedef struct { BdrvChild *test_file; diff --git a/block/block-backend.c b/block/block-backend.c index 6a5fdb7f42..3d7d3b4229 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -20,6 +20,7 @@ #include "qapi-event.h" #include "qapi/error.h" #include "qemu/id.h" +#include "qemu/option.h" #include "trace.h" #include "migration/misc.h" =20 diff --git a/block/crypto.c b/block/crypto.c index 2626f8ae3a..70e3691cd8 100644 --- a/block/crypto.c +++ b/block/crypto.c @@ -28,6 +28,7 @@ #include "qapi/qobject-input-visitor.h" #include "qapi-visit.h" #include "qapi/error.h" +#include "qemu/option.h" #include "block/crypto.h" =20 typedef struct BlockCrypto BlockCrypto; diff --git a/block/curl.c b/block/curl.c index fbd62b3864..059edfbeff 100644 --- a/block/curl.c +++ b/block/curl.c @@ -24,8 +24,8 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "block/block_int.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" diff --git a/block/file-posix.c b/block/file-posix.c index 36ee89e940..2a94a84417 100644 --- a/block/file-posix.c +++ b/block/file-posix.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/cutils.h" #include "qemu/error-report.h" #include "block/block_int.h" #include "qemu/module.h" +#include "qemu/option.h" #include "trace.h" #include "block/thread-pool.h" #include "qemu/iov.h" diff --git a/block/file-win32.c b/block/file-win32.c index 2f1da48e71..f24c7bb92c 100644 --- a/block/file-win32.c +++ b/block/file-win32.c @@ -21,11 +21,13 @@ * 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/cutils.h" #include "block/block_int.h" #include "qemu/module.h" +#include "qemu/option.h" #include "block/raw-aio.h" #include "trace.h" #include "block/thread-pool.h" diff --git a/block/gluster.c b/block/gluster.c index 097b6930a5..d8decc41ad 100644 --- a/block/gluster.c +++ b/block/gluster.c @@ -7,6 +7,7 @@ * See the COPYING file in the top-level directory. * */ + #include "qemu/osdep.h" #include #include "block/block_int.h" @@ -15,6 +16,7 @@ #include "qapi/qmp/qerror.h" #include "qemu/uri.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "qemu/cutils.h" =20 #define GLUSTER_OPT_FILENAME "filename" diff --git a/block/iscsi-opts.c b/block/iscsi-opts.c index 5335539130..9b19bd2f52 100644 --- a/block/iscsi-opts.c +++ b/block/iscsi-opts.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/config-file.h" +#include "qemu/option.h" =20 static QemuOptsList qemu_iscsi_opts =3D { .name =3D "iscsi", diff --git a/block/iscsi.c b/block/iscsi.c index 9a1bf43cbc..b1585ca218 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -28,7 +28,6 @@ #include #include #include -#include "qemu-common.h" #include "qemu/config-file.h" #include "qemu/error-report.h" #include "qemu/bitops.h" @@ -36,6 +35,7 @@ #include "block/block_int.h" #include "scsi/constants.h" #include "qemu/iov.h" +#include "qemu/option.h" #include "qemu/uuid.h" #include "qmp-commands.h" #include "qapi/error.h" diff --git a/block/nbd.c b/block/nbd.c index fbec4ae320..ef81a9f53b 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -32,6 +32,7 @@ #include "qemu/uri.h" #include "block/block_int.h" #include "qemu/module.h" +#include "qemu/option.h" #include "qapi-visit.h" #include "qapi/qobject-input-visitor.h" #include "qapi/qobject-output-visitor.h" diff --git a/block/nfs.c b/block/nfs.c index effc8719b5..6576a73d6e 100644 --- a/block/nfs.c +++ b/block/nfs.c @@ -25,13 +25,13 @@ #include "qemu/osdep.h" =20 #include -#include "qemu-common.h" #include "qemu/config-file.h" #include "qemu/error-report.h" #include "qapi/error.h" #include "block/block_int.h" #include "trace.h" #include "qemu/iov.h" +#include "qemu/option.h" #include "qemu/uri.h" #include "qemu/cutils.h" #include "sysemu/sysemu.h" diff --git a/block/null.c b/block/null.c index 0cdabaa440..214d394fff 100644 --- a/block/null.c +++ b/block/null.c @@ -14,6 +14,7 @@ #include "qapi/error.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" +#include "qemu/option.h" #include "block/block_int.h" =20 #define NULL_OPT_LATENCY "latency-ns" diff --git a/block/parallels.c b/block/parallels.c index d3802085e3..e1e3d80c88 100644 --- a/block/parallels.c +++ b/block/parallels.c @@ -27,12 +27,13 @@ * 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 "block/block_int.h" #include "sysemu/block-backend.h" #include "qemu/module.h" +#include "qemu/option.h" #include "qemu/bswap.h" #include "qemu/bitmap.h" #include "migration/blocker.h" diff --git a/block/qcow.c b/block/qcow.c index 0b32c04cd0..8631155ac8 100644 --- a/block/qcow.c +++ b/block/qcow.c @@ -24,11 +24,11 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "qemu/error-report.h" #include "block/block_int.h" #include "sysemu/block-backend.h" #include "qemu/module.h" +#include "qemu/option.h" #include "qemu/bswap.h" #include #include "qapi/qmp/qdict.h" diff --git a/block/qed.c b/block/qed.c index 7e2b34c3a7..205dbf16e3 100644 --- a/block/qed.c +++ b/block/qed.c @@ -16,6 +16,7 @@ #include "qapi/error.h" #include "qemu/timer.h" #include "qemu/bswap.h" +#include "qemu/option.h" #include "trace.h" #include "qed.h" #include "sysemu/block-backend.h" diff --git a/block/quorum.c b/block/quorum.c index 2dc79bf7e2..19f1c34425 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -15,6 +15,7 @@ =20 #include "qemu/osdep.h" #include "qemu/cutils.h" +#include "qemu/option.h" #include "block/block_int.h" #include "qapi/error.h" #include "qapi/qmp/qdict.h" diff --git a/block/rbd.c b/block/rbd.c index 42be5ed49d..8474b0ba11 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -16,6 +16,7 @@ #include #include "qapi/error.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "block/block_int.h" #include "crypto/secret.h" #include "qemu/cutils.h" diff --git a/block/replication.c b/block/replication.c index b1ea3caa4b..f98ef094b9 100644 --- a/block/replication.c +++ b/block/replication.c @@ -13,7 +13,7 @@ */ =20 #include "qemu/osdep.h" -#include "qemu-common.h" +#include "qemu/option.h" #include "block/nbd.h" #include "block/blockjob.h" #include "block/block_int.h" diff --git a/block/sheepdog.c b/block/sheepdog.c index f684477328..af125a2c8d 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -19,6 +19,7 @@ #include "qapi/qobject-input-visitor.h" #include "qemu/uri.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "qemu/sockets.h" #include "block/block_int.h" #include "sysemu/block-backend.h" diff --git a/block/snapshot.c b/block/snapshot.c index 9294a9fcc4..eacc1f19a2 100644 --- a/block/snapshot.c +++ b/block/snapshot.c @@ -29,6 +29,7 @@ #include "qapi/qmp/qdict.h" #include "qapi/qmp/qerror.h" #include "qapi/qmp/qstring.h" +#include "qemu/option.h" =20 QemuOptsList internal_snapshot_opts =3D { .name =3D "snapshot", diff --git a/block/ssh.c b/block/ssh.c index c693a4a4c7..521f49ce08 100644 --- a/block/ssh.c +++ b/block/ssh.c @@ -30,6 +30,7 @@ #include "block/block_int.h" #include "qapi/error.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "qemu/cutils.h" #include "qemu/sockets.h" #include "qemu/uri.h" diff --git a/block/throttle.c b/block/throttle.c index 833175ac77..495f88c752 100644 --- a/block/throttle.c +++ b/block/throttle.c @@ -19,6 +19,7 @@ =20 #include "qemu/osdep.h" #include "block/throttle-groups.h" +#include "qemu/option.h" #include "qemu/throttle-options.h" #include "qapi/error.h" =20 diff --git a/block/vdi.c b/block/vdi.c index 8da5dfc897..fc1c614cb1 100644 --- a/block/vdi.c +++ b/block/vdi.c @@ -54,6 +54,7 @@ #include "block/block_int.h" #include "sysemu/block-backend.h" #include "qemu/module.h" +#include "qemu/option.h" #include "qemu/bswap.h" #include "migration/blocker.h" #include "qemu/coroutine.h" diff --git a/block/vhdx.c b/block/vhdx.c index 9956933da6..c449c5dcfd 100644 --- a/block/vhdx.c +++ b/block/vhdx.c @@ -17,10 +17,10 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "block/block_int.h" #include "sysemu/block-backend.h" #include "qemu/module.h" +#include "qemu/option.h" #include "qemu/crc32c.h" #include "qemu/bswap.h" #include "block/vhdx.h" diff --git a/block/vmdk.c b/block/vmdk.c index d71cec4f31..ef15ddbfd3 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -30,6 +30,7 @@ #include "qapi/qmp/qerror.h" #include "qemu/error-report.h" #include "qemu/module.h" +#include "qemu/option.h" #include "qemu/bswap.h" #include "migration/blocker.h" #include "qemu/cutils.h" diff --git a/block/vpc.c b/block/vpc.c index 1576d7b595..cfa5144e86 100644 --- a/block/vpc.c +++ b/block/vpc.c @@ -22,12 +22,13 @@ * 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 "block/block_int.h" #include "sysemu/block-backend.h" #include "qemu/module.h" +#include "qemu/option.h" #include "migration/blocker.h" #include "qemu/bswap.h" #include "qemu/uuid.h" diff --git a/block/vvfat.c b/block/vvfat.c index 5dca227311..7e06ebacf6 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -28,6 +28,7 @@ #include "qapi/error.h" #include "block/block_int.h" #include "qemu/module.h" +#include "qemu/option.h" #include "qemu/bswap.h" #include "migration/blocker.h" #include "qapi/qmp/qdict.h" diff --git a/chardev/char-file.c b/chardev/char-file.c index a57b88aaf2..87fb61088c 100644 --- a/chardev/char-file.c +++ b/chardev/char-file.c @@ -21,9 +21,10 @@ * 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/option.h" #include "chardev/char.h" =20 #ifdef _WIN32 diff --git a/chardev/char-mux.c b/chardev/char-mux.c index 567bf965cd..d48e78103a 100644 --- a/chardev/char-mux.c +++ b/chardev/char-mux.c @@ -21,9 +21,10 @@ * 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/option.h" #include "chardev/char.h" #include "sysemu/block-backend.h" #include "chardev/char-mux.h" diff --git a/chardev/char-parallel.c b/chardev/char-parallel.c index bce89f8c36..ab82c72ac7 100644 --- a/chardev/char-parallel.c +++ b/chardev/char-parallel.c @@ -21,9 +21,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "chardev/char.h" #include "qapi/error.h" +#include "qemu/option.h" #include =20 #ifdef CONFIG_BSD diff --git a/chardev/char-pipe.c b/chardev/char-pipe.c index 3a95e4c1b2..8a51872e5e 100644 --- a/chardev/char-pipe.c +++ b/chardev/char-pipe.c @@ -21,8 +21,10 @@ * 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/option.h" #include "chardev/char.h" =20 #ifdef _WIN32 diff --git a/chardev/char-ringbuf.c b/chardev/char-ringbuf.c index c1fa4c3f87..679afaa4fd 100644 --- a/chardev/char-ringbuf.c +++ b/chardev/char-ringbuf.c @@ -27,6 +27,7 @@ #include "qmp-commands.h" #include "qapi/error.h" #include "qemu/base64.h" +#include "qemu/option.h" =20 /* Ring buffer chardev */ =20 diff --git a/chardev/char-serial.c b/chardev/char-serial.c index 93392c528c..feb52e559d 100644 --- a/chardev/char-serial.c +++ b/chardev/char-serial.c @@ -21,7 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN * THE SOFTWARE. */ + #include "qemu/osdep.h" +#include "qemu/option.h" #include "qemu/sockets.h" #include "io/channel-file.h" #include "qapi/error.h" diff --git a/chardev/char-socket.c b/chardev/char-socket.c index 77cdf487eb..3c6727dda8 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.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 "chardev/char.h" #include "io/channel-socket.h" #include "io/channel-tls.h" #include "io/net-listener.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "qapi/error.h" #include "qapi/clone-visitor.h" =20 diff --git a/chardev/char-stdio.c b/chardev/char-stdio.c index 6f5d798d7b..96375f2ab8 100644 --- a/chardev/char-stdio.c +++ b/chardev/char-stdio.c @@ -21,10 +21,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN * THE SOFTWARE. */ + #include "qemu/osdep.h" +#include "qemu/option.h" #include "qemu/sockets.h" #include "qapi/error.h" -#include "qemu-common.h" #include "chardev/char.h" =20 #ifdef _WIN32 diff --git a/chardev/char-udp.c b/chardev/char-udp.c index d46ff7ab53..097a2f0f42 100644 --- a/chardev/char-udp.c +++ b/chardev/char-udp.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 "chardev/char.h" #include "io/channel-socket.h" #include "qapi/error.h" +#include "qemu/option.h" =20 #include "chardev/char-io.h" =20 diff --git a/chardev/char.c b/chardev/char.c index 51f269796a..01d979a1da 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -34,6 +34,7 @@ #include "qapi/error.h" #include "sysemu/replay.h" #include "qemu/help_option.h" +#include "qemu/option.h" =20 #include "chardev/char-mux.h" =20 diff --git a/chardev/spice.c b/chardev/spice.c index bbdf649904..e66e3ad568 100644 --- a/chardev/spice.c +++ b/chardev/spice.c @@ -4,6 +4,7 @@ #include "chardev/char.h" #include "qapi/error.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include #include =20 diff --git a/contrib/ivshmem-server/main.c b/contrib/ivshmem-server/main.c index 45776d8af4..197c79c57e 100644 --- a/contrib/ivshmem-server/main.c +++ b/contrib/ivshmem-server/main.c @@ -9,7 +9,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/cutils.h" - +#include "qemu/option.h" #include "ivshmem-server.h" =20 #define IVSHMEM_SERVER_DEFAULT_VERBOSE 0 diff --git a/cpus.c b/cpus.c index e3b2da1572..d1a3724dee 100644 --- a/cpus.c +++ b/cpus.c @@ -25,7 +25,6 @@ /* Needed early for CONFIG_BSD etc. */ =20 #include "qemu/osdep.h" -#include "qemu-common.h" #include "qemu/config-file.h" #include "cpu.h" #include "monitor/monitor.h" @@ -47,6 +46,7 @@ #include "sysemu/cpus.h" #include "sysemu/qtest.h" #include "qemu/main-loop.h" +#include "qemu/option.h" #include "qemu/bitmap.h" #include "qemu/seqlock.h" #include "tcg.h" diff --git a/device-hotplug.c b/device-hotplug.c index b10e8cc6d4..23fd6656f1 100644 --- a/device-hotplug.c +++ b/device-hotplug.c @@ -29,6 +29,7 @@ #include "sysemu/blockdev.h" #include "qapi/qmp/qdict.h" #include "qemu/config-file.h" +#include "qemu/option.h" #include "sysemu/sysemu.h" #include "monitor/monitor.h" #include "block/block_int.h" diff --git a/device_tree.c b/device_tree.c index a24ddff02b..19458b32bf 100644 --- a/device_tree.c +++ b/device_tree.c @@ -18,8 +18,8 @@ #endif =20 #include "qapi/error.h" -#include "qemu-common.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "qemu/bswap.h" #include "sysemu/device_tree.h" #include "sysemu/sysemu.h" diff --git a/fsdev/qemu-fsdev-throttle.c b/fsdev/qemu-fsdev-throttle.c index 49eebb5412..ea9508da0a 100644 --- a/fsdev/qemu-fsdev-throttle.c +++ b/fsdev/qemu-fsdev-throttle.c @@ -16,6 +16,7 @@ #include "qemu/error-report.h" #include "qemu-fsdev-throttle.h" #include "qemu/iov.h" +#include "qemu/option.h" =20 static void fsdev_throttle_read_timer_cb(void *opaque) { diff --git a/fsdev/qemu-fsdev.c b/fsdev/qemu-fsdev.c index 96e8683a09..1b721a9ee4 100644 --- a/fsdev/qemu-fsdev.c +++ b/fsdev/qemu-fsdev.c @@ -15,9 +15,9 @@ #include "qapi/error.h" #include "qemu-fsdev.h" #include "qemu/queue.h" -#include "qemu-common.h" #include "qemu/config-file.h" #include "qemu/error-report.h" +#include "qemu/option.h" =20 static QTAILQ_HEAD(FsDriverEntry_head, FsDriverListEntry) fsdriver_entries= =3D QTAILQ_HEAD_INITIALIZER(fsdriver_entries); diff --git a/fsdev/qemu-fsdev.h b/fsdev/qemu-fsdev.h index 29c962296d..65e4b1cfab 100644 --- a/fsdev/qemu-fsdev.h +++ b/fsdev/qemu-fsdev.h @@ -12,7 +12,6 @@ */ #ifndef QEMU_FSDEV_H #define QEMU_FSDEV_H -#include "qemu/option.h" #include "file-op-9p.h" =20 =20 diff --git a/hw/9pfs/9p-handle.c b/hw/9pfs/9p-handle.c index c1681d3c8a..4dc0d2bed1 100644 --- a/hw/9pfs/9p-handle.c +++ b/hw/9pfs/9p-handle.c @@ -22,6 +22,7 @@ #include "qemu/xattr.h" #include "qemu/cutils.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include #ifdef CONFIG_LINUX_MAGIC_H #include diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c index c6d8af4fb8..d85494bd31 100644 --- a/hw/9pfs/9p-local.c +++ b/hw/9pfs/9p-local.c @@ -26,6 +26,7 @@ #include "qapi/error.h" #include "qemu/cutils.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include #include #ifdef CONFIG_LINUX_MAGIC_H diff --git a/hw/9pfs/9p-proxy.c b/hw/9pfs/9p-proxy.c index 0f288b1300..e2e03292de 100644 --- a/hw/9pfs/9p-proxy.c +++ b/hw/9pfs/9p-proxy.c @@ -17,6 +17,7 @@ #include "qapi/error.h" #include "qemu/cutils.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "fsdev/qemu-fsdev.h" #include "9p-proxy.h" =20 diff --git a/hw/9pfs/xen-9p-backend.c b/hw/9pfs/xen-9p-backend.c index df2a4100bf..d0542bfc30 100644 --- a/hw/9pfs/xen-9p-backend.c +++ b/hw/9pfs/xen-9p-backend.c @@ -15,6 +15,7 @@ #include "hw/xen/xen_backend.h" #include "hw/9pfs/xen-9pfs.h" #include "qemu/config-file.h" +#include "qemu/option.h" #include "fsdev/qemu-fsdev.h" =20 #define VERSIONS "1" diff --git a/hw/acpi/core.c b/hw/acpi/core.c index 5ee55414c1..b50b3ca772 100644 --- a/hw/acpi/core.c +++ b/hw/acpi/core.c @@ -30,6 +30,7 @@ #include "qapi-visit.h" #include "qapi-event.h" #include "qemu/error-report.h" +#include "qemu/option.h" =20 struct acpi_table_header { uint16_t _length; /* our length, not actual part of the hdr */ diff --git a/hw/arm/boot.c b/hw/arm/boot.c index c2720c8046..32628202c5 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -21,6 +21,7 @@ #include "elf.h" #include "sysemu/device_tree.h" #include "qemu/config-file.h" +#include "qemu/option.h" #include "exec/address-spaces.h" =20 /* Kernel boot protocol is specified in the kernel docs diff --git a/hw/core/qdev.c b/hw/core/qdev.c index e1143ad542..e2eea34f79 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -32,6 +32,7 @@ #include "qapi/qmp/qerror.h" #include "qapi/visitor.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "hw/hotplug.h" #include "hw/boards.h" #include "hw/sysbus.h" diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c index c7b70c91d5..46d9c68bf5 100644 --- a/hw/i386/multiboot.c +++ b/hw/i386/multiboot.c @@ -23,7 +23,7 @@ */ =20 #include "qemu/osdep.h" -#include "qemu-common.h" +#include "qemu/option.h" #include "cpu.h" #include "hw/hw.h" #include "hw/nvram/fw_cfg.h" diff --git a/hw/i386/pc.c b/hw/i386/pc.c index f610253953..55e69d66fe 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -59,6 +59,7 @@ #include "qemu/bitmap.h" #include "qemu/config-file.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "hw/acpi/acpi.h" #include "hw/acpi/cpu_hotplug.h" #include "hw/boards.h" diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c index 6b183747fc..4325575e7d 100644 --- a/hw/i386/pc_sysfw.c +++ b/hw/i386/pc_sysfw.c @@ -27,6 +27,7 @@ #include "qapi/error.h" #include "sysemu/block-backend.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "hw/sysbus.h" #include "hw/hw.h" #include "hw/i386/pc.h" diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 4313484b21..2a0739d0e9 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.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 "hw/hw.h" #include "sysemu/sysemu.h" @@ -31,6 +32,7 @@ #include "hw/sysbus.h" #include "trace.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "qemu/config-file.h" #include "qemu/cutils.h" #include "qapi/error.h" diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index c4fe06ea2a..937bc9e4eb 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -16,7 +16,6 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "e500.h" #include "e500-ccsr.h" #include "net/net.h" @@ -36,6 +35,7 @@ #include "hw/sysbus.h" #include "exec/address-spaces.h" #include "qemu/host-utils.h" +#include "qemu/option.h" #include "hw/pci-host/ppce500.h" #include "qemu/error-report.h" #include "hw/platform-bus.h" diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c index 5ac4f76613..ca9e8bf05c 100644 --- a/hw/ppc/virtex_ml507.c +++ b/hw/ppc/virtex_ml507.c @@ -36,6 +36,7 @@ #include "elf.h" #include "qemu/error-report.h" #include "qemu/log.h" +#include "qemu/option.h" #include "exec/address-spaces.h" =20 #include "hw/ppc/ppc.h" diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 7d922ad732..f2db448233 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -12,7 +12,6 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "hw/boards.h" #include "exec/address-spaces.h" @@ -24,6 +23,7 @@ #include "virtio-ccw.h" #include "qemu/config-file.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "s390-pci-bus.h" #include "hw/s390x/storage-keys.h" #include "hw/s390x/storage-attributes.h" diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index 05e501efd3..b7bafbed6e 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -2,6 +2,7 @@ #include "hw/hw.h" #include "qapi/error.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "hw/scsi/scsi.h" #include "scsi/constants.h" #include "hw/qdev.h" diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c index 5d11f01874..27a07e96f4 100644 --- a/hw/smbios/smbios.c +++ b/hw/smbios/smbios.c @@ -19,6 +19,7 @@ #include "qapi/error.h" #include "qemu/config-file.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "sysemu/sysemu.h" #include "qemu/uuid.h" #include "sysemu/cpus.h" diff --git a/hw/usb/xen-usb.c b/hw/usb/xen-usb.c index e9eb1e902f..3beeb0d170 100644 --- a/hw/usb/xen-usb.c +++ b/hw/usb/xen-usb.c @@ -23,8 +23,8 @@ #include #include =20 -#include "qemu-common.h" #include "qemu/config-file.h" +#include "qemu/option.h" #include "hw/sysbus.h" #include "hw/usb.h" #include "hw/xen/xen_backend.h" diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 2c71295125..d6b386b1b9 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -26,6 +26,7 @@ #include "hw/pci/msix.h" #include "hw/pci/pci_bridge.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "qemu/range.h" #include "sysemu/kvm.h" #include "sysemu/sysemu.h" diff --git a/hw/xen/xen_devconfig.c b/hw/xen/xen_devconfig.c index a80e78c0dc..fac9d3fcdc 100644 --- a/hw/xen/xen_devconfig.c +++ b/hw/xen/xen_devconfig.c @@ -1,5 +1,6 @@ #include "qemu/osdep.h" #include "hw/xen/xen_backend.h" +#include "qemu/option.h" #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" =20 diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c index 76ea970215..70686a2eb1 100644 --- a/hw/xtensa/xtfpga.c +++ b/hw/xtensa/xtfpga.c @@ -27,7 +27,6 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "sysemu/sysemu.h" #include "hw/boards.h" @@ -43,6 +42,7 @@ #include "chardev/char.h" #include "sysemu/device_tree.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "bootparam.h" #include "xtensa_memory.h" =20 diff --git a/include/block/block.h b/include/block/block.h index d2fc44dd30..ae1517f32d 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -4,7 +4,6 @@ #include "block/aio.h" #include "qapi-types.h" #include "qemu/iov.h" -#include "qemu/option.h" #include "qemu/coroutine.h" #include "block/accounting.h" #include "block/dirty-bitmap.h" diff --git a/include/block/block_int.h b/include/block/block_int.h index 6499f7c16a..5a54c4d0de 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -26,7 +26,6 @@ =20 #include "block/accounting.h" #include "block/block.h" -#include "qemu/option.h" #include "qemu/queue.h" #include "qemu/coroutine.h" #include "qemu/stats64.h" diff --git a/include/block/nbd.h b/include/block/nbd.h index 978e443366..18648e215e 100644 --- a/include/block/nbd.h +++ b/include/block/nbd.h @@ -21,8 +21,6 @@ #define NBD_H =20 =20 -#include "qemu-common.h" -#include "qemu/option.h" #include "io/channel-socket.h" #include "crypto/tlscreds.h" =20 diff --git a/include/block/snapshot.h b/include/block/snapshot.h index 9407799941..f73d1094af 100644 --- a/include/block/snapshot.h +++ b/include/block/snapshot.h @@ -25,8 +25,6 @@ #ifndef SNAPSHOT_H #define SNAPSHOT_H =20 -#include "qemu-common.h" -#include "qemu/option.h" =20 =20 #define SNAPSHOT_OPT_BASE "snapshot." diff --git a/include/chardev/char.h b/include/chardev/char.h index d8941fcbb1..a381dc3df8 100644 --- a/include/chardev/char.h +++ b/include/chardev/char.h @@ -1,8 +1,6 @@ #ifndef QEMU_CHAR_H #define QEMU_CHAR_H =20 -#include "qemu-common.h" -#include "qemu/option.h" #include "qemu/main-loop.h" #include "qemu/bitmap.h" #include "qom/object.h" diff --git a/include/hw/acpi/acpi.h b/include/hw/acpi/acpi.h index 39ff512129..c20ace0d0b 100644 --- a/include/hw/acpi/acpi.h +++ b/include/hw/acpi/acpi.h @@ -21,7 +21,6 @@ */ =20 #include "qemu/notify.h" -#include "qemu/option.h" #include "exec/memory.h" #include "hw/irq.h" #include "hw/acpi/acpi_dev_interface.h" diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 51473eee7b..bf022dc75b 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -2,7 +2,6 @@ #define QDEV_CORE_H =20 #include "qemu/queue.h" -#include "qemu/option.h" #include "qemu/bitmap.h" #include "qom/object.h" #include "hw/irq.h" diff --git a/include/hw/smbios/smbios.h b/include/hw/smbios/smbios.h index a83adb93d7..eeb5a4d7b6 100644 --- a/include/hw/smbios/smbios.h +++ b/include/hw/smbios/smbios.h @@ -14,7 +14,6 @@ * */ =20 -#include "qemu/option.h" =20 #define SMBIOS_MAX_TYPE 127 =20 diff --git a/include/net/net.h b/include/net/net.h index 71f1119bc9..3fc48e4f51 100644 --- a/include/net/net.h +++ b/include/net/net.h @@ -2,9 +2,7 @@ #define QEMU_NET_H =20 #include "qemu/queue.h" -#include "qemu-common.h" #include "qapi-types.h" -#include "qemu/option.h" #include "net/queue.h" #include "migration/vmstate.h" =20 diff --git a/include/net/slirp.h b/include/net/slirp.h index 9a492b84a4..4d63d74da4 100644 --- a/include/net/slirp.h +++ b/include/net/slirp.h @@ -24,8 +24,6 @@ #ifndef QEMU_NET_SLIRP_H #define QEMU_NET_SLIRP_H =20 -#include "qemu-common.h" -#include "qemu/option.h" =20 #ifdef CONFIG_SLIRP =20 diff --git a/include/qapi/opts-visitor.h b/include/qapi/opts-visitor.h index 6462c96c29..9b989e7e08 100644 --- a/include/qapi/opts-visitor.h +++ b/include/qapi/opts-visitor.h @@ -14,7 +14,6 @@ #define OPTS_VISITOR_H =20 #include "qapi/visitor.h" -#include "qemu/option.h" =20 /* Inclusive upper bound on the size of any flattened range. This is a saf= ety * (=3D anti-annoyance) measure; wrong ranges should not cause long startup diff --git a/include/qemu-common.h b/include/qemu-common.h index 05319b9ddc..8a4f63c9de 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -16,8 +16,6 @@ =20 #define TFR(expr) do { if ((expr) !=3D -1) break; } while (errno =3D=3D EI= NTR) =20 -#include "qemu/option.h" - /* Copyright string for -version arguments, About dialogs, etc */ #define QEMU_COPYRIGHT "Copyright (c) 2003-2017 " \ "Fabrice Bellard and the QEMU Project developers" diff --git a/include/qemu/config-file.h b/include/qemu/config-file.h index 449e631c86..d74f920152 100644 --- a/include/qemu/config-file.h +++ b/include/qemu/config-file.h @@ -1,7 +1,6 @@ #ifndef QEMU_CONFIG_FILE_H #define QEMU_CONFIG_FILE_H =20 -#include "qemu/option.h" =20 QemuOptsList *qemu_find_opts(const char *group); QemuOptsList *qemu_find_opts_err(const char *group, Error **errp); diff --git a/include/sysemu/arch_init.h b/include/sysemu/arch_init.h index c9e786b6ac..ced67c7842 100644 --- a/include/sysemu/arch_init.h +++ b/include/sysemu/arch_init.h @@ -2,7 +2,6 @@ #define QEMU_ARCH_INIT_H =20 #include "qapi-types.h" -#include "qemu/option.h" =20 enum { QEMU_ARCH_ALL =3D -1, diff --git a/include/sysemu/hostmem.h b/include/sysemu/hostmem.h index ed6a437f4d..621a3f9d42 100644 --- a/include/sysemu/hostmem.h +++ b/include/sysemu/hostmem.h @@ -16,7 +16,6 @@ #include "sysemu/sysemu.h" /* for MAX_NODES */ #include "qom/object.h" #include "exec/memory.h" -#include "qemu/option.h" #include "qemu/bitmap.h" =20 #define TYPE_MEMORY_BACKEND "memory-backend" diff --git a/include/sysemu/numa.h b/include/sysemu/numa.h index b3545215f6..d99e5474b4 100644 --- a/include/sysemu/numa.h +++ b/include/sysemu/numa.h @@ -2,7 +2,6 @@ #define SYSEMU_NUMA_H =20 #include "qemu/bitmap.h" -#include "qemu/option.h" #include "sysemu/sysemu.h" #include "sysemu/hostmem.h" #include "hw/boards.h" diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 36fd371c93..77bb3da582 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -2,7 +2,6 @@ #define SYSEMU_H /* Misc. things related to the system emulator. */ =20 -#include "qemu/option.h" #include "qemu/queue.h" #include "qemu/timer.h" #include "qemu/notify.h" diff --git a/include/ui/qemu-spice.h b/include/ui/qemu-spice.h index 52a9f8808b..c6d50eb87a 100644 --- a/include/ui/qemu-spice.h +++ b/include/ui/qemu-spice.h @@ -23,7 +23,6 @@ #ifdef CONFIG_SPICE =20 #include -#include "qemu/option.h" #include "qemu/config-file.h" =20 extern int using_spice; diff --git a/monitor.c b/monitor.c index 6f70c8db9a..31f7aa2488 100644 --- a/monitor.c +++ b/monitor.c @@ -24,7 +24,6 @@ =20 #include "qemu/osdep.h" #include -#include "qemu-common.h" #include "cpu.h" #include "hw/hw.h" #include "monitor/qdev.h" @@ -68,6 +67,7 @@ #include "exec/memory.h" #include "exec/exec-all.h" #include "qemu/log.h" +#include "qemu/option.h" #include "qmp-commands.h" #include "hmp.h" #include "qemu/thread.h" diff --git a/net/net.c b/net/net.c index 63068ce8e2..e25a18dc8e 100644 --- a/net/net.c +++ b/net/net.c @@ -32,7 +32,6 @@ #include "util.h" =20 #include "monitor/monitor.h" -#include "qemu-common.h" #include "qemu/help_option.h" #include "qapi/qmp/qerror.h" #include "qemu/error-report.h" @@ -43,6 +42,7 @@ #include "hw/qdev.h" #include "qemu/iov.h" #include "qemu/main-loop.h" +#include "qemu/option.h" #include "qapi-visit.h" #include "qapi/error.h" #include "qapi/opts-visitor.h" diff --git a/net/vhost-user.c b/net/vhost-user.c index fd766504ab..cb45512506 100644 --- a/net/vhost-user.c +++ b/net/vhost-user.c @@ -16,6 +16,7 @@ #include "qapi/error.h" #include "qemu/config-file.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "qmp-commands.h" #include "trace.h" =20 diff --git a/qdev-monitor.c b/qdev-monitor.c index 0aa8a6c60b..77bb1993ed 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -29,6 +29,7 @@ #include "qemu/config-file.h" #include "qemu/error-report.h" #include "qemu/help_option.h" +#include "qemu/option.h" #include "sysemu/block-backend.h" #include "migration/misc.h" =20 diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c index a6a70fc3dc..9b3cd00af6 100644 --- a/qemu-io-cmds.c +++ b/qemu-io-cmds.c @@ -17,6 +17,7 @@ #include "block/qapi.h" #include "qemu/error-report.h" #include "qemu/main-loop.h" +#include "qemu/option.h" #include "qemu/timer.h" #include "qemu/cutils.h" =20 diff --git a/qemu-nbd.c b/qemu-nbd.c index 6ff8ef41e9..ed5d9b5062 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -22,12 +22,12 @@ #include =20 #include "qapi/error.h" -#include "qemu-common.h" #include "qemu/cutils.h" #include "sysemu/block-backend.h" #include "block/block_int.h" #include "block/nbd.h" #include "qemu/main-loop.h" +#include "qemu/option.h" #include "qemu/error-report.h" #include "qemu/config-file.h" #include "qemu/bswap.h" diff --git a/qmp.c b/qmp.c index f87de2bc26..d53021f7d4 100644 --- a/qmp.c +++ b/qmp.c @@ -16,6 +16,7 @@ #include "qemu/osdep.h" #include "qemu-version.h" #include "qemu/cutils.h" +#include "qemu/option.h" #include "monitor/monitor.h" #include "sysemu/sysemu.h" #include "qemu/config-file.h" diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c index 2719df3bae..80d09139be 100644 --- a/qom/object_interfaces.c +++ b/qom/object_interfaces.c @@ -3,6 +3,7 @@ #include "qapi/qmp/qdict.h" #include "qom/object_interfaces.h" #include "qemu/module.h" +#include "qemu/option.h" #include "qapi-visit.h" #include "qapi/opts-visitor.h" #include "qemu/config-file.h" diff --git a/replay/replay.c b/replay/replay.c index ff58a5adf9..7a23c62d61 100644 --- a/replay/replay.c +++ b/replay/replay.c @@ -11,11 +11,11 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "sysemu/replay.h" #include "replay-internal.h" #include "qemu/timer.h" #include "qemu/main-loop.h" +#include "qemu/option.h" #include "sysemu/cpus.h" #include "sysemu/sysemu.h" #include "qemu/error-report.h" diff --git a/tests/test-char.c b/tests/test-char.c index 911e3f6e8d..b17d094b85 100644 --- a/tests/test-char.c +++ b/tests/test-char.c @@ -1,8 +1,8 @@ #include "qemu/osdep.h" #include =20 -#include "qemu-common.h" #include "qemu/config-file.h" +#include "qemu/option.h" #include "qemu/sockets.h" #include "chardev/char-fe.h" #include "chardev/char-mux.h" diff --git a/tests/test-qemu-opts.c b/tests/test-qemu-opts.c index b37d695c28..5d5a3daa7b 100644 --- a/tests/test-qemu-opts.c +++ b/tests/test-qemu-opts.c @@ -9,6 +9,7 @@ =20 #include "qemu/osdep.h" #include "qemu/cutils.h" +#include "qemu/option.h" #include "qapi/error.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" diff --git a/tests/test-replication.c b/tests/test-replication.c index 31372777ae..68c0d04f2a 100644 --- a/tests/test-replication.c +++ b/tests/test-replication.c @@ -12,6 +12,7 @@ =20 #include "qapi/error.h" #include "qapi/qmp/qdict.h" +#include "qemu/option.h" #include "replication.h" #include "block/block_int.h" #include "sysemu/block-backend.h" diff --git a/trace/control.c b/trace/control.c index 2769934bec..1f70841db5 100644 --- a/trace/control.c +++ b/trace/control.c @@ -18,6 +18,7 @@ #endif #ifdef CONFIG_TRACE_LOG #include "qemu/log.h" +#include "qemu/option.h" #endif #ifdef CONFIG_TRACE_SYSLOG #include diff --git a/ui/console.c b/ui/console.c index f678979f86..36584d039e 100644 --- a/ui/console.c +++ b/ui/console.c @@ -23,10 +23,10 @@ */ =20 #include "qemu/osdep.h" -#include "qemu-common.h" #include "ui/console.h" #include "hw/qdev-core.h" #include "qapi/error.h" +#include "qemu/option.h" #include "qemu/timer.h" #include "qmp-commands.h" #include "chardev/char-fe.h" diff --git a/ui/spice-core.c b/ui/spice-core.c index 64ed759be5..e449172fe9 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -21,7 +21,6 @@ #include #include "sysemu/sysemu.h" =20 -#include "qemu-common.h" #include "ui/qemu-spice.h" #include "qemu/error-report.h" #include "qemu/thread.h" @@ -32,6 +31,7 @@ #include "qmp-commands.h" #include "qapi/error.h" #include "qemu/notify.h" +#include "qemu/option.h" #include "migration/misc.h" #include "hw/hw.h" #include "ui/spice-display.h" diff --git a/ui/spice-display.c b/ui/spice-display.c index efe9c57eb5..98ccdfb687 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -16,9 +16,9 @@ */ =20 #include "qemu/osdep.h" -#include "qemu-common.h" #include "ui/qemu-spice.h" #include "qemu/timer.h" +#include "qemu/option.h" #include "qemu/queue.h" #include "ui/console.h" #include "sysemu/sysemu.h" diff --git a/ui/vnc.c b/ui/vnc.c index 8458e6d9fe..76b2885c26 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -30,6 +30,7 @@ #include "trace.h" #include "sysemu/sysemu.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "qemu/sockets.h" #include "qemu/timer.h" #include "qemu/acl.h" --=20 2.13.6