From patchwork Fri Jul 26 12:05:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 11060903 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9D41913A0 for ; Fri, 26 Jul 2019 12:08:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 864E328812 for ; Fri, 26 Jul 2019 12:08:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 79BB928AA8; Fri, 26 Jul 2019 12:08:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DB96428812 for ; Fri, 26 Jul 2019 12:08:48 +0000 (UTC) Received: from localhost ([::1]:39300 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqz1j-0000UV-TN for patchwork-qemu-devel@patchwork.kernel.org; Fri, 26 Jul 2019 08:08:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58892) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqyz1-0005ga-BL for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:06:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqyyq-0007vM-Bc for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59134) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqyyp-0007oe-PI for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:48 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 937343086211 for ; Fri, 26 Jul 2019 12:05:44 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D9AF31001B02 for ; Fri, 26 Jul 2019 12:05:43 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 40C5711386A6; Fri, 26 Jul 2019 14:05:42 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 26 Jul 2019 14:05:15 +0200 Message-Id: <20190726120542.9894-2-armbru@redhat.com> In-Reply-To: <20190726120542.9894-1-armbru@redhat.com> References: <20190726120542.9894-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Fri, 26 Jul 2019 12:05:44 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 01/28] include: Make headers more self-contained X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Back in 2016, we discussed[1] rules for headers, and these were generally liked: 1. Have a carefully curated header that's included everywhere first. We got that already thanks to Peter: osdep.h. 2. Headers should normally include everything they need beyond osdep.h. If exceptions are needed for some reason, they must be documented in the header. If all that's needed from a header is typedefs, put those into qemu/typedefs.h instead of including the header. 3. Cyclic inclusion is forbidden. This patch gets include/ closer to obeying 2. It's actually extracted from my "[RFC] Baby steps towards saner headers" series[2], which demonstrates a possible path towards checking 2 automatically. It passes the RFC test there. [1] Message-ID: <87h9g8j57d.fsf@blackfin.pond.sub.org> https://lists.nongnu.org/archive/html/qemu-devel/2016-03/msg03345.html [2] Message-Id: <20190711122827.18970-1-armbru@redhat.com> https://lists.nongnu.org/archive/html/qemu-devel/2019-07/msg02715.html Signed-off-by: Markus Armbruster Reviewed-by: Alistair Francis --- include/block/raw-aio.h | 1 + include/block/write-threshold.h | 1 + include/disas/disas.h | 1 + include/exec/cputlb.h | 2 ++ include/exec/exec-all.h | 1 + include/exec/ioport.h | 2 ++ include/exec/memory-internal.h | 2 ++ include/exec/ram_addr.h | 1 + include/exec/softmmu-semi.h | 2 ++ include/exec/tb-hash.h | 2 ++ include/exec/user/thunk.h | 1 + include/fpu/softfloat-macros.h | 2 ++ include/hw/acpi/pci.h | 2 ++ include/hw/acpi/tco.h | 2 ++ include/hw/adc/stm32f2xx_adc.h | 2 ++ include/hw/arm/allwinner-a10.h | 1 + include/hw/arm/aspeed_soc.h | 1 + include/hw/arm/bcm2836.h | 1 + include/hw/arm/exynos4210.h | 2 +- include/hw/arm/fsl-imx25.h | 1 + include/hw/arm/fsl-imx31.h | 1 + include/hw/arm/sharpsl.h | 2 ++ include/hw/arm/xlnx-zynqmp.h | 1 + include/hw/block/fdc.h | 2 ++ include/hw/block/flash.h | 1 + include/hw/char/escc.h | 1 + include/hw/char/xilinx_uartlite.h | 2 ++ include/hw/core/generic-loader.h | 1 + include/hw/cris/etraxfs.h | 1 + include/hw/cris/etraxfs_dma.h | 3 +++ include/hw/display/i2c-ddc.h | 1 + include/hw/empty_slot.h | 2 ++ include/hw/gpio/bcm2835_gpio.h | 1 + include/hw/i2c/aspeed_i2c.h | 1 + include/hw/i386/apic_internal.h | 1 + include/hw/i386/ioapic_internal.h | 1 + include/hw/intc/allwinner-a10-pic.h | 2 ++ include/hw/intc/heathrow_pic.h | 2 ++ include/hw/intc/mips_gic.h | 1 + include/hw/isa/vt82c686.h | 2 ++ include/hw/mips/cps.h | 1 + include/hw/misc/macio/cuda.h | 2 ++ include/hw/misc/macio/gpio.h | 3 +++ include/hw/misc/macio/macio.h | 2 ++ include/hw/misc/macio/pmu.h | 3 +++ include/hw/misc/mips_cmgcr.h | 2 ++ include/hw/misc/mips_cpc.h | 2 ++ include/hw/misc/pvpanic.h | 2 ++ include/hw/net/allwinner_emac.h | 1 + include/hw/net/lance.h | 1 + include/hw/nvram/chrp_nvram.h | 2 ++ include/hw/pci-host/sabre.h | 2 ++ include/hw/pci-host/uninorth.h | 2 +- include/hw/pci/pcie_aer.h | 1 + include/hw/ppc/pnv_core.h | 1 + include/hw/ppc/ppc4xx.h | 4 ++++ include/hw/ppc/spapr_irq.h | 3 +++ include/hw/ppc/spapr_vio.h | 1 + include/hw/ppc/spapr_xive.h | 2 ++ include/hw/ppc/xive_regs.h | 3 +++ include/hw/riscv/boot.h | 2 ++ include/hw/riscv/riscv_hart.h | 3 +++ include/hw/riscv/sifive_clint.h | 2 ++ include/hw/riscv/sifive_e.h | 1 + include/hw/riscv/sifive_plic.h | 2 +- include/hw/riscv/sifive_prci.h | 2 ++ include/hw/riscv/sifive_test.h | 2 ++ include/hw/riscv/sifive_u.h | 1 + include/hw/riscv/sifive_uart.h | 3 +++ include/hw/riscv/spike.h | 3 +++ include/hw/riscv/virt.h | 3 +++ include/hw/s390x/ap-device.h | 2 ++ include/hw/s390x/css-bridge.h | 3 ++- include/hw/s390x/css.h | 1 + include/hw/s390x/tod.h | 2 +- include/hw/semihosting/console.h | 2 ++ include/hw/sh4/sh_intc.h | 1 + include/hw/sparc/sparc64.h | 2 ++ include/hw/ssi/aspeed_smc.h | 1 + include/hw/ssi/xilinx_spips.h | 1 + include/hw/timer/allwinner-a10-pit.h | 1 + include/hw/timer/i8254_internal.h | 1 + include/hw/timer/m48t59.h | 2 ++ include/hw/timer/mc146818rtc_regs.h | 2 ++ include/hw/timer/xlnx-zynqmp-rtc.h | 1 + include/hw/virtio/virtio-access.h | 1 + include/hw/virtio/virtio-gpu-bswap.h | 1 + include/hw/virtio/virtio-rng.h | 1 + include/hw/watchdog/wdt_aspeed.h | 1 + include/libdecnumber/decNumberLocal.h | 1 + include/migration/cpu.h | 2 ++ include/monitor/hmp-target.h | 2 ++ include/qemu/atomic128.h | 2 ++ include/qemu/ratelimit.h | 2 ++ include/qemu/thread-win32.h | 2 +- include/sysemu/balloon.h | 1 + include/sysemu/cryptodev-vhost-user.h | 2 ++ include/sysemu/hvf.h | 1 + include/sysemu/iothread.h | 1 + include/sysemu/kvm_int.h | 2 ++ include/sysemu/memory_mapping.h | 2 ++ include/sysemu/xen-mapcache.h | 2 ++ include/ui/egl-helpers.h | 3 +++ include/ui/input.h | 1 + include/ui/spice-display.h | 1 + target/hppa/cpu.h | 2 +- 106 files changed, 171 insertions(+), 7 deletions(-) diff --git a/include/block/raw-aio.h b/include/block/raw-aio.h index 0cb7cc74a2..264e3eb10e 100644 --- a/include/block/raw-aio.h +++ b/include/block/raw-aio.h @@ -15,6 +15,7 @@ #ifndef QEMU_RAW_AIO_H #define QEMU_RAW_AIO_H +#include "block/aio.h" #include "qemu/coroutine.h" #include "qemu/iov.h" diff --git a/include/block/write-threshold.h b/include/block/write-threshold.h index 80d8aab5d0..25c71b7374 100644 --- a/include/block/write-threshold.h +++ b/include/block/write-threshold.h @@ -12,6 +12,7 @@ #ifndef BLOCK_WRITE_THRESHOLD_H #define BLOCK_WRITE_THRESHOLD_H +#include "block/block_int.h" /* * bdrv_write_threshold_set: diff --git a/include/disas/disas.h b/include/disas/disas.h index 15da511f49..ba47e9197c 100644 --- a/include/disas/disas.h +++ b/include/disas/disas.h @@ -1,6 +1,7 @@ #ifndef QEMU_DISAS_H #define QEMU_DISAS_H +#include "exec/hwaddr.h" #ifdef NEED_CPU_H #include "cpu.h" diff --git a/include/exec/cputlb.h b/include/exec/cputlb.h index 5373188be3..23abd71579 100644 --- a/include/exec/cputlb.h +++ b/include/exec/cputlb.h @@ -19,6 +19,8 @@ #ifndef CPUTLB_H #define CPUTLB_H +#include "exec/cpu-common.h" + #if !defined(CONFIG_USER_ONLY) /* cputlb.c */ void tlb_protect_code(ram_addr_t ram_addr); diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 16034ee651..135aeaab0d 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -20,6 +20,7 @@ #ifndef EXEC_ALL_H #define EXEC_ALL_H +#include "cpu.h" #include "exec/tb-context.h" #include "sysemu/cpus.h" diff --git a/include/exec/ioport.h b/include/exec/ioport.h index a298b89ce1..97feb296d2 100644 --- a/include/exec/ioport.h +++ b/include/exec/ioport.h @@ -24,6 +24,8 @@ #ifndef IOPORT_H #define IOPORT_H +#include "exec/memory.h" + #define MAX_IOPORTS (64 * 1024) #define IOPORTS_MASK (MAX_IOPORTS - 1) diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h index d1a9dd1ec8..ef4fb92371 100644 --- a/include/exec/memory-internal.h +++ b/include/exec/memory-internal.h @@ -20,6 +20,8 @@ #ifndef MEMORY_INTERNAL_H #define MEMORY_INTERNAL_H +#include "cpu.h" + #ifndef CONFIG_USER_ONLY static inline AddressSpaceDispatch *flatview_to_dispatch(FlatView *fv) { diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h index b7b2e60ff6..a327a80cfe 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -20,6 +20,7 @@ #define RAM_ADDR_H #ifndef CONFIG_USER_ONLY +#include "cpu.h" #include "hw/xen/xen.h" #include "sysemu/tcg.h" #include "exec/ramlist.h" diff --git a/include/exec/softmmu-semi.h b/include/exec/softmmu-semi.h index 970837992e..fbcae88f4b 100644 --- a/include/exec/softmmu-semi.h +++ b/include/exec/softmmu-semi.h @@ -10,6 +10,8 @@ #ifndef SOFTMMU_SEMI_H #define SOFTMMU_SEMI_H +#include "cpu.h" + static inline uint64_t softmmu_tget64(CPUArchState *env, target_ulong addr) { uint64_t val; diff --git a/include/exec/tb-hash.h b/include/exec/tb-hash.h index 4f3a37d927..805235d321 100644 --- a/include/exec/tb-hash.h +++ b/include/exec/tb-hash.h @@ -20,6 +20,8 @@ #ifndef EXEC_TB_HASH_H #define EXEC_TB_HASH_H +#include "exec/cpu-defs.h" +#include "exec/exec-all.h" #include "qemu/xxhash.h" #ifdef CONFIG_SOFTMMU diff --git a/include/exec/user/thunk.h b/include/exec/user/thunk.h index 8d3af5a3be..d05a8a4dab 100644 --- a/include/exec/user/thunk.h +++ b/include/exec/user/thunk.h @@ -20,6 +20,7 @@ #define THUNK_H #include "cpu.h" +#include "exec/user/abitypes.h" /* types enums definitions */ diff --git a/include/fpu/softfloat-macros.h b/include/fpu/softfloat-macros.h index c55aa6d174..be83a833ec 100644 --- a/include/fpu/softfloat-macros.h +++ b/include/fpu/softfloat-macros.h @@ -82,6 +82,8 @@ this code that are retained. #ifndef FPU_SOFTFLOAT_MACROS_H #define FPU_SOFTFLOAT_MACROS_H +#include "fpu/softfloat.h" + /*---------------------------------------------------------------------------- | Shifts `a' right by the number of bits given in `count'. If any nonzero | bits are shifted off, they are ``jammed'' into the least significant bit of diff --git a/include/hw/acpi/pci.h b/include/hw/acpi/pci.h index 8bbd32cf45..4594d7dc62 100644 --- a/include/hw/acpi/pci.h +++ b/include/hw/acpi/pci.h @@ -25,6 +25,8 @@ #ifndef HW_ACPI_PCI_H #define HW_ACPI_PCI_H +#include "hw/acpi/bios-linker-loader.h" + typedef struct AcpiMcfgInfo { uint64_t base; uint32_t size; diff --git a/include/hw/acpi/tco.h b/include/hw/acpi/tco.h index d19dd59353..8adb7a0d20 100644 --- a/include/hw/acpi/tco.h +++ b/include/hw/acpi/tco.h @@ -9,6 +9,8 @@ #ifndef HW_ACPI_TCO_H #define HW_ACPI_TCO_H +#include "exec/memory.h" +#include "migration/vmstate.h" /* As per ICH9 spec, the internal timer has an error of ~0.6s on every tick */ #define TCO_TICK_NSEC 600000000LL diff --git a/include/hw/adc/stm32f2xx_adc.h b/include/hw/adc/stm32f2xx_adc.h index a72f734eb1..663b79f4f3 100644 --- a/include/hw/adc/stm32f2xx_adc.h +++ b/include/hw/adc/stm32f2xx_adc.h @@ -25,6 +25,8 @@ #ifndef HW_STM32F2XX_ADC_H #define HW_STM32F2XX_ADC_H +#include "hw/sysbus.h" + #define ADC_SR 0x00 #define ADC_CR1 0x04 #define ADC_CR2 0x08 diff --git a/include/hw/arm/allwinner-a10.h b/include/hw/arm/allwinner-a10.h index e99fe2ea2e..7182ce5c4b 100644 --- a/include/hw/arm/allwinner-a10.h +++ b/include/hw/arm/allwinner-a10.h @@ -11,6 +11,7 @@ #include "hw/ide/ahci.h" #include "sysemu/sysemu.h" +#include "target/arm/cpu.h" #define AW_A10_PIC_REG_BASE 0x01c20400 diff --git a/include/hw/arm/aspeed_soc.h b/include/hw/arm/aspeed_soc.h index cef605ad6b..976fd6be93 100644 --- a/include/hw/arm/aspeed_soc.h +++ b/include/hw/arm/aspeed_soc.h @@ -22,6 +22,7 @@ #include "hw/ssi/aspeed_smc.h" #include "hw/watchdog/wdt_aspeed.h" #include "hw/net/ftgmac100.h" +#include "target/arm/cpu.h" #define ASPEED_SPIS_NUM 2 #define ASPEED_WDTS_NUM 3 diff --git a/include/hw/arm/bcm2836.h b/include/hw/arm/bcm2836.h index a2cb8454de..97187f72be 100644 --- a/include/hw/arm/bcm2836.h +++ b/include/hw/arm/bcm2836.h @@ -13,6 +13,7 @@ #include "hw/arm/bcm2835_peripherals.h" #include "hw/intc/bcm2836_control.h" +#include "target/arm/cpu.h" #define TYPE_BCM283X "bcm283x" #define BCM283X(obj) OBJECT_CHECK(BCM283XState, (obj), TYPE_BCM283X) diff --git a/include/hw/arm/exynos4210.h b/include/hw/arm/exynos4210.h index aa137271c0..358f4619de 100644 --- a/include/hw/arm/exynos4210.h +++ b/include/hw/arm/exynos4210.h @@ -25,7 +25,7 @@ #ifndef EXYNOS4210_H #define EXYNOS4210_H -#include "exec/memory.h" +#include "hw/sysbus.h" #include "target/arm/cpu-qom.h" #define EXYNOS4210_NCPUS 2 diff --git a/include/hw/arm/fsl-imx25.h b/include/hw/arm/fsl-imx25.h index 3280ab1fb0..241efb52ae 100644 --- a/include/hw/arm/fsl-imx25.h +++ b/include/hw/arm/fsl-imx25.h @@ -27,6 +27,7 @@ #include "hw/i2c/imx_i2c.h" #include "hw/gpio/imx_gpio.h" #include "exec/memory.h" +#include "target/arm/cpu.h" #define TYPE_FSL_IMX25 "fsl,imx25" #define FSL_IMX25(obj) OBJECT_CHECK(FslIMX25State, (obj), TYPE_FSL_IMX25) diff --git a/include/hw/arm/fsl-imx31.h b/include/hw/arm/fsl-imx31.h index e68a81efd7..ac5ca9826a 100644 --- a/include/hw/arm/fsl-imx31.h +++ b/include/hw/arm/fsl-imx31.h @@ -26,6 +26,7 @@ #include "hw/i2c/imx_i2c.h" #include "hw/gpio/imx_gpio.h" #include "exec/memory.h" +#include "target/arm/cpu.h" #define TYPE_FSL_IMX31 "fsl,imx31" #define FSL_IMX31(obj) OBJECT_CHECK(FslIMX31State, (obj), TYPE_FSL_IMX31) diff --git a/include/hw/arm/sharpsl.h b/include/hw/arm/sharpsl.h index 5bf6db1fa2..a5ef797a67 100644 --- a/include/hw/arm/sharpsl.h +++ b/include/hw/arm/sharpsl.h @@ -6,6 +6,8 @@ #ifndef QEMU_SHARPSL_H #define QEMU_SHARPSL_H +#include "exec/hwaddr.h" + #define zaurus_printf(format, ...) \ fprintf(stderr, "%s: " format, __func__, ##__VA_ARGS__) diff --git a/include/hw/arm/xlnx-zynqmp.h b/include/hw/arm/xlnx-zynqmp.h index 35804ea80a..6cb65e7537 100644 --- a/include/hw/arm/xlnx-zynqmp.h +++ b/include/hw/arm/xlnx-zynqmp.h @@ -32,6 +32,7 @@ #include "hw/intc/xlnx-zynqmp-ipi.h" #include "hw/timer/xlnx-zynqmp-rtc.h" #include "hw/cpu/cluster.h" +#include "target/arm/cpu.h" #define TYPE_XLNX_ZYNQMP "xlnx,zynqmp" #define XLNX_ZYNQMP(obj) OBJECT_CHECK(XlnxZynqMPState, (obj), \ diff --git a/include/hw/block/fdc.h b/include/hw/block/fdc.h index 8cece84326..f4fe2f471b 100644 --- a/include/hw/block/fdc.h +++ b/include/hw/block/fdc.h @@ -1,6 +1,8 @@ #ifndef HW_FDC_H #define HW_FDC_H +#include "exec/hwaddr.h" +#include "hw/irq.h" #include "qapi/qapi-types-block.h" /* fdc.c */ diff --git a/include/hw/block/flash.h b/include/hw/block/flash.h index 1acaf7de80..83a75f3170 100644 --- a/include/hw/block/flash.h +++ b/include/hw/block/flash.h @@ -4,6 +4,7 @@ /* NOR flash devices */ #include "exec/memory.h" +#include "migration/vmstate.h" /* pflash_cfi01.c */ diff --git a/include/hw/char/escc.h b/include/hw/char/escc.h index 42aca83611..d5196c53e6 100644 --- a/include/hw/char/escc.h +++ b/include/hw/char/escc.h @@ -3,6 +3,7 @@ #include "chardev/char-fe.h" #include "chardev/char-serial.h" +#include "hw/sysbus.h" #include "ui/input.h" /* escc.c */ diff --git a/include/hw/char/xilinx_uartlite.h b/include/hw/char/xilinx_uartlite.h index 634086b657..99d8bbf405 100644 --- a/include/hw/char/xilinx_uartlite.h +++ b/include/hw/char/xilinx_uartlite.h @@ -15,6 +15,8 @@ #ifndef XILINX_UARTLITE_H #define XILINX_UARTLITE_H +#include "hw/sysbus.h" + static inline DeviceState *xilinx_uartlite_create(hwaddr addr, qemu_irq irq, Chardev *chr) diff --git a/include/hw/core/generic-loader.h b/include/hw/core/generic-loader.h index dd27c42ab0..9ffce1c5a3 100644 --- a/include/hw/core/generic-loader.h +++ b/include/hw/core/generic-loader.h @@ -19,6 +19,7 @@ #define GENERIC_LOADER_H #include "elf.h" +#include "hw/qdev-core.h" typedef struct GenericLoaderState { /* */ diff --git a/include/hw/cris/etraxfs.h b/include/hw/cris/etraxfs.h index 8da965addb..494222d315 100644 --- a/include/hw/cris/etraxfs.h +++ b/include/hw/cris/etraxfs.h @@ -27,6 +27,7 @@ #include "net/net.h" #include "hw/cris/etraxfs_dma.h" +#include "hw/sysbus.h" /* Instantiate an ETRAXFS Ethernet MAC. */ static inline DeviceState * diff --git a/include/hw/cris/etraxfs_dma.h b/include/hw/cris/etraxfs_dma.h index f6f33e0980..31ae360611 100644 --- a/include/hw/cris/etraxfs_dma.h +++ b/include/hw/cris/etraxfs_dma.h @@ -1,6 +1,9 @@ #ifndef HW_ETRAXFS_DMA_H #define HW_ETRAXFS_DMA_H +#include "exec/hwaddr.h" +#include "hw/irq.h" + struct dma_context_metadata { /* data descriptor md */ uint16_t metadata; diff --git a/include/hw/display/i2c-ddc.h b/include/hw/display/i2c-ddc.h index c29443c5af..1cf53a0c8d 100644 --- a/include/hw/display/i2c-ddc.h +++ b/include/hw/display/i2c-ddc.h @@ -20,6 +20,7 @@ #define I2C_DDC_H #include "hw/display/edid.h" +#include "hw/i2c/i2c.h" /* A simple I2C slave which just returns the contents of its EDID blob. */ struct I2CDDCState { diff --git a/include/hw/empty_slot.h b/include/hw/empty_slot.h index 123a9f8989..cb9a221aa6 100644 --- a/include/hw/empty_slot.h +++ b/include/hw/empty_slot.h @@ -1,6 +1,8 @@ #ifndef HW_EMPTY_SLOT_H #define HW_EMPTY_SLOT_H +#include "exec/hwaddr.h" + /* empty_slot.c */ void empty_slot_init(hwaddr addr, uint64_t slot_size); diff --git a/include/hw/gpio/bcm2835_gpio.h b/include/hw/gpio/bcm2835_gpio.h index 9f8e0c720c..b0de0a3c74 100644 --- a/include/hw/gpio/bcm2835_gpio.h +++ b/include/hw/gpio/bcm2835_gpio.h @@ -15,6 +15,7 @@ #define BCM2835_GPIO_H #include "hw/sd/sd.h" +#include "hw/sysbus.h" typedef struct BCM2835GpioState { SysBusDevice parent_obj; diff --git a/include/hw/i2c/aspeed_i2c.h b/include/hw/i2c/aspeed_i2c.h index f9020acdef..f742936175 100644 --- a/include/hw/i2c/aspeed_i2c.h +++ b/include/hw/i2c/aspeed_i2c.h @@ -21,6 +21,7 @@ #define ASPEED_I2C_H #include "hw/i2c/i2c.h" +#include "hw/sysbus.h" #define TYPE_ASPEED_I2C "aspeed.i2c" #define ASPEED_I2C(obj) \ diff --git a/include/hw/i386/apic_internal.h b/include/hw/i386/apic_internal.h index 1209eb483a..b04bdd947f 100644 --- a/include/hw/i386/apic_internal.h +++ b/include/hw/i386/apic_internal.h @@ -24,6 +24,7 @@ #include "cpu.h" #include "exec/memory.h" #include "qemu/timer.h" +#include "target/i386/cpu-qom.h" /* APIC Local Vector Table */ #define APIC_LVT_TIMER 0 diff --git a/include/hw/i386/ioapic_internal.h b/include/hw/i386/ioapic_internal.h index 07002f9662..3d2eec2aa7 100644 --- a/include/hw/i386/ioapic_internal.h +++ b/include/hw/i386/ioapic_internal.h @@ -24,6 +24,7 @@ #include "hw/hw.h" #include "exec/memory.h" +#include "hw/i386/ioapic.h" #include "hw/sysbus.h" #include "qemu/notify.h" diff --git a/include/hw/intc/allwinner-a10-pic.h b/include/hw/intc/allwinner-a10-pic.h index 1d314a70d9..a5895401d1 100644 --- a/include/hw/intc/allwinner-a10-pic.h +++ b/include/hw/intc/allwinner-a10-pic.h @@ -1,6 +1,8 @@ #ifndef ALLWINNER_A10_PIC_H #define ALLWINNER_A10_PIC_H +#include "hw/sysbus.h" + #define TYPE_AW_A10_PIC "allwinner-a10-pic" #define AW_A10_PIC(obj) OBJECT_CHECK(AwA10PICState, (obj), TYPE_AW_A10_PIC) diff --git a/include/hw/intc/heathrow_pic.h b/include/hw/intc/heathrow_pic.h index 6c91ec91bb..b163e27ab9 100644 --- a/include/hw/intc/heathrow_pic.h +++ b/include/hw/intc/heathrow_pic.h @@ -26,6 +26,8 @@ #ifndef HW_INTC_HEATHROW_PIC_H #define HW_INTC_HEATHROW_PIC_H +#include "hw/sysbus.h" + #define TYPE_HEATHROW "heathrow" #define HEATHROW(obj) OBJECT_CHECK(HeathrowState, (obj), TYPE_HEATHROW) diff --git a/include/hw/intc/mips_gic.h b/include/hw/intc/mips_gic.h index 902a12b178..8428287bf9 100644 --- a/include/hw/intc/mips_gic.h +++ b/include/hw/intc/mips_gic.h @@ -13,6 +13,7 @@ #include "qemu/units.h" #include "hw/timer/mips_gictimer.h" +#include "hw/sysbus.h" #include "cpu.h" /* * GIC Specific definitions diff --git a/include/hw/isa/vt82c686.h b/include/hw/isa/vt82c686.h index c3c2b6e786..a54c3fe60a 100644 --- a/include/hw/isa/vt82c686.h +++ b/include/hw/isa/vt82c686.h @@ -1,6 +1,8 @@ #ifndef HW_VT82C686_H #define HW_VT82C686_H +#include "hw/irq.h" + #define TYPE_VT82C686B_SUPERIO "vt82c686b-superio" /* vt82c686.c */ diff --git a/include/hw/mips/cps.h b/include/hw/mips/cps.h index aab1af926d..a941c55f27 100644 --- a/include/hw/mips/cps.h +++ b/include/hw/mips/cps.h @@ -25,6 +25,7 @@ #include "hw/intc/mips_gic.h" #include "hw/misc/mips_cpc.h" #include "hw/misc/mips_itu.h" +#include "target/mips/cpu.h" #define TYPE_MIPS_CPS "mips-cps" #define MIPS_CPS(obj) OBJECT_CHECK(MIPSCPSState, (obj), TYPE_MIPS_CPS) diff --git a/include/hw/misc/macio/cuda.h b/include/hw/misc/macio/cuda.h index 7dad469142..5768075ac5 100644 --- a/include/hw/misc/macio/cuda.h +++ b/include/hw/misc/macio/cuda.h @@ -26,6 +26,8 @@ #ifndef CUDA_H #define CUDA_H +#include "hw/misc/mos6522.h" + /* CUDA commands (2nd byte) */ #define CUDA_WARM_START 0x0 #define CUDA_AUTOPOLL 0x1 diff --git a/include/hw/misc/macio/gpio.h b/include/hw/misc/macio/gpio.h index 2838ae5fde..24a4364b39 100644 --- a/include/hw/misc/macio/gpio.h +++ b/include/hw/misc/macio/gpio.h @@ -26,6 +26,9 @@ #ifndef MACIO_GPIO_H #define MACIO_GPIO_H +#include "hw/ppc/openpic.h" +#include "hw/sysbus.h" + #define TYPE_MACIO_GPIO "macio-gpio" #define MACIO_GPIO(obj) OBJECT_CHECK(MacIOGPIOState, (obj), TYPE_MACIO_GPIO) diff --git a/include/hw/misc/macio/macio.h b/include/hw/misc/macio/macio.h index 970058b6ed..070a694eb5 100644 --- a/include/hw/misc/macio/macio.h +++ b/include/hw/misc/macio/macio.h @@ -27,10 +27,12 @@ #define MACIO_H #include "hw/char/escc.h" +#include "hw/ide/internal.h" #include "hw/intc/heathrow_pic.h" #include "hw/misc/macio/cuda.h" #include "hw/misc/macio/gpio.h" #include "hw/misc/macio/pmu.h" +#include "hw/ppc/mac.h" #include "hw/ppc/mac_dbdma.h" #include "hw/ppc/openpic.h" diff --git a/include/hw/misc/macio/pmu.h b/include/hw/misc/macio/pmu.h index d10895ba5f..7ef83dee4c 100644 --- a/include/hw/misc/macio/pmu.h +++ b/include/hw/misc/macio/pmu.h @@ -10,6 +10,9 @@ #ifndef PMU_H #define PMU_H +#include "hw/misc/mos6522.h" +#include "hw/misc/macio/gpio.h" + /* * PMU commands */ diff --git a/include/hw/misc/mips_cmgcr.h b/include/hw/misc/mips_cmgcr.h index c9dfcb4b84..3e6e223273 100644 --- a/include/hw/misc/mips_cmgcr.h +++ b/include/hw/misc/mips_cmgcr.h @@ -10,6 +10,8 @@ #ifndef MIPS_CMGCR_H #define MIPS_CMGCR_H +#include "hw/sysbus.h" + #define TYPE_MIPS_GCR "mips-gcr" #define MIPS_GCR(obj) OBJECT_CHECK(MIPSGCRState, (obj), TYPE_MIPS_GCR) diff --git a/include/hw/misc/mips_cpc.h b/include/hw/misc/mips_cpc.h index 72c834e039..3f670578b0 100644 --- a/include/hw/misc/mips_cpc.h +++ b/include/hw/misc/mips_cpc.h @@ -20,6 +20,8 @@ #ifndef MIPS_CPC_H #define MIPS_CPC_H +#include "hw/sysbus.h" + #define CPC_ADDRSPACE_SZ 0x6000 /* CPC blocks offsets relative to base address */ diff --git a/include/hw/misc/pvpanic.h b/include/hw/misc/pvpanic.h index 1ee071a703..840bf4ec09 100644 --- a/include/hw/misc/pvpanic.h +++ b/include/hw/misc/pvpanic.h @@ -14,6 +14,8 @@ #ifndef HW_MISC_PVPANIC_H #define HW_MISC_PVPANIC_H +#include "qom/object.h" + #define TYPE_PVPANIC "pvpanic" #define PVPANIC_IOPORT_PROP "ioport" diff --git a/include/hw/net/allwinner_emac.h b/include/hw/net/allwinner_emac.h index 905a43deb4..5013207d15 100644 --- a/include/hw/net/allwinner_emac.h +++ b/include/hw/net/allwinner_emac.h @@ -27,6 +27,7 @@ #include "net/net.h" #include "qemu/fifo8.h" #include "hw/net/mii.h" +#include "hw/sysbus.h" #define TYPE_AW_EMAC "allwinner-emac" #define AW_EMAC(obj) OBJECT_CHECK(AwEmacState, (obj), TYPE_AW_EMAC) diff --git a/include/hw/net/lance.h b/include/hw/net/lance.h index ffdd35c4d7..0357f5f65c 100644 --- a/include/hw/net/lance.h +++ b/include/hw/net/lance.h @@ -31,6 +31,7 @@ #include "net/net.h" #include "hw/net/pcnet.h" +#include "hw/sysbus.h" #define TYPE_LANCE "lance" #define SYSBUS_PCNET(obj) \ diff --git a/include/hw/nvram/chrp_nvram.h b/include/hw/nvram/chrp_nvram.h index b4f5b2b104..09941a9be4 100644 --- a/include/hw/nvram/chrp_nvram.h +++ b/include/hw/nvram/chrp_nvram.h @@ -18,6 +18,8 @@ #ifndef CHRP_NVRAM_H #define CHRP_NVRAM_H +#include "qemu/bswap.h" + /* OpenBIOS NVRAM partition */ typedef struct { uint8_t signature; diff --git a/include/hw/pci-host/sabre.h b/include/hw/pci-host/sabre.h index 9afa4938fd..99b5aefbec 100644 --- a/include/hw/pci-host/sabre.h +++ b/include/hw/pci-host/sabre.h @@ -1,6 +1,8 @@ #ifndef HW_PCI_HOST_SABRE_H #define HW_PCI_HOST_SABRE_H +#include "hw/pci/pci.h" +#include "hw/pci/pci_host.h" #include "hw/sparc/sun4u_iommu.h" #define MAX_IVEC 0x40 diff --git a/include/hw/pci-host/uninorth.h b/include/hw/pci-host/uninorth.h index 060324536a..9a5cabd4c5 100644 --- a/include/hw/pci-host/uninorth.h +++ b/include/hw/pci-host/uninorth.h @@ -26,7 +26,7 @@ #define UNINORTH_H #include "hw/hw.h" - +#include "hw/pci/pci_host.h" #include "hw/ppc/openpic.h" /* UniNorth version */ diff --git a/include/hw/pci/pcie_aer.h b/include/hw/pci/pcie_aer.h index 729a9439c8..502dcd7eba 100644 --- a/include/hw/pci/pcie_aer.h +++ b/include/hw/pci/pcie_aer.h @@ -22,6 +22,7 @@ #define QEMU_PCIE_AER_H #include "hw/hw.h" +#include "hw/pci/pci_regs.h" /* definitions which PCIExpressDevice uses */ diff --git a/include/hw/ppc/pnv_core.h b/include/hw/ppc/pnv_core.h index d0926454a9..bfbd2ec42a 100644 --- a/include/hw/ppc/pnv_core.h +++ b/include/hw/ppc/pnv_core.h @@ -21,6 +21,7 @@ #define PPC_PNV_CORE_H #include "hw/cpu/core.h" +#include "target/ppc/cpu.h" #define TYPE_PNV_CORE "powernv-cpu-core" #define PNV_CORE(obj) \ diff --git a/include/hw/ppc/ppc4xx.h b/include/hw/ppc/ppc4xx.h index 39a7ba1ce6..90f8866138 100644 --- a/include/hw/ppc/ppc4xx.h +++ b/include/hw/ppc/ppc4xx.h @@ -25,6 +25,10 @@ #ifndef PPC4XX_H #define PPC4XX_H +#include "hw/ppc/ppc.h" +#include "exec/cpu-common.h" +#include "exec/memory.h" + /* PowerPC 4xx core initialization */ PowerPCCPU *ppc4xx_init(const char *cpu_model, clk_setup_t *cpu_clk, clk_setup_t *tb_clk, diff --git a/include/hw/ppc/spapr_irq.h b/include/hw/ppc/spapr_irq.h index f965a58f89..cd6e18b05e 100644 --- a/include/hw/ppc/spapr_irq.h +++ b/include/hw/ppc/spapr_irq.h @@ -10,6 +10,9 @@ #ifndef HW_SPAPR_IRQ_H #define HW_SPAPR_IRQ_H +#include "hw/irq.h" +#include "target/ppc/cpu-qom.h" + /* * IRQ range offsets per device type */ diff --git a/include/hw/ppc/spapr_vio.h b/include/hw/ppc/spapr_vio.h index 04609f214e..875be28cdd 100644 --- a/include/hw/ppc/spapr_vio.h +++ b/include/hw/ppc/spapr_vio.h @@ -22,6 +22,7 @@ * License along with this library; if not, see . */ +#include "hw/ppc/spapr.h" #include "sysemu/dma.h" #define TYPE_VIO_SPAPR_DEVICE "vio-spapr-device" diff --git a/include/hw/ppc/spapr_xive.h b/include/hw/ppc/spapr_xive.h index 7197144265..a39e672f27 100644 --- a/include/hw/ppc/spapr_xive.h +++ b/include/hw/ppc/spapr_xive.h @@ -10,7 +10,9 @@ #ifndef PPC_SPAPR_XIVE_H #define PPC_SPAPR_XIVE_H +#include "hw/ppc/spapr_irq.h" #include "hw/ppc/xive.h" +#include "sysemu/sysemu.h" #define TYPE_SPAPR_XIVE "spapr-xive" #define SPAPR_XIVE(obj) OBJECT_CHECK(SpaprXive, (obj), TYPE_SPAPR_XIVE) diff --git a/include/hw/ppc/xive_regs.h b/include/hw/ppc/xive_regs.h index 1a8c5b5e64..b0c68ab5f7 100644 --- a/include/hw/ppc/xive_regs.h +++ b/include/hw/ppc/xive_regs.h @@ -16,6 +16,9 @@ #ifndef PPC_XIVE_REGS_H #define PPC_XIVE_REGS_H +#include "qemu/bswap.h" +#include "qemu/host-utils.h" + /* * Interrupt source number encoding on PowerBUS */ diff --git a/include/hw/riscv/boot.h b/include/hw/riscv/boot.h index d56f2ae3eb..1f21c2bef1 100644 --- a/include/hw/riscv/boot.h +++ b/include/hw/riscv/boot.h @@ -20,6 +20,8 @@ #ifndef RISCV_BOOT_H #define RISCV_BOOT_H +#include "exec/cpu-defs.h" + void riscv_find_and_load_firmware(MachineState *machine, const char *default_machine_firmware, hwaddr firmware_load_addr); diff --git a/include/hw/riscv/riscv_hart.h b/include/hw/riscv/riscv_hart.h index 0671d88a44..3b52b50571 100644 --- a/include/hw/riscv/riscv_hart.h +++ b/include/hw/riscv/riscv_hart.h @@ -21,6 +21,9 @@ #ifndef HW_RISCV_HART_H #define HW_RISCV_HART_H +#include "hw/sysbus.h" +#include "target/riscv/cpu.h" + #define TYPE_RISCV_HART_ARRAY "riscv.hart_array" #define RISCV_HART_ARRAY(obj) \ diff --git a/include/hw/riscv/sifive_clint.h b/include/hw/riscv/sifive_clint.h index e2865be1d1..ae8286c884 100644 --- a/include/hw/riscv/sifive_clint.h +++ b/include/hw/riscv/sifive_clint.h @@ -20,6 +20,8 @@ #ifndef HW_SIFIVE_CLINT_H #define HW_SIFIVE_CLINT_H +#include "hw/sysbus.h" + #define TYPE_SIFIVE_CLINT "riscv.sifive.clint" #define SIFIVE_CLINT(obj) \ diff --git a/include/hw/riscv/sifive_e.h b/include/hw/riscv/sifive_e.h index d175b24cb2..9c868dd7f9 100644 --- a/include/hw/riscv/sifive_e.h +++ b/include/hw/riscv/sifive_e.h @@ -19,6 +19,7 @@ #ifndef HW_SIFIVE_E_H #define HW_SIFIVE_E_H +#include "hw/riscv/riscv_hart.h" #include "hw/riscv/sifive_gpio.h" #define TYPE_RISCV_E_SOC "riscv.sifive.e.soc" diff --git a/include/hw/riscv/sifive_plic.h b/include/hw/riscv/sifive_plic.h index ce8907f6aa..b0edba2884 100644 --- a/include/hw/riscv/sifive_plic.h +++ b/include/hw/riscv/sifive_plic.h @@ -21,7 +21,7 @@ #ifndef HW_SIFIVE_PLIC_H #define HW_SIFIVE_PLIC_H -#include "hw/irq.h" +#include "hw/sysbus.h" #define TYPE_SIFIVE_PLIC "riscv.sifive.plic" diff --git a/include/hw/riscv/sifive_prci.h b/include/hw/riscv/sifive_prci.h index bd51c4af3c..8b7de134f8 100644 --- a/include/hw/riscv/sifive_prci.h +++ b/include/hw/riscv/sifive_prci.h @@ -19,6 +19,8 @@ #ifndef HW_SIFIVE_PRCI_H #define HW_SIFIVE_PRCI_H +#include "hw/sysbus.h" + enum { SIFIVE_PRCI_HFROSCCFG = 0x0, SIFIVE_PRCI_HFXOSCCFG = 0x4, diff --git a/include/hw/riscv/sifive_test.h b/include/hw/riscv/sifive_test.h index 71d4c9fad7..3a603a6ead 100644 --- a/include/hw/riscv/sifive_test.h +++ b/include/hw/riscv/sifive_test.h @@ -19,6 +19,8 @@ #ifndef HW_SIFIVE_TEST_H #define HW_SIFIVE_TEST_H +#include "hw/sysbus.h" + #define TYPE_SIFIVE_TEST "riscv.sifive.test" #define SIFIVE_TEST(obj) \ diff --git a/include/hw/riscv/sifive_u.h b/include/hw/riscv/sifive_u.h index 892f0eee21..be021ce256 100644 --- a/include/hw/riscv/sifive_u.h +++ b/include/hw/riscv/sifive_u.h @@ -20,6 +20,7 @@ #define HW_SIFIVE_U_H #include "hw/net/cadence_gem.h" +#include "hw/riscv/riscv_hart.h" #define TYPE_RISCV_U_SOC "riscv.sifive.u.soc" #define RISCV_U_SOC(obj) \ diff --git a/include/hw/riscv/sifive_uart.h b/include/hw/riscv/sifive_uart.h index c8dc1c57fd..65668825a3 100644 --- a/include/hw/riscv/sifive_uart.h +++ b/include/hw/riscv/sifive_uart.h @@ -20,6 +20,9 @@ #ifndef HW_SIFIVE_UART_H #define HW_SIFIVE_UART_H +#include "chardev/char-fe.h" +#include "hw/sysbus.h" + enum { SIFIVE_UART_TXFIFO = 0, SIFIVE_UART_RXFIFO = 4, diff --git a/include/hw/riscv/spike.h b/include/hw/riscv/spike.h index 641b70da67..03d870363c 100644 --- a/include/hw/riscv/spike.h +++ b/include/hw/riscv/spike.h @@ -19,6 +19,9 @@ #ifndef HW_RISCV_SPIKE_H #define HW_RISCV_SPIKE_H +#include "hw/riscv/riscv_hart.h" +#include "hw/sysbus.h" + typedef struct { /*< private >*/ SysBusDevice parent_obj; diff --git a/include/hw/riscv/virt.h b/include/hw/riscv/virt.h index d01a1a85c4..6e5fbe5d3b 100644 --- a/include/hw/riscv/virt.h +++ b/include/hw/riscv/virt.h @@ -19,6 +19,9 @@ #ifndef HW_RISCV_VIRT_H #define HW_RISCV_VIRT_H +#include "hw/riscv/riscv_hart.h" +#include "hw/sysbus.h" + typedef struct { /*< private >*/ SysBusDevice parent_obj; diff --git a/include/hw/s390x/ap-device.h b/include/hw/s390x/ap-device.h index 765e9082a3..1aa89c36be 100644 --- a/include/hw/s390x/ap-device.h +++ b/include/hw/s390x/ap-device.h @@ -10,6 +10,8 @@ #ifndef HW_S390X_AP_DEVICE_H #define HW_S390X_AP_DEVICE_H +#include "hw/qdev-core.h" + #define AP_DEVICE_TYPE "ap-device" typedef struct APDevice { diff --git a/include/hw/s390x/css-bridge.h b/include/hw/s390x/css-bridge.h index 5a0203be5f..f7ed2d9a03 100644 --- a/include/hw/s390x/css-bridge.h +++ b/include/hw/s390x/css-bridge.h @@ -12,8 +12,9 @@ #ifndef HW_S390X_CSS_BRIDGE_H #define HW_S390X_CSS_BRIDGE_H + #include "qom/object.h" -#include "hw/qdev-core.h" +#include "hw/sysbus.h" /* virtual css bridge */ typedef struct VirtualCssBridge { diff --git a/include/hw/s390x/css.h b/include/hw/s390x/css.h index d033387fba..f46bcafb16 100644 --- a/include/hw/s390x/css.h +++ b/include/hw/s390x/css.h @@ -17,6 +17,7 @@ #include "hw/s390x/s390_flic.h" #include "hw/s390x/ioinst.h" #include "sysemu/kvm.h" +#include "target/s390x/cpu-qom.h" /* Channel subsystem constants. */ #define MAX_DEVNO 65535 diff --git a/include/hw/s390x/tod.h b/include/hw/s390x/tod.h index 9c4a6000c3..d71f4ea8a7 100644 --- a/include/hw/s390x/tod.h +++ b/include/hw/s390x/tod.h @@ -12,7 +12,7 @@ #define HW_S390_TOD_H #include "hw/qdev.h" -#include "s390-tod.h" +#include "target/s390x/s390-tod.h" typedef struct S390TOD { uint8_t high; diff --git a/include/hw/semihosting/console.h b/include/hw/semihosting/console.h index cfab572c0c..9be9754bcd 100644 --- a/include/hw/semihosting/console.h +++ b/include/hw/semihosting/console.h @@ -9,6 +9,8 @@ #ifndef SEMIHOST_CONSOLE_H #define SEMIHOST_CONSOLE_H +#include "cpu.h" + /** * qemu_semihosting_console_outs: * @env: CPUArchState diff --git a/include/hw/sh4/sh_intc.h b/include/hw/sh4/sh_intc.h index b7c2404334..3d3efde059 100644 --- a/include/hw/sh4/sh_intc.h +++ b/include/hw/sh4/sh_intc.h @@ -1,6 +1,7 @@ #ifndef SH_INTC_H #define SH_INTC_H +#include "exec/memory.h" #include "hw/irq.h" typedef unsigned char intc_enum; diff --git a/include/hw/sparc/sparc64.h b/include/hw/sparc/sparc64.h index 21ab79e343..4ced36fb5a 100644 --- a/include/hw/sparc/sparc64.h +++ b/include/hw/sparc/sparc64.h @@ -1,6 +1,8 @@ #ifndef HW_SPARC_SPARC64_H #define HW_SPARC_SPARC64_H +#include "target/sparc/cpu-qom.h" + #define IVEC_MAX 0x40 SPARCCPU *sparc64_cpu_devinit(const char *cpu_type, uint64_t prom_addr); diff --git a/include/hw/ssi/aspeed_smc.h b/include/hw/ssi/aspeed_smc.h index 591279ba1f..aa07dac4fe 100644 --- a/include/hw/ssi/aspeed_smc.h +++ b/include/hw/ssi/aspeed_smc.h @@ -26,6 +26,7 @@ #define ASPEED_SMC_H #include "hw/ssi/ssi.h" +#include "hw/sysbus.h" typedef struct AspeedSegments { hwaddr addr; diff --git a/include/hw/ssi/xilinx_spips.h b/include/hw/ssi/xilinx_spips.h index a0a0ae7584..6a39b55a7b 100644 --- a/include/hw/ssi/xilinx_spips.h +++ b/include/hw/ssi/xilinx_spips.h @@ -28,6 +28,7 @@ #include "hw/ssi/ssi.h" #include "qemu/fifo32.h" #include "hw/stream.h" +#include "hw/sysbus.h" typedef struct XilinxSPIPS XilinxSPIPS; diff --git a/include/hw/timer/allwinner-a10-pit.h b/include/hw/timer/allwinner-a10-pit.h index c0cc3e2169..871c95b512 100644 --- a/include/hw/timer/allwinner-a10-pit.h +++ b/include/hw/timer/allwinner-a10-pit.h @@ -2,6 +2,7 @@ #define ALLWINNER_A10_PIT_H #include "hw/ptimer.h" +#include "hw/sysbus.h" #define TYPE_AW_A10_PIT "allwinner-A10-timer" #define AW_A10_PIT(obj) OBJECT_CHECK(AwA10PITState, (obj), TYPE_AW_A10_PIT) diff --git a/include/hw/timer/i8254_internal.h b/include/hw/timer/i8254_internal.h index c37a438f82..e611c6f227 100644 --- a/include/hw/timer/i8254_internal.h +++ b/include/hw/timer/i8254_internal.h @@ -27,6 +27,7 @@ #include "hw/hw.h" #include "hw/isa/isa.h" +#include "hw/timer/i8254.h" #include "qemu/timer.h" typedef struct PITChannelState { diff --git a/include/hw/timer/m48t59.h b/include/hw/timer/m48t59.h index 43efc91f56..d3fb50e08c 100644 --- a/include/hw/timer/m48t59.h +++ b/include/hw/timer/m48t59.h @@ -1,6 +1,8 @@ #ifndef HW_M48T59_H #define HW_M48T59_H +#include "exec/hwaddr.h" +#include "hw/irq.h" #include "qom/object.h" #define TYPE_NVRAM "nvram" diff --git a/include/hw/timer/mc146818rtc_regs.h b/include/hw/timer/mc146818rtc_regs.h index c62f17bf2d..bfbb57e570 100644 --- a/include/hw/timer/mc146818rtc_regs.h +++ b/include/hw/timer/mc146818rtc_regs.h @@ -25,6 +25,8 @@ #ifndef MC146818RTC_REGS_H #define MC146818RTC_REGS_H +#include "qemu/timer.h" + #define RTC_ISA_IRQ 8 #define RTC_SECONDS 0 diff --git a/include/hw/timer/xlnx-zynqmp-rtc.h b/include/hw/timer/xlnx-zynqmp-rtc.h index 6e9134edf6..97e32322ed 100644 --- a/include/hw/timer/xlnx-zynqmp-rtc.h +++ b/include/hw/timer/xlnx-zynqmp-rtc.h @@ -28,6 +28,7 @@ #define HW_TIMER_XLNX_ZYNQMP_RTC_H #include "hw/register.h" +#include "hw/sysbus.h" #define TYPE_XLNX_ZYNQMP_RTC "xlnx-zynmp.rtc" diff --git a/include/hw/virtio/virtio-access.h b/include/hw/virtio/virtio-access.h index bdf58f3119..6818a23a2d 100644 --- a/include/hw/virtio/virtio-access.h +++ b/include/hw/virtio/virtio-access.h @@ -16,6 +16,7 @@ #ifndef QEMU_VIRTIO_ACCESS_H #define QEMU_VIRTIO_ACCESS_H +#include "exec/hwaddr.h" #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-bus.h" diff --git a/include/hw/virtio/virtio-gpu-bswap.h b/include/hw/virtio/virtio-gpu-bswap.h index 38d12160f6..203f9e1718 100644 --- a/include/hw/virtio/virtio-gpu-bswap.h +++ b/include/hw/virtio/virtio-gpu-bswap.h @@ -15,6 +15,7 @@ #define HW_VIRTIO_GPU_BSWAP_H #include "qemu/bswap.h" +#include "standard-headers/linux/virtio_gpu.h" static inline void virtio_gpu_ctrl_hdr_bswap(struct virtio_gpu_ctrl_hdr *hdr) diff --git a/include/hw/virtio/virtio-rng.h b/include/hw/virtio/virtio-rng.h index 922dce7cac..ff699335e3 100644 --- a/include/hw/virtio/virtio-rng.h +++ b/include/hw/virtio/virtio-rng.h @@ -12,6 +12,7 @@ #ifndef QEMU_VIRTIO_RNG_H #define QEMU_VIRTIO_RNG_H +#include "hw/virtio/virtio.h" #include "sysemu/rng.h" #include "sysemu/rng-random.h" #include "standard-headers/linux/virtio_rng.h" diff --git a/include/hw/watchdog/wdt_aspeed.h b/include/hw/watchdog/wdt_aspeed.h index daef0c0e23..8c5691ce20 100644 --- a/include/hw/watchdog/wdt_aspeed.h +++ b/include/hw/watchdog/wdt_aspeed.h @@ -10,6 +10,7 @@ #ifndef WDT_ASPEED_H #define WDT_ASPEED_H +#include "hw/misc/aspeed_scu.h" #include "hw/sysbus.h" #define TYPE_ASPEED_WDT "aspeed.wdt" diff --git a/include/libdecnumber/decNumberLocal.h b/include/libdecnumber/decNumberLocal.h index 12cf1d8b6f..4d53c077f2 100644 --- a/include/libdecnumber/decNumberLocal.h +++ b/include/libdecnumber/decNumberLocal.h @@ -44,6 +44,7 @@ #define DECNLAUTHOR "Mike Cowlishaw" /* Who to blame */ #include "libdecnumber/dconfig.h" + #include "libdecnumber/decContext.h" /* Conditional code flag -- set this to match hardware platform */ /* 1=little-endian, 0=big-endian */ diff --git a/include/migration/cpu.h b/include/migration/cpu.h index a40bd3549f..8424f1631a 100644 --- a/include/migration/cpu.h +++ b/include/migration/cpu.h @@ -2,6 +2,8 @@ #ifndef MIGRATION_CPU_H #define MIGRATION_CPU_H +#include "exec/cpu-defs.h" + #if TARGET_LONG_BITS == 64 #define qemu_put_betl qemu_put_be64 #define qemu_get_betl qemu_get_be64 diff --git a/include/monitor/hmp-target.h b/include/monitor/hmp-target.h index 454e8ed155..8b7820a3ad 100644 --- a/include/monitor/hmp-target.h +++ b/include/monitor/hmp-target.h @@ -25,6 +25,8 @@ #ifndef MONITOR_HMP_TARGET_H #define MONITOR_HMP_TARGET_H +#include "cpu.h" + #define MD_TLONG 0 #define MD_I32 1 diff --git a/include/qemu/atomic128.h b/include/qemu/atomic128.h index ddd0d55d31..6b34484e15 100644 --- a/include/qemu/atomic128.h +++ b/include/qemu/atomic128.h @@ -13,6 +13,8 @@ #ifndef QEMU_ATOMIC128_H #define QEMU_ATOMIC128_H +#include "qemu/int128.h" + /* * GCC is a house divided about supporting large atomic operations. * diff --git a/include/qemu/ratelimit.h b/include/qemu/ratelimit.h index 1b38291823..01da8d63f1 100644 --- a/include/qemu/ratelimit.h +++ b/include/qemu/ratelimit.h @@ -14,6 +14,8 @@ #ifndef QEMU_RATELIMIT_H #define QEMU_RATELIMIT_H +#include "qemu/timer.h" + typedef struct { int64_t slice_start_time; int64_t slice_end_time; diff --git a/include/qemu/thread-win32.h b/include/qemu/thread-win32.h index 50af5dd7ab..d0a1a9597e 100644 --- a/include/qemu/thread-win32.h +++ b/include/qemu/thread-win32.h @@ -47,6 +47,6 @@ struct QemuThread { }; /* Only valid for joinable threads. */ -HANDLE qemu_thread_get_handle(QemuThread *thread); +HANDLE qemu_thread_get_handle(struct QemuThread *thread); #endif diff --git a/include/sysemu/balloon.h b/include/sysemu/balloon.h index c8f6145257..aea0c44985 100644 --- a/include/sysemu/balloon.h +++ b/include/sysemu/balloon.h @@ -14,6 +14,7 @@ #ifndef QEMU_BALLOON_H #define QEMU_BALLOON_H +#include "exec/cpu-common.h" #include "qapi/qapi-types-misc.h" typedef void (QEMUBalloonEvent)(void *opaque, ram_addr_t target); diff --git a/include/sysemu/cryptodev-vhost-user.h b/include/sysemu/cryptodev-vhost-user.h index 6debf53fc5..2c0a0a1cd8 100644 --- a/include/sysemu/cryptodev-vhost-user.h +++ b/include/sysemu/cryptodev-vhost-user.h @@ -23,6 +23,8 @@ #ifndef CRYPTODEV_VHOST_USER_H #define CRYPTODEV_VHOST_USER_H +#include "sysemu/cryptodev-vhost.h" + #define VHOST_USER_MAX_AUTH_KEY_LEN 512 #define VHOST_USER_MAX_CIPHER_KEY_LEN 64 diff --git a/include/sysemu/hvf.h b/include/sysemu/hvf.h index d275b5a843..dd1722f2df 100644 --- a/include/sysemu/hvf.h +++ b/include/sysemu/hvf.h @@ -13,6 +13,7 @@ #ifndef HVF_H #define HVF_H +#include "cpu.h" #include "qemu/bitops.h" #include "exec/memory.h" #include "sysemu/accel.h" diff --git a/include/sysemu/iothread.h b/include/sysemu/iothread.h index 5f6240d5cb..6181486401 100644 --- a/include/sysemu/iothread.h +++ b/include/sysemu/iothread.h @@ -16,6 +16,7 @@ #include "block/aio.h" #include "qemu/thread.h" +#include "qom/object.h" #define TYPE_IOTHREAD "iothread" diff --git a/include/sysemu/kvm_int.h b/include/sysemu/kvm_int.h index 31df465fdc..787dbc7770 100644 --- a/include/sysemu/kvm_int.h +++ b/include/sysemu/kvm_int.h @@ -9,6 +9,8 @@ #ifndef QEMU_KVM_INT_H #define QEMU_KVM_INT_H +#include "exec/cpu-common.h" +#include "exec/memory.h" #include "sysemu/sysemu.h" #include "sysemu/accel.h" #include "sysemu/kvm.h" diff --git a/include/sysemu/memory_mapping.h b/include/sysemu/memory_mapping.h index 58452457ce..1b440df486 100644 --- a/include/sysemu/memory_mapping.h +++ b/include/sysemu/memory_mapping.h @@ -15,6 +15,8 @@ #define MEMORY_MAPPING_H #include "qemu/queue.h" +#include "exec/cpu-common.h" +#include "exec/cpu-defs.h" #include "exec/memory.h" typedef struct GuestPhysBlock { diff --git a/include/sysemu/xen-mapcache.h b/include/sysemu/xen-mapcache.h index a03e2f1878..c8e7c2f6cf 100644 --- a/include/sysemu/xen-mapcache.h +++ b/include/sysemu/xen-mapcache.h @@ -9,6 +9,8 @@ #ifndef XEN_MAPCACHE_H #define XEN_MAPCACHE_H +#include "exec/cpu-common.h" + typedef hwaddr (*phys_offset_to_gaddr_t)(hwaddr phys_offset, ram_addr_t size); #ifdef CONFIG_XEN diff --git a/include/ui/egl-helpers.h b/include/ui/egl-helpers.h index d714127799..58bd3a1ec4 100644 --- a/include/ui/egl-helpers.h +++ b/include/ui/egl-helpers.h @@ -4,6 +4,9 @@ #include #include #include +#include "qapi/qapi-types-ui.h" +#include "ui/console.h" +#include "ui/shader.h" extern EGLDisplay *qemu_egl_display; extern EGLConfig qemu_egl_config; diff --git a/include/ui/input.h b/include/ui/input.h index 8c8ccb999f..c86219a1c1 100644 --- a/include/ui/input.h +++ b/include/ui/input.h @@ -2,6 +2,7 @@ #define INPUT_H #include "qapi/qapi-types-ui.h" +#include "qemu/notify.h" #define INPUT_EVENT_MASK_KEY (1< #include #include #include diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h index aab251bc4b..e9fba96be9 100644 --- a/target/hppa/cpu.h +++ b/target/hppa/cpu.h @@ -22,7 +22,7 @@ #include "cpu-qom.h" #include "exec/cpu-defs.h" - +#include "exec/memory.h" /* PA-RISC 1.x processors have a strong memory model. */ /* ??? While we do not yet implement PA-RISC 2.0, those processors have From patchwork Fri Jul 26 12:05:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 11060871 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 91AAA13A0 for ; Fri, 26 Jul 2019 12:06:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 812DB28812 for ; Fri, 26 Jul 2019 12:06:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7546128AA8; Fri, 26 Jul 2019 12:06:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C598528812 for ; Fri, 26 Jul 2019 12:06:25 +0000 (UTC) Received: from localhost ([::1]:39222 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqyzP-0007Bj-Jl for patchwork-qemu-devel@patchwork.kernel.org; Fri, 26 Jul 2019 08:06:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58465) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqyyt-0005Vd-Pw for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqyyq-0007ux-6q for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58236) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqyyp-0007oP-OY for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:47 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 37FB030872D1 for ; Fri, 26 Jul 2019 12:05:44 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D2579600C4 for ; Fri, 26 Jul 2019 12:05:43 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 4414611385FD; Fri, 26 Jul 2019 14:05:42 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 26 Jul 2019 14:05:16 +0200 Message-Id: <20190726120542.9894-3-armbru@redhat.com> In-Reply-To: <20190726120542.9894-1-armbru@redhat.com> References: <20190726120542.9894-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Fri, 26 Jul 2019 12:05:44 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 02/28] Include generated QAPI headers less X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Some of the generated qapi-types-MODULE.h are included all over the place. Changing a QAPI type can trigger massive recompiling. Top scorers recompile more than 1000 out of some 6600 objects (not counting tests and objects that don't depend on qemu/osdep.h): 6300 qapi/qapi-builtin-types.h 5700 qapi/qapi-types-run-state.h 3900 qapi/qapi-types-common.h 3300 qapi/qapi-types-sockets.h 3000 qapi/qapi-types-misc.h 3000 qapi/qapi-types-crypto.h 3000 qapi/qapi-types-job.h 3000 qapi/qapi-types-block-core.h 2800 qapi/qapi-types-block.h 1300 qapi/qapi-types-net.h Clean up headers to include generated QAPI headers only where needed. Impact is negligible except for hw/qdev-properties.h. This header includes qapi/qapi-types-block.h and qapi/qapi-types-misc.h. They are used only in expansions of property definition macros such as DEFINE_PROP_BLOCKDEV_ON_ERROR() and DEFINE_PROP_OFF_AUTO(). Moving their inclusion from hw/qdev-properties.h to the users of these macros avoids pointless recompiles. This is how other property definition macros, such as DEFINE_PROP_NETDEV(), already work. Improves things for some of the top scorers: 3600 qapi/qapi-types-common.h 2700 qapi/qapi-types-sockets.h 900 qapi/qapi-types-misc.h 2100 qapi/qapi-types-crypto.h 2100 qapi/qapi-types-job.h 2100 qapi/qapi-types-block-core.h 270 qapi/qapi-types-block.h Signed-off-by: Markus Armbruster --- hw/core/qdev-properties.c | 2 ++ hw/i386/kvm/i8254.c | 1 + hw/ide/qdev.c | 1 + include/authz/listfile.h | 1 - include/block/block.h | 1 - include/hw/acpi/acpi_dev_interface.h | 1 + include/hw/mem/memory-device.h | 1 + include/hw/ppc/spapr_drc.h | 1 - include/hw/qdev-properties.h | 2 -- include/hw/virtio/virtio-pmem.h | 1 + include/migration/global_state.h | 1 - include/qemu/job.h | 2 +- include/sysemu/arch_init.h | 1 - include/ui/egl-helpers.h | 1 - monitor/monitor-internal.h | 1 - target/i386/monitor.c | 1 + target/i386/sev_i386.h | 2 +- ui/vnc.h | 1 - 18 files changed, 10 insertions(+), 12 deletions(-) diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index 81c97f48a7..8510ad14b0 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -3,6 +3,8 @@ #include "hw/qdev.h" #include "qapi/error.h" #include "hw/pci/pci.h" +#include "qapi/qapi-types-block.h" +#include "qapi/qapi-types-misc.h" #include "qapi/qmp/qerror.h" #include "qemu/ctype.h" #include "qemu/error-report.h" diff --git a/hw/i386/kvm/i8254.c b/hw/i386/kvm/i8254.c index c29956ab77..27e36a2abf 100644 --- a/hw/i386/kvm/i8254.c +++ b/hw/i386/kvm/i8254.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include +#include "qapi/qapi-types-misc.h" #include "qapi/error.h" #include "qemu/module.h" #include "qemu/timer.h" diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c index 9d8502785d..eea22c09f4 100644 --- a/hw/ide/qdev.c +++ b/hw/ide/qdev.c @@ -21,6 +21,7 @@ #include "hw/hw.h" #include "sysemu/dma.h" #include "qapi/error.h" +#include "qapi/qapi-types-block.h" #include "qemu/error-report.h" #include "qemu/module.h" #include "hw/ide/internal.h" diff --git a/include/authz/listfile.h b/include/authz/listfile.h index 33b728d873..24ae2e606c 100644 --- a/include/authz/listfile.h +++ b/include/authz/listfile.h @@ -22,7 +22,6 @@ #define QAUTHZ_LISTFILE_H #include "authz/list.h" -#include "qapi/qapi-types-authz.h" #include "qemu/filemonitor.h" #define TYPE_QAUTHZ_LIST_FILE "authz-list-file" diff --git a/include/block/block.h b/include/block/block.h index 60f00479e0..dfdcd3fbab 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -2,7 +2,6 @@ #define BLOCK_H #include "block/aio.h" -#include "qapi/qapi-types-block-core.h" #include "block/aio-wait.h" #include "qemu/iov.h" #include "qemu/coroutine.h" diff --git a/include/hw/acpi/acpi_dev_interface.h b/include/hw/acpi/acpi_dev_interface.h index 43ff119179..6465072b7d 100644 --- a/include/hw/acpi/acpi_dev_interface.h +++ b/include/hw/acpi/acpi_dev_interface.h @@ -1,6 +1,7 @@ #ifndef ACPI_DEV_INTERFACE_H #define ACPI_DEV_INTERFACE_H +#include "qapi/qapi-types-misc.h" #include "qom/object.h" #include "hw/boards.h" diff --git a/include/hw/mem/memory-device.h b/include/hw/mem/memory-device.h index 0293a96abb..2ada6e7bde 100644 --- a/include/hw/mem/memory-device.h +++ b/include/hw/mem/memory-device.h @@ -13,6 +13,7 @@ #ifndef MEMORY_DEVICE_H #define MEMORY_DEVICE_H +#include "qapi/qapi-types-misc.h" #include "qom/object.h" #include "hw/qdev.h" diff --git a/include/hw/ppc/spapr_drc.h b/include/hw/ppc/spapr_drc.h index c2c543a591..576c711b86 100644 --- a/include/hw/ppc/spapr_drc.h +++ b/include/hw/ppc/spapr_drc.h @@ -14,7 +14,6 @@ #define HW_SPAPR_DRC_H #include -#include "qapi/qapi-types-run-state.h" #include "qom/object.h" #include "sysemu/sysemu.h" #include "hw/qdev.h" diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h index 1eae5ab056..bb34a614e2 100644 --- a/include/hw/qdev-properties.h +++ b/include/hw/qdev-properties.h @@ -1,8 +1,6 @@ #ifndef QEMU_QDEV_PROPERTIES_H #define QEMU_QDEV_PROPERTIES_H -#include "qapi/qapi-types-block.h" -#include "qapi/qapi-types-misc.h" #include "hw/qdev-core.h" /*** qdev-properties.c ***/ diff --git a/include/hw/virtio/virtio-pmem.h b/include/hw/virtio/virtio-pmem.h index 19b6ee6d75..8bf2ae780f 100644 --- a/include/hw/virtio/virtio-pmem.h +++ b/include/hw/virtio/virtio-pmem.h @@ -15,6 +15,7 @@ #define HW_VIRTIO_PMEM_H #include "hw/virtio/virtio.h" +#include "qapi/qapi-types-misc.h" #include "sysemu/hostmem.h" #define TYPE_VIRTIO_PMEM "virtio-pmem" diff --git a/include/migration/global_state.h b/include/migration/global_state.h index fd22dd3034..d307de8350 100644 --- a/include/migration/global_state.h +++ b/include/migration/global_state.h @@ -13,7 +13,6 @@ #ifndef QEMU_MIGRATION_GLOBAL_STATE_H #define QEMU_MIGRATION_GLOBAL_STATE_H -#include "qapi/qapi-types-run-state.h" #include "sysemu/sysemu.h" void register_global_state(void); diff --git a/include/qemu/job.h b/include/qemu/job.h index 9e7cd1e4a0..73c67d3175 100644 --- a/include/qemu/job.h +++ b/include/qemu/job.h @@ -26,7 +26,7 @@ #ifndef JOB_H #define JOB_H -#include "qapi/qapi-types-block-core.h" +#include "qapi/qapi-types-job.h" #include "qemu/queue.h" #include "qemu/coroutine.h" #include "block/aio.h" diff --git a/include/sysemu/arch_init.h b/include/sysemu/arch_init.h index 10cbafe970..62c6fe4cf1 100644 --- a/include/sysemu/arch_init.h +++ b/include/sysemu/arch_init.h @@ -1,7 +1,6 @@ #ifndef QEMU_ARCH_INIT_H #define QEMU_ARCH_INIT_H -#include "qapi/qapi-types-misc.h" enum { QEMU_ARCH_ALL = -1, diff --git a/include/ui/egl-helpers.h b/include/ui/egl-helpers.h index 58bd3a1ec4..dad19e9873 100644 --- a/include/ui/egl-helpers.h +++ b/include/ui/egl-helpers.h @@ -4,7 +4,6 @@ #include #include #include -#include "qapi/qapi-types-ui.h" #include "ui/console.h" #include "ui/shader.h" diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h index 7760b22ba3..d78f5ca190 100644 --- a/monitor/monitor-internal.h +++ b/monitor/monitor-internal.h @@ -27,7 +27,6 @@ #include "chardev/char-fe.h" #include "monitor/monitor.h" -#include "qapi/qapi-types-misc.h" #include "qapi/qmp/dispatch.h" #include "qapi/qmp/json-parser.h" #include "qemu/readline.h" diff --git a/target/i386/monitor.c b/target/i386/monitor.c index 1f3b532fc2..9fb4d641d5 100644 --- a/target/i386/monitor.c +++ b/target/i386/monitor.c @@ -33,6 +33,7 @@ #include "sysemu/sev.h" #include "qapi/error.h" #include "sev_i386.h" +#include "qapi/qapi-commands-misc-target.h" #include "qapi/qapi-commands-misc.h" /* Perform linear address sign extension */ diff --git a/target/i386/sev_i386.h b/target/i386/sev_i386.h index 55313441ae..8ada9d385d 100644 --- a/target/i386/sev_i386.h +++ b/target/i386/sev_i386.h @@ -19,7 +19,7 @@ #include "sysemu/kvm.h" #include "sysemu/sev.h" #include "qemu/error-report.h" -#include "qapi/qapi-commands-misc-target.h" +#include "qapi/qapi-types-misc-target.h" #define SEV_POLICY_NODBG 0x1 #define SEV_POLICY_NOKS 0x2 diff --git a/ui/vnc.h b/ui/vnc.h index 2f84db3142..18f1b1d6d0 100644 --- a/ui/vnc.h +++ b/ui/vnc.h @@ -27,7 +27,6 @@ #ifndef QEMU_VNC_H #define QEMU_VNC_H -#include "qapi/qapi-types-ui.h" #include "qemu/queue.h" #include "qemu/thread.h" #include "ui/console.h" From patchwork Fri Jul 26 12:05:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 11060877 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 404D013A0 for ; Fri, 26 Jul 2019 12:07:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2EEBB28812 for ; Fri, 26 Jul 2019 12:07:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 223A528AA8; Fri, 26 Jul 2019 12:07:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A60B728812 for ; Fri, 26 Jul 2019 12:07:06 +0000 (UTC) Received: from localhost ([::1]:39246 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqz05-0001jp-DW for patchwork-qemu-devel@patchwork.kernel.org; Fri, 26 Jul 2019 08:07:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58477) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqyyu-0005Ve-8A for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqyyq-0007uO-4I for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42938) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqyyp-0007oQ-PZ for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:48 -0400 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 3A00C3083363 for ; Fri, 26 Jul 2019 12:05:44 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D23775D70D; Fri, 26 Jul 2019 12:05:43 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 4D2CD1133019; Fri, 26 Jul 2019 14:05:42 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 26 Jul 2019 14:05:17 +0200 Message-Id: <20190726120542.9894-4-armbru@redhat.com> In-Reply-To: <20190726120542.9894-1-armbru@redhat.com> References: <20190726120542.9894-1-armbru@redhat.com> MIME-Version: 1.0 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.44]); Fri, 26 Jul 2019 12:05:44 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 03/28] qapi: Split error.json off common.json X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP In my "build everything" tree, changing a type in qapi/common.json triggers a recompile of some 3600 out of 6600 objects (not counting tests and objects that don't depend on qemu/osdep.h). One common dependency is QapiErrorClass: it's used only in in qapi/error.h, which uses nothing else, and is widely included. Move QapiErrorClass from common.json to new error.json. Touching common.json now recompiles only some 2900 objects. Cc: Eric Blake Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- MAINTAINERS | 2 ++ include/qapi/error.h | 2 +- qapi/Makefile.objs | 2 +- qapi/common.json | 24 ------------------------ qapi/error.json | 29 +++++++++++++++++++++++++++++ qapi/qapi-schema.json | 1 + 6 files changed, 34 insertions(+), 26 deletions(-) create mode 100644 qapi/error.json diff --git a/MAINTAINERS b/MAINTAINERS index cc9636b43a..a43c200eaf 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1875,6 +1875,7 @@ M: Markus Armbruster S: Supported F: include/qapi/error.h F: include/qemu/error-report.h +F: qapi/error.json F: util/error.c F: util/qemu-error.c @@ -2063,6 +2064,7 @@ F: monitor/monitor-internal.h F: monitor/qmp* F: monitor/misc.c F: monitor/monitor.c +F: qapi/error.json F: docs/devel/*qmp-* F: docs/interop/*qmp-* F: scripts/qmp/ diff --git a/include/qapi/error.h b/include/qapi/error.h index 51b63dd4b5..3f95141a01 100644 --- a/include/qapi/error.h +++ b/include/qapi/error.h @@ -119,7 +119,7 @@ #ifndef ERROR_H #define ERROR_H -#include "qapi/qapi-types-common.h" +#include "qapi/qapi-types-error.h" /* * Overall category of an error. diff --git a/qapi/Makefile.objs b/qapi/Makefile.objs index c5a29e86e2..dd3f5e6f94 100644 --- a/qapi/Makefile.objs +++ b/qapi/Makefile.objs @@ -6,7 +6,7 @@ util-obj-y += qmp-event.o util-obj-y += qapi-util.o QAPI_COMMON_MODULES = audio authz block-core block char common crypto -QAPI_COMMON_MODULES += dump introspect job machine migration misc net +QAPI_COMMON_MODULES += dump error introspect job machine migration misc net QAPI_COMMON_MODULES += qdev qom rdma rocker run-state sockets tpm QAPI_COMMON_MODULES += trace transaction ui QAPI_TARGET_MODULES = machine-target misc-target diff --git a/qapi/common.json b/qapi/common.json index 99d313ef3b..3d4e8de1e0 100644 --- a/qapi/common.json +++ b/qapi/common.json @@ -4,30 +4,6 @@ # = Common data types ## -## -# @QapiErrorClass: -# -# QEMU error classes -# -# @GenericError: this is used for errors that don't require a specific error -# class. This should be the default case for most errors -# -# @CommandNotFound: the requested command has not been found -# -# @DeviceNotActive: a device has failed to be become active -# -# @DeviceNotFound: the requested device has not been found -# -# @KVMMissingCap: the requested operation can't be fulfilled because a -# required KVM capability is missing -# -# Since: 1.2 -## -{ 'enum': 'QapiErrorClass', - # Keep this in sync with ErrorClass in error.h - 'data': [ 'GenericError', 'CommandNotFound', - 'DeviceNotActive', 'DeviceNotFound', 'KVMMissingCap' ] } - ## # @IoOperationType: # diff --git a/qapi/error.json b/qapi/error.json new file mode 100644 index 0000000000..3fad08f506 --- /dev/null +++ b/qapi/error.json @@ -0,0 +1,29 @@ +# -*- Mode: Python -*- + +## +# = QMP errors +## + +## +# @QapiErrorClass: +# +# QEMU error classes +# +# @GenericError: this is used for errors that don't require a specific error +# class. This should be the default case for most errors +# +# @CommandNotFound: the requested command has not been found +# +# @DeviceNotActive: a device has failed to be become active +# +# @DeviceNotFound: the requested device has not been found +# +# @KVMMissingCap: the requested operation can't be fulfilled because a +# required KVM capability is missing +# +# Since: 1.2 +## +{ 'enum': 'QapiErrorClass', + # Keep this in sync with ErrorClass in error.h + 'data': [ 'GenericError', 'CommandNotFound', + 'DeviceNotActive', 'DeviceNotFound', 'KVMMissingCap' ] } diff --git a/qapi/qapi-schema.json b/qapi/qapi-schema.json index 38af54d6b3..920b03b0aa 100644 --- a/qapi/qapi-schema.json +++ b/qapi/qapi-schema.json @@ -80,6 +80,7 @@ # stable order, it's best to include each sub-schema just once, or # include it first right here. +{ 'include': 'error.json' } { 'include': 'common.json' } { 'include': 'sockets.json' } { 'include': 'run-state.json' } From patchwork Fri Jul 26 12:05:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 11060867 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 06E01746 for ; Fri, 26 Jul 2019 12:06:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E129728812 for ; Fri, 26 Jul 2019 12:06:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D4ACE28AA8; Fri, 26 Jul 2019 12:06:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7318328812 for ; Fri, 26 Jul 2019 12:06:11 +0000 (UTC) Received: from localhost ([::1]:39216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqyzA-0006Hm-Ms for patchwork-qemu-devel@patchwork.kernel.org; Fri, 26 Jul 2019 08:06:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58432) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqyys-0005Vc-VQ for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqyyq-0007uZ-6V for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56004) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqyyp-0007oO-PA for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:47 -0400 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 0FF3485543 for ; Fri, 26 Jul 2019 12:05:44 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D230736FB; Fri, 26 Jul 2019 12:05:43 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 50DB41133025; Fri, 26 Jul 2019 14:05:42 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 26 Jul 2019 14:05:18 +0200 Message-Id: <20190726120542.9894-5-armbru@redhat.com> In-Reply-To: <20190726120542.9894-1-armbru@redhat.com> References: <20190726120542.9894-1-armbru@redhat.com> MIME-Version: 1.0 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.28]); Fri, 26 Jul 2019 12:05:44 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 04/28] memory: Fix type of IOMMUMemoryRegionClass member @parent_class X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP TYPE_IOMMU_MEMORY_REGION is a direct subtype of TYPE_MEMORY_REGION. Its instance struct is IOMMUMemoryRegion, and its first member is a MemoryRegion. Correct. Its class struct is IOMMUMemoryRegionClass, and its first member is a DeviceClass. Wrong. Messed up when commit 1221a474676 introduced the QOM type. It even included hw/qdev-core.h just for that. TYPE_MEMORY_REGION doesn't bother to define a class struct. This is fine, it simply defaults to its super-type TYPE_OBJECT's class struct ObjectClass. Changing IOMMUMemoryRegionClass's first member's type to ObjectClass would be a minimal fix, if a bit brittle: if TYPE_MEMORY_REGION ever acquired own class struct, we'd have to update IOMMUMemoryRegionClass to use it. Fix it the clean and robust way instead: give TYPE_MEMORY_REGION its own class struct MemoryRegionClass now, and use it for IOMMUMemoryRegionClass's first member. Revert the include of hw/qdev-core.h, and fix the few files that have come to rely on it. Cc: Paolo Bonzini Signed-off-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daudé --- hw/display/vga-isa-mm.c | 1 + hw/net/pcnet.h | 1 + include/exec/memory.h | 9 +++++++-- memory.c | 1 + 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/hw/display/vga-isa-mm.c b/hw/display/vga-isa-mm.c index 215e649719..a790f69b6d 100644 --- a/hw/display/vga-isa-mm.c +++ b/hw/display/vga-isa-mm.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" +#include "qemu/bitops.h" #include "qemu/units.h" #include "hw/hw.h" #include "hw/display/vga.h" diff --git a/hw/net/pcnet.h b/hw/net/pcnet.h index 40831a7845..28d19a5c6f 100644 --- a/hw/net/pcnet.h +++ b/hw/net/pcnet.h @@ -8,6 +8,7 @@ #define PCNET_LOOPTEST_NOCRC 2 #include "exec/memory.h" +#include "hw/irq.h" /* BUS CONFIGURATION REGISTERS */ #define BCR_MSRDA 0 diff --git a/include/exec/memory.h b/include/exec/memory.h index bb0961ddb9..238370a2ff 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -25,7 +25,6 @@ #include "qemu/notify.h" #include "qom/object.h" #include "qemu/rcu.h" -#include "hw/qdev-core.h" #define RAM_ADDR_INVALID (~(ram_addr_t)0) @@ -205,6 +204,12 @@ struct MemoryRegionOps { } impl; }; +typedef struct MemoryRegionClass { + /* private */ + ObjectClass parent_class; +} MemoryRegionClass; + + enum IOMMUMemoryRegionAttr { IOMMU_ATTR_SPAPR_TCE_FD }; @@ -237,7 +242,7 @@ enum IOMMUMemoryRegionAttr { */ typedef struct IOMMUMemoryRegionClass { /* private */ - struct DeviceClass parent_class; + MemoryRegionClass parent_class; /* * Return a TLB entry that contains a given address. diff --git a/memory.c b/memory.c index d4579bbaec..bf108b596e 100644 --- a/memory.c +++ b/memory.c @@ -3223,6 +3223,7 @@ void memory_region_init_rom_device(MemoryRegion *mr, static const TypeInfo memory_region_info = { .parent = TYPE_OBJECT, .name = TYPE_MEMORY_REGION, + .class_size = sizeof(MemoryRegionClass), .instance_size = sizeof(MemoryRegion), .instance_init = memory_region_initfn, .instance_finalize = memory_region_finalize, From patchwork Fri Jul 26 12:05:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 11060875 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0168613A0 for ; Fri, 26 Jul 2019 12:06:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E319628812 for ; Fri, 26 Jul 2019 12:06:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D35B728AA8; Fri, 26 Jul 2019 12:06:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9081A28812 for ; Fri, 26 Jul 2019 12:06:58 +0000 (UTC) Received: from localhost ([::1]:39242 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqyzx-0001BY-HS for patchwork-qemu-devel@patchwork.kernel.org; Fri, 26 Jul 2019 08:06:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58401) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqyys-0005Va-8h for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqyyq-0007tx-2L for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36298) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqyyp-0007pO-PT for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:47 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 91CED307D84B for ; Fri, 26 Jul 2019 12:05:45 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5FD971001938 for ; Fri, 26 Jul 2019 12:05:45 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 563FC1132E85; Fri, 26 Jul 2019 14:05:42 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 26 Jul 2019 14:05:19 +0200 Message-Id: <20190726120542.9894-6-armbru@redhat.com> In-Reply-To: <20190726120542.9894-1-armbru@redhat.com> References: <20190726120542.9894-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Fri, 26 Jul 2019 12:05:45 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 05/28] queue: Drop superfluous #include qemu/atomic.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP When commit 5f7d05ecfda added QLIST_INSERT_HEAD_RCU() to qemu/queue.h, it had to include qemu/atomic.h. Commit 341774fe6cc removed QLIST_INSERT_HEAD_RCU() again, but neglected to remove the #include. Do that now. Signed-off-by: Markus Armbruster Reviewed-by: Thomas Huth --- include/qemu/queue.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/qemu/queue.h b/include/qemu/queue.h index 0379bd8fdb..73bf4a984d 100644 --- a/include/qemu/queue.h +++ b/include/qemu/queue.h @@ -78,8 +78,6 @@ * For details on the use of these macros, see the queue(3) manual page. */ -#include "qemu/atomic.h" /* for smp_wmb() */ - /* * List definitions. */ From patchwork Fri Jul 26 12:05:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 11060887 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D0613746 for ; Fri, 26 Jul 2019 12:08:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C0E6428812 for ; Fri, 26 Jul 2019 12:08:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B510828AA8; Fri, 26 Jul 2019 12:08:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 64DA228812 for ; Fri, 26 Jul 2019 12:08:03 +0000 (UTC) Received: from localhost ([::1]:39274 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqz10-0005gP-6q for patchwork-qemu-devel@patchwork.kernel.org; Fri, 26 Jul 2019 08:08:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58528) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqyyu-0005Vm-AE for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqyys-00083o-0z for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44922) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqyyr-0007tX-JC for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:49 -0400 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 BF5A94628B for ; Fri, 26 Jul 2019 12:05:47 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 646D35DE6F; Fri, 26 Jul 2019 12:05:45 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 5B9A81132DDB; Fri, 26 Jul 2019 14:05:42 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 26 Jul 2019 14:05:20 +0200 Message-Id: <20190726120542.9894-7-armbru@redhat.com> In-Reply-To: <20190726120542.9894-1-armbru@redhat.com> References: <20190726120542.9894-1-armbru@redhat.com> MIME-Version: 1.0 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]); Fri, 26 Jul 2019 12:05:47 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 06/28] trace: Eliminate use of TARGET_FMT_plx X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Hajnoczi Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP hw/tpm/trace-events uses TARGET_FMT_plx formats with uint64_t arguments. That's wrong, TARGET_FMT_plx takes hwaddr. Since hwaddr happens to be uint64_t, it works anyway. Messed up in commit ec427498da5, v2.12.0. Clean up by replacing TARGET_FMT_plx with its macro expansion. scripts/tracetool/format/log_stap.py (commit 62dd1048c0b, v4.0.0) has a special case for TARGET_FMT_plx. Delete it. Cc: Stefan Hajnoczi Signed-off-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- hw/tpm/trace-events | 4 ++-- scripts/tracetool/format/log_stap.py | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/hw/tpm/trace-events b/hw/tpm/trace-events index 0b94aa1526..25e47a595a 100644 --- a/hw/tpm/trace-events +++ b/hw/tpm/trace-events @@ -1,8 +1,8 @@ # See docs/devel/tracing.txt for syntax documentation. # tpm_crb.c -tpm_crb_mmio_read(uint64_t addr, unsigned size, uint32_t val) "CRB read 0x" TARGET_FMT_plx " len:%u val: 0x%" PRIx32 -tpm_crb_mmio_write(uint64_t addr, unsigned size, uint32_t val) "CRB write 0x" TARGET_FMT_plx " len:%u val: 0x%" PRIx32 +tpm_crb_mmio_read(uint64_t addr, unsigned size, uint32_t val) "CRB read 0x016%" PRIx64 " len:%u val: 0x%" PRIx32 +tpm_crb_mmio_write(uint64_t addr, unsigned size, uint32_t val) "CRB write 0x%016" PRIx64 " len:%u val: 0x%" PRIx32 # tpm_passthrough.c tpm_passthrough_handle_request(void *cmd) "processing command %p" diff --git a/scripts/tracetool/format/log_stap.py b/scripts/tracetool/format/log_stap.py index 3ccbc09d61..9ab0cf2cce 100644 --- a/scripts/tracetool/format/log_stap.py +++ b/scripts/tracetool/format/log_stap.py @@ -30,9 +30,6 @@ def c_macro_to_format(macro): if macro.startswith("PRI"): return macro[3] - if macro == "TARGET_FMT_plx": - return "%016x" - raise Exception("Unhandled macro '%s'" % macro) def c_fmt_to_stap(fmt): From patchwork Fri Jul 26 12:05:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 11060905 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0B5E613A0 for ; Fri, 26 Jul 2019 12:08:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EED1128812 for ; Fri, 26 Jul 2019 12:08:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E325728AAB; Fri, 26 Jul 2019 12:08:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5AEFF28812 for ; Fri, 26 Jul 2019 12:08:56 +0000 (UTC) Received: from localhost ([::1]:39302 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqz1r-0000yX-8j for patchwork-qemu-devel@patchwork.kernel.org; Fri, 26 Jul 2019 08:08:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58598) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqyyx-0005Vr-DK for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:06:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqyyr-000818-Hl for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46006) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqyyr-0007v3-1S for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:49 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 12F375945D for ; Fri, 26 Jul 2019 12:05:48 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 81DA8600C4; Fri, 26 Jul 2019 12:05:45 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 6ACA31132CA2; Fri, 26 Jul 2019 14:05:42 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 26 Jul 2019 14:05:21 +0200 Message-Id: <20190726120542.9894-8-armbru@redhat.com> In-Reply-To: <20190726120542.9894-1-armbru@redhat.com> References: <20190726120542.9894-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Fri, 26 Jul 2019 12:05:48 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 07/28] trace: Do not include qom/cpu.h into generated trace.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Hajnoczi Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP docs/devel/tracing.txt explains "since many source files include trace.h, [the generated trace.h use] a minimum of types and other header files included to keep the namespace clean and compile times and dependencies down." Commit 4815185902 "trace: Add per-vCPU tracing states for events with the 'vcpu' property" made them all include qom/cpu.h via control-internal.h. qom/cpu.h in turn includes about thirty headers. Ouch. Per-vCPU tracing is currently not supported in sub-directories' trace-events. In other words, qom/cpu.h can only be used in trace-root.h, not in any trace.h. Split trace/control-vcpu.h off trace/control.h and trace/control-internal.h. Have the generated trace.h include trace/control.h (which no longer includes qom/cpu.h), and trace-root.h include trace/control-vcpu.h (which includes it). The resulting improvement is a bit disappointing: in my "build everything" tree, some 1100 out of 6600 objects (not counting tests and objects that don't depend on qemu/osdep.h) depend on a trace.h, and about 600 of them no longer depend on qom/cpu.h. But more than 1300 others depend on trace-root.h. More work is clearly needed. Left for another day. Cc: Stefan Hajnoczi Signed-off-by: Markus Armbruster --- block/block-backend.c | 1 + qom/object.c | 1 + scripts/tracetool/format/c.py | 1 + scripts/tracetool/format/h.py | 7 +++- trace/control-internal.h | 25 -------------- trace/control-vcpu.h | 63 +++++++++++++++++++++++++++++++++++ trace/control.h | 24 ------------- trace/qmp.c | 2 +- ui/vnc.c | 1 + 9 files changed, 74 insertions(+), 51 deletions(-) create mode 100644 trace/control-vcpu.h diff --git a/block/block-backend.c b/block/block-backend.c index 0056b526b8..6aed80bf0b 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -15,6 +15,7 @@ #include "block/block_int.h" #include "block/blockjob.h" #include "block/throttle-groups.h" +#include "hw/qdev-core.h" #include "sysemu/blockdev.h" #include "sysemu/sysemu.h" #include "qapi/error.h" diff --git a/qom/object.c b/qom/object.c index 3966a3d461..8dbf4a4fab 100644 --- a/qom/object.c +++ b/qom/object.c @@ -11,6 +11,7 @@ */ #include "qemu/osdep.h" +#include "hw/qdev-core.h" #include "qapi/error.h" #include "qom/object.h" #include "qom/object_interfaces.h" diff --git a/scripts/tracetool/format/c.py b/scripts/tracetool/format/c.py index 833c05a022..31207961b0 100644 --- a/scripts/tracetool/format/c.py +++ b/scripts/tracetool/format/c.py @@ -28,6 +28,7 @@ def generate(events, backend, group): out('/* This file is autogenerated by tracetool, do not edit. */', '', '#include "qemu/osdep.h"', + '#include "qemu/module.h"', '#include "%s"' % header, '') diff --git a/scripts/tracetool/format/h.py b/scripts/tracetool/format/h.py index 338a2365ee..5596b304e6 100644 --- a/scripts/tracetool/format/h.py +++ b/scripts/tracetool/format/h.py @@ -17,12 +17,17 @@ from tracetool import out def generate(events, backend, group): + if group == "root": + header = "trace/control-vcpu.h" + else: + header = "trace/control.h" + out('/* This file is autogenerated by tracetool, do not edit. */', '', '#ifndef TRACE_%s_GENERATED_TRACERS_H' % group.upper(), '#define TRACE_%s_GENERATED_TRACERS_H' % group.upper(), '', - '#include "trace/control.h"', + '#include "%s"' % header, '') for e in events: diff --git a/trace/control-internal.h b/trace/control-internal.h index c7fbe2d3bf..8b2b50a7cf 100644 --- a/trace/control-internal.h +++ b/trace/control-internal.h @@ -10,9 +10,6 @@ #ifndef TRACE__CONTROL_INTERNAL_H #define TRACE__CONTROL_INTERNAL_H -#include "qom/cpu.h" - - extern int trace_events_enabled_count; @@ -59,28 +56,6 @@ static inline bool trace_event_get_state_dynamic(TraceEvent *ev) return unlikely(trace_events_enabled_count) && *ev->dstate; } -static inline bool -trace_event_get_vcpu_state_dynamic_by_vcpu_id(CPUState *vcpu, - uint32_t vcpu_id) -{ - /* it's on fast path, avoid consistency checks (asserts) */ - if (unlikely(trace_events_enabled_count)) { - return test_bit(vcpu_id, vcpu->trace_dstate); - } else { - return false; - } -} - -static inline bool trace_event_get_vcpu_state_dynamic(CPUState *vcpu, - TraceEvent *ev) -{ - uint32_t vcpu_id; - assert(trace_event_is_vcpu(ev)); - vcpu_id = trace_event_get_vcpu_id(ev); - return trace_event_get_vcpu_state_dynamic_by_vcpu_id(vcpu, vcpu_id); -} - - void trace_event_register_group(TraceEvent **events); #endif /* TRACE__CONTROL_INTERNAL_H */ diff --git a/trace/control-vcpu.h b/trace/control-vcpu.h new file mode 100644 index 0000000000..a8f1035c2e --- /dev/null +++ b/trace/control-vcpu.h @@ -0,0 +1,63 @@ +/* + * Interface for configuring and controlling the state of tracing events. + * + * Copyright (C) 2011-2016 Lluís Vilanova + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ + +#ifndef TRACE__CONTROL_VCPU_H +#define TRACE__CONTROL_VCPU_H + +#include "control.h" +#include "event-internal.h" +#include "qom/cpu.h" + +/** + * trace_event_get_vcpu_state: + * @vcpu: Target vCPU. + * @id: Event identifier name. + * + * Get the tracing state of an event (both static and dynamic) for the given + * vCPU. + * + * If the event has the disabled property, the check will have no performance + * impact. + */ +#define trace_event_get_vcpu_state(vcpu, id) \ + ((id ##_ENABLED) && \ + trace_event_get_vcpu_state_dynamic_by_vcpu_id( \ + vcpu, _ ## id ## _EVENT.vcpu_id)) + +/** + * trace_event_get_vcpu_state_dynamic: + * + * Get the dynamic tracing state of an event for the given vCPU. + */ +static bool trace_event_get_vcpu_state_dynamic(CPUState *vcpu, TraceEvent *ev); + +#include "control-internal.h" + +static inline bool +trace_event_get_vcpu_state_dynamic_by_vcpu_id(CPUState *vcpu, + uint32_t vcpu_id) +{ + /* it's on fast path, avoid consistency checks (asserts) */ + if (unlikely(trace_events_enabled_count)) { + return test_bit(vcpu_id, vcpu->trace_dstate); + } else { + return false; + } +} + +static inline bool trace_event_get_vcpu_state_dynamic(CPUState *vcpu, + TraceEvent *ev) +{ + uint32_t vcpu_id; + assert(trace_event_is_vcpu(ev)); + vcpu_id = trace_event_get_vcpu_id(ev); + return trace_event_get_vcpu_state_dynamic_by_vcpu_id(vcpu, vcpu_id); +} + +#endif diff --git a/trace/control.h b/trace/control.h index 570492d6e8..1f81c491b6 100644 --- a/trace/control.h +++ b/trace/control.h @@ -119,22 +119,6 @@ static const char * trace_event_get_name(TraceEvent *ev); #define trace_event_get_state_backends(id) \ ((id ##_ENABLED) && id ##_BACKEND_DSTATE()) -/** - * trace_event_get_vcpu_state: - * @vcpu: Target vCPU. - * @id: Event identifier name. - * - * Get the tracing state of an event (both static and dynamic) for the given - * vCPU. - * - * If the event has the disabled property, the check will have no performance - * impact. - */ -#define trace_event_get_vcpu_state(vcpu, id) \ - ((id ##_ENABLED) && \ - trace_event_get_vcpu_state_dynamic_by_vcpu_id( \ - vcpu, _ ## id ## _EVENT.vcpu_id)) - /** * trace_event_get_state_static: * @id: Event identifier. @@ -155,14 +139,6 @@ static bool trace_event_get_state_static(TraceEvent *ev); */ static bool trace_event_get_state_dynamic(TraceEvent *ev); -/** - * trace_event_get_vcpu_state_dynamic: - * - * Get the dynamic tracing state of an event for the given vCPU. - */ -static bool trace_event_get_vcpu_state_dynamic(CPUState *vcpu, TraceEvent *ev); - - /** * trace_event_set_state_dynamic: * diff --git a/trace/qmp.c b/trace/qmp.c index ea99b00956..38246e1aa6 100644 --- a/trace/qmp.c +++ b/trace/qmp.c @@ -10,7 +10,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qapi/qapi-commands-trace.h" -#include "control.h" +#include "control-vcpu.h" static CPUState *get_cpu(bool has_vcpu, int vcpu, Error **errp) diff --git a/ui/vnc.c b/ui/vnc.c index 38f92bfca3..f47f726681 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -28,6 +28,7 @@ #include "vnc.h" #include "vnc-jobs.h" #include "trace.h" +#include "hw/qdev-core.h" #include "sysemu/sysemu.h" #include "qemu/error-report.h" #include "qemu/module.h" From patchwork Fri Jul 26 12:05:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 11060925 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C50BB13A0 for ; Fri, 26 Jul 2019 12:10:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B189F28812 for ; Fri, 26 Jul 2019 12:10:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A574B288C5; Fri, 26 Jul 2019 12:10:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 687FF28891 for ; Fri, 26 Jul 2019 12:10:36 +0000 (UTC) Received: from localhost ([::1]:39368 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqz3S-0007vq-E1 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 26 Jul 2019 08:10:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58932) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqyz4-0005kc-9k for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:06:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqyyr-00081M-It for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:06:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40558) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqyyq-0007rM-UW for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:49 -0400 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 5DAC7C024AF3 for ; Fri, 26 Jul 2019 12:05:46 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 81523983A for ; Fri, 26 Jul 2019 12:05:45 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 7A8E61132C2A; Fri, 26 Jul 2019 14:05:42 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 26 Jul 2019 14:05:22 +0200 Message-Id: <20190726120542.9894-9-armbru@redhat.com> In-Reply-To: <20190726120542.9894-1-armbru@redhat.com> References: <20190726120542.9894-1-armbru@redhat.com> MIME-Version: 1.0 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.32]); Fri, 26 Jul 2019 12:05:46 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 08/28] Include sysemu/reset.h a lot less X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP In my "build everything" tree, changing sysemu/reset.h triggers a recompile of some 2600 out of 6600 objects (not counting tests and objects that don't depend on qemu/osdep.h). The main culprit is hw/hw.h, which supposedly includes it for convenience. Include sysemu/reset.h only where it's needed. Touching it now recompiles less than 200 objects. Signed-off-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis --- hw/acpi/ich9.c | 2 ++ hw/acpi/piix4.c | 2 ++ hw/acpi/vmgenid.c | 1 + hw/arm/armv7m.c | 1 + hw/arm/boot.c | 1 + hw/arm/nseries.c | 1 + hw/arm/omap1.c | 1 + hw/arm/omap2.c | 1 + hw/arm/virt-acpi-build.c | 1 + hw/char/parallel.c | 1 + hw/char/serial.c | 1 + hw/core/generic-loader.c | 1 + hw/core/loader.c | 1 + hw/cris/boot.c | 1 + hw/display/cirrus_vga.c | 1 + hw/display/ramfb.c | 2 ++ hw/display/vga.c | 2 ++ hw/hppa/machine.c | 1 + hw/i386/acpi-build.c | 1 + hw/i386/pc.c | 1 + hw/ide/cmd646.c | 1 + hw/ide/piix.c | 1 + hw/ide/sii3112.c | 1 + hw/ide/via.c | 1 + hw/input/lm832x.c | 1 + hw/input/pckbd.c | 2 ++ hw/input/ps2.c | 2 ++ hw/input/tsc2005.c | 1 + hw/input/tsc210x.c | 1 + hw/intc/mips_gic.c | 1 + hw/intc/pnv_xive.c | 1 + hw/intc/spapr_xive.c | 1 + hw/intc/xics.c | 1 + hw/intc/xive.c | 1 + hw/isa/piix4.c | 1 + hw/isa/vt82c686.c | 1 + hw/lm32/lm32_boards.c | 1 + hw/lm32/milkymist.c | 1 + hw/microblaze/boot.c | 1 + hw/mips/cps.c | 1 + hw/mips/mips_fulong2e.c | 1 + hw/mips/mips_jazz.c | 1 + hw/mips/mips_malta.c | 1 + hw/mips/mips_mipssim.c | 2 ++ hw/mips/mips_r4k.c | 2 ++ hw/misc/vmcoreinfo.c | 1 + hw/moxie/moxiesim.c | 2 ++ hw/net/eepro100.c | 1 + hw/nios2/boot.c | 1 + hw/nvram/fw_cfg.c | 1 + hw/openrisc/openrisc_sim.c | 1 + hw/pci-host/bonito.c | 1 + hw/pci-host/piix.c | 1 + hw/ppc/e500.c | 1 + hw/ppc/mac_newworld.c | 1 + hw/ppc/mac_oldworld.c | 1 + hw/ppc/pnv.c | 1 + hw/ppc/pnv_core.c | 1 + hw/ppc/pnv_psi.c | 1 + hw/ppc/ppc405_boards.c | 2 ++ hw/ppc/ppc405_uc.c | 2 ++ hw/ppc/ppc440_bamboo.c | 1 + hw/ppc/ppc440_uc.c | 1 + hw/ppc/ppc4xx_devs.c | 2 ++ hw/ppc/ppc4xx_pci.c | 1 + hw/ppc/ppc_booke.c | 2 ++ hw/ppc/prep.c | 2 ++ hw/ppc/sam460ex.c | 1 + hw/ppc/spapr.c | 1 + hw/ppc/spapr_cpu_core.c | 2 ++ hw/ppc/spapr_drc.c | 1 + hw/ppc/virtex_ml507.c | 1 + hw/riscv/riscv_hart.c | 1 + hw/s390x/ipl.c | 1 + hw/s390x/s390-virtio-ccw.c | 1 + hw/sh4/r2d.c | 1 + hw/sparc/leon3.c | 2 ++ hw/sparc/sun4m.c | 2 ++ hw/sparc64/sparc64.c | 1 + hw/timer/etraxfs_timer.c | 1 + hw/timer/mc146818rtc.c | 1 + hw/tpm/tpm_ppi.c | 1 - hw/vfio/common.c | 1 + hw/watchdog/wdt_diag288.c | 1 + hw/xtensa/sim.c | 1 + hw/xtensa/xtfpga.c | 1 + include/hw/hw.h | 1 - target/i386/cpu.c | 1 + target/i386/hax-all.c | 1 + target/i386/kvm.c | 1 + target/s390x/cpu.c | 1 + vl.c | 1 + 92 files changed, 107 insertions(+), 2 deletions(-) diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c index e53dfe1ee3..b4d987c811 100644 --- a/hw/acpi/ich9.c +++ b/hw/acpi/ich9.c @@ -23,6 +23,7 @@ * 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 "hw/hw.h" #include "qapi/error.h" @@ -30,6 +31,7 @@ #include "hw/i386/pc.h" #include "hw/pci/pci.h" #include "qemu/timer.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "hw/acpi/acpi.h" #include "hw/acpi/tco.h" diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index ec4e186cec..a59e58d937 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -18,6 +18,7 @@ * 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 "hw/hw.h" #include "hw/i386/pc.h" @@ -25,6 +26,7 @@ #include "hw/i2c/pm_smbus.h" #include "hw/pci/pci.h" #include "hw/acpi/acpi.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "qapi/error.h" #include "qemu/range.h" diff --git a/hw/acpi/vmgenid.c b/hw/acpi/vmgenid.c index b891df375f..ed92ccc4b8 100644 --- a/hw/acpi/vmgenid.c +++ b/hw/acpi/vmgenid.c @@ -18,6 +18,7 @@ #include "hw/acpi/aml-build.h" #include "hw/acpi/vmgenid.h" #include "hw/nvram/fw_cfg.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" void vmgenid_build_acpi(VmGenIdState *vms, GArray *table_data, GArray *guid, diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c index b9efad6bac..4b2d8b6574 100644 --- a/hw/arm/armv7m.c +++ b/hw/arm/armv7m.c @@ -16,6 +16,7 @@ #include "hw/loader.h" #include "elf.h" #include "sysemu/qtest.h" +#include "sysemu/reset.h" #include "qemu/error-report.h" #include "qemu/module.h" #include "exec/address-spaces.h" diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 1fb24fbef2..7123fba777 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -18,6 +18,7 @@ #include "sysemu/kvm.h" #include "sysemu/sysemu.h" #include "sysemu/numa.h" +#include "sysemu/reset.h" #include "hw/boards.h" #include "hw/loader.h" #include "elf.h" diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c index 4a79f5c88b..3f3eca52e2 100644 --- a/hw/arm/nseries.c +++ b/hw/arm/nseries.c @@ -23,6 +23,7 @@ #include "cpu.h" #include "qemu/cutils.h" #include "qemu/bswap.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "hw/arm/omap.h" #include "hw/arm/boot.h" diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c index 28fbe275a8..beaddaf11f 100644 --- a/hw/arm/omap1.c +++ b/hw/arm/omap1.c @@ -29,6 +29,7 @@ #include "sysemu/sysemu.h" #include "hw/arm/soc_dma.h" #include "sysemu/qtest.h" +#include "sysemu/reset.h" #include "qemu/range.h" #include "hw/sysbus.h" #include "qemu/cutils.h" diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c index 87ced7f3a2..7d4cac1f46 100644 --- a/hw/arm/omap2.c +++ b/hw/arm/omap2.c @@ -23,6 +23,7 @@ #include "qapi/error.h" #include "cpu.h" #include "sysemu/qtest.h" +#include "sysemu/reset.h" #include "hw/boards.h" #include "hw/hw.h" #include "hw/arm/boot.h" diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 0afb372769..ad54d65ea0 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -44,6 +44,7 @@ #include "hw/pci/pci.h" #include "hw/arm/virt.h" #include "sysemu/numa.h" +#include "sysemu/reset.h" #include "kvm_arm.h" #define ARM_SPI_BASE 32 diff --git a/hw/char/parallel.c b/hw/char/parallel.c index 1cd4c54a02..fed15dc548 100644 --- a/hw/char/parallel.c +++ b/hw/char/parallel.c @@ -31,6 +31,7 @@ #include "chardev/char-fe.h" #include "hw/isa/isa.h" #include "hw/char/parallel.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "trace.h" diff --git a/hw/char/serial.c b/hw/char/serial.c index 7c42a2abfc..a9e42f7d97 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -28,6 +28,7 @@ #include "chardev/char-serial.h" #include "qapi/error.h" #include "qemu/timer.h" +#include "sysemu/reset.h" #include "qemu/error-report.h" #include "trace.h" diff --git a/hw/core/generic-loader.c b/hw/core/generic-loader.c index 79a493e577..579fe5ed32 100644 --- a/hw/core/generic-loader.c +++ b/hw/core/generic-loader.c @@ -34,6 +34,7 @@ #include "qom/cpu.h" #include "hw/sysbus.h" #include "sysemu/dma.h" +#include "sysemu/reset.h" #include "hw/loader.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/core/loader.c b/hw/core/loader.c index 425bf69a99..830845dd73 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -48,6 +48,7 @@ #include "hw/hw.h" #include "disas/disas.h" #include "monitor/monitor.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "uboot_image.h" #include "hw/loader.h" diff --git a/hw/cris/boot.c b/hw/cris/boot.c index 602f538ef6..d44fdec43f 100644 --- a/hw/cris/boot.c +++ b/hw/cris/boot.c @@ -29,6 +29,7 @@ #include "elf.h" #include "boot.h" #include "qemu/cutils.h" +#include "sysemu/reset.h" static void main_cpu_reset(void *opaque) { diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c index 2e4911a1e3..4ccf5b4f18 100644 --- a/hw/display/cirrus_vga.c +++ b/hw/display/cirrus_vga.c @@ -35,6 +35,7 @@ #include "qemu/osdep.h" #include "qemu/module.h" #include "qemu/units.h" +#include "sysemu/reset.h" #include "qapi/error.h" #include "trace.h" #include "hw/hw.h" diff --git a/hw/display/ramfb.c b/hw/display/ramfb.c index b4eb283ef8..6026a35b11 100644 --- a/hw/display/ramfb.c +++ b/hw/display/ramfb.c @@ -10,12 +10,14 @@ * This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. */ + #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/option.h" #include "hw/loader.h" #include "hw/display/ramfb.h" #include "ui/console.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" struct QEMU_PACKED RAMFBCfg { diff --git a/hw/display/vga.c b/hw/display/vga.c index 910a23c12e..4d3572891a 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.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 "qemu/units.h" +#include "sysemu/reset.h" #include "qapi/error.h" #include "hw/hw.h" #include "hw/display/vga.h" diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index 662838d83b..bc74438496 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -11,6 +11,7 @@ #include "hw/loader.h" #include "hw/boards.h" #include "qemu/error-report.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "hw/timer/mc146818rtc.h" #include "hw/ide.h" diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index d281ffa89e..53a41ace46 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -48,6 +48,7 @@ #include "hw/timer/mc146818rtc_regs.h" #include "hw/mem/memory-device.h" #include "sysemu/numa.h" +#include "sysemu/reset.h" /* Supported chipsets: */ #include "hw/acpi/piix4.h" diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 549c437050..73b55500b0 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -54,6 +54,7 @@ #include "sysemu/numa.h" #include "sysemu/kvm.h" #include "sysemu/qtest.h" +#include "sysemu/reset.h" #include "kvm_i386.h" #include "hw/xen/xen.h" #include "hw/xen/start_info.h" diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index ed23aabf21..e5542c9811 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -30,6 +30,7 @@ #include "hw/isa/isa.h" #include "sysemu/sysemu.h" #include "sysemu/dma.h" +#include "sysemu/reset.h" #include "hw/ide/pci.h" #include "trace.h" diff --git a/hw/ide/piix.c b/hw/ide/piix.c index b97e555072..c4c6d4b760 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -31,6 +31,7 @@ #include "sysemu/sysemu.h" #include "sysemu/blockdev.h" #include "sysemu/dma.h" +#include "sysemu/reset.h" #include "hw/ide/pci.h" #include "trace.h" diff --git a/hw/ide/sii3112.c b/hw/ide/sii3112.c index d7590d4ba4..2181260531 100644 --- a/hw/ide/sii3112.c +++ b/hw/ide/sii3112.c @@ -15,6 +15,7 @@ #include "qemu/osdep.h" #include "hw/ide/pci.h" #include "qemu/module.h" +#include "sysemu/reset.h" #include "trace.h" #define TYPE_SII3112_PCI "sii3112" diff --git a/hw/ide/via.c b/hw/ide/via.c index c3bda909f9..6d54ac55f0 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -30,6 +30,7 @@ #include "qemu/module.h" #include "sysemu/sysemu.h" #include "sysemu/dma.h" +#include "sysemu/reset.h" #include "hw/ide/pci.h" #include "trace.h" diff --git a/hw/input/lm832x.c b/hw/input/lm832x.c index 5203da2bcf..ebb72c6590 100644 --- a/hw/input/lm832x.c +++ b/hw/input/lm832x.c @@ -23,6 +23,7 @@ #include "hw/i2c/i2c.h" #include "qemu/module.h" #include "qemu/timer.h" +#include "sysemu/reset.h" #include "ui/console.h" #define TYPE_LM8323 "lm8323" diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c index 47a606f5e3..5d06a53362 100644 --- a/hw/input/pckbd.c +++ b/hw/input/pckbd.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/log.h" #include "hw/hw.h" @@ -28,6 +29,7 @@ #include "hw/i386/pc.h" #include "hw/input/ps2.h" #include "hw/input/i8042.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "trace.h" diff --git a/hw/input/ps2.c b/hw/input/ps2.c index d3161f1e7c..8d922b05c9 100644 --- a/hw/input/ps2.c +++ b/hw/input/ps2.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 "qemu/log.h" #include "hw/hw.h" #include "hw/input/ps2.h" #include "ui/console.h" #include "ui/input.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "trace.h" diff --git a/hw/input/tsc2005.c b/hw/input/tsc2005.c index f82771e7a7..0a0431744c 100644 --- a/hw/input/tsc2005.c +++ b/hw/input/tsc2005.c @@ -22,6 +22,7 @@ #include "qemu/log.h" #include "hw/hw.h" #include "qemu/timer.h" +#include "sysemu/reset.h" #include "ui/console.h" #include "hw/input/tsc2xxx.h" #include "trace.h" diff --git a/hw/input/tsc210x.c b/hw/input/tsc210x.c index f94cb4683b..d2486f4b4e 100644 --- a/hw/input/tsc210x.c +++ b/hw/input/tsc210x.c @@ -23,6 +23,7 @@ #include "hw/hw.h" #include "audio/audio.h" #include "qemu/timer.h" +#include "sysemu/reset.h" #include "ui/console.h" #include "hw/arm/omap.h" /* For I2SCodec */ #include "hw/input/tsc2xxx.h" diff --git a/hw/intc/mips_gic.c b/hw/intc/mips_gic.c index 33ab51c5b8..e27e333766 100644 --- a/hw/intc/mips_gic.c +++ b/hw/intc/mips_gic.c @@ -18,6 +18,7 @@ #include "exec/memory.h" #include "sysemu/sysemu.h" #include "sysemu/kvm.h" +#include "sysemu/reset.h" #include "kvm_mips.h" #include "hw/intc/mips_gic.h" diff --git a/hw/intc/pnv_xive.c b/hw/intc/pnv_xive.c index 4dc92ef1e3..63b0f461ec 100644 --- a/hw/intc/pnv_xive.c +++ b/hw/intc/pnv_xive.c @@ -14,6 +14,7 @@ #include "target/ppc/cpu.h" #include "sysemu/cpus.h" #include "sysemu/dma.h" +#include "sysemu/reset.h" #include "monitor/monitor.h" #include "hw/ppc/fdt.h" #include "hw/ppc/pnv.h" diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c index 3ae311d9ff..2e39cc1e47 100644 --- a/hw/intc/spapr_xive.c +++ b/hw/intc/spapr_xive.c @@ -14,6 +14,7 @@ #include "qemu/error-report.h" #include "target/ppc/cpu.h" #include "sysemu/cpus.h" +#include "sysemu/reset.h" #include "monitor/monitor.h" #include "hw/ppc/fdt.h" #include "hw/ppc/spapr.h" diff --git a/hw/intc/xics.c b/hw/intc/xics.c index faa976e2f8..9ed224ce5f 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -38,6 +38,7 @@ #include "monitor/monitor.h" #include "hw/intc/intc.h" #include "sysemu/kvm.h" +#include "sysemu/reset.h" void icp_pic_print_info(ICPState *icp, Monitor *mon) { diff --git a/hw/intc/xive.c b/hw/intc/xive.c index cf77bdb7d3..b27d6b8646 100644 --- a/hw/intc/xive.c +++ b/hw/intc/xive.c @@ -14,6 +14,7 @@ #include "target/ppc/cpu.h" #include "sysemu/cpus.h" #include "sysemu/dma.h" +#include "sysemu/reset.h" #include "hw/qdev-properties.h" #include "monitor/monitor.h" #include "hw/ppc/xive.h" diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c index 6b8bc3faf0..3677976ef7 100644 --- a/hw/isa/piix4.c +++ b/hw/isa/piix4.c @@ -28,6 +28,7 @@ #include "hw/pci/pci.h" #include "hw/isa/isa.h" #include "hw/sysbus.h" +#include "sysemu/reset.h" PCIDevice *piix4_dev; diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 12c460590f..81bffb1fb9 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -22,6 +22,7 @@ #include "hw/isa/apm.h" #include "hw/acpi/acpi.h" #include "hw/i2c/pm_smbus.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "qemu/module.h" #include "qemu/timer.h" diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c index fb9d52d54f..e075ebc8a6 100644 --- a/hw/lm32/lm32_boards.c +++ b/hw/lm32/lm32_boards.c @@ -30,6 +30,7 @@ #include "lm32_hwsetup.h" #include "lm32.h" #include "exec/address-spaces.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" typedef struct { diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c index 689e633199..33669ee19b 100644 --- a/hw/lm32/milkymist.c +++ b/hw/lm32/milkymist.c @@ -27,6 +27,7 @@ #include "hw/block/flash.h" #include "sysemu/sysemu.h" #include "sysemu/qtest.h" +#include "sysemu/reset.h" #include "hw/boards.h" #include "hw/loader.h" #include "elf.h" diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c index a7af4c0704..bade4d22c0 100644 --- a/hw/microblaze/boot.c +++ b/hw/microblaze/boot.c @@ -31,6 +31,7 @@ #include "qemu/config-file.h" #include "qemu/error-report.h" #include "sysemu/device_tree.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "hw/loader.h" #include "elf.h" diff --git a/hw/mips/cps.c b/hw/mips/cps.c index 0d459c4141..aea6bcd7fe 100644 --- a/hw/mips/cps.c +++ b/hw/mips/cps.c @@ -24,6 +24,7 @@ #include "hw/mips/mips.h" #include "hw/mips/cpudevs.h" #include "sysemu/kvm.h" +#include "sysemu/reset.h" qemu_irq get_cps_irq(MIPSCPSState *s, int pin_number) { diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c index 5dbaa3bfcc..0a1bf5ef5c 100644 --- a/hw/mips/mips_fulong2e.c +++ b/hw/mips/mips_fulong2e.c @@ -44,6 +44,7 @@ #include "hw/timer/i8254.h" #include "exec/address-spaces.h" #include "sysemu/qtest.h" +#include "sysemu/reset.h" #include "qemu/error-report.h" #define DEBUG_FULONG2E_INIT diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c index fa8775d428..6ea25cd5f4 100644 --- a/hw/mips/mips_jazz.c +++ b/hw/mips/mips_jazz.c @@ -48,6 +48,7 @@ #include "hw/sysbus.h" #include "exec/address-spaces.h" #include "sysemu/qtest.h" +#include "sysemu/reset.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/help_option.h" diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 20e019bf66..29bc8de5cf 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 "sysemu/reset.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "hw/empty_slot.h" diff --git a/hw/mips/mips_mipssim.c b/hw/mips/mips_mipssim.c index 824abda657..280e76a482 100644 --- a/hw/mips/mips_mipssim.c +++ b/hw/mips/mips_mipssim.c @@ -24,6 +24,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" @@ -43,6 +44,7 @@ #include "exec/address-spaces.h" #include "qemu/error-report.h" #include "sysemu/qtest.h" +#include "sysemu/reset.h" static struct _loaderparams { int ram_size; diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c index 93dbf76bb4..191047826d 100644 --- a/hw/mips/mips_r4k.c +++ b/hw/mips/mips_r4k.c @@ -7,6 +7,7 @@ * All peripherial devices are attached to this "bus" with * the standard PC ISA addresses. */ + #include "qemu/osdep.h" #include "qemu/units.h" #include "qapi/error.h" @@ -33,6 +34,7 @@ #include "hw/timer/i8254.h" #include "exec/address-spaces.h" #include "sysemu/qtest.h" +#include "sysemu/reset.h" #include "qemu/error-report.h" #define MAX_IDE_BUS 2 diff --git a/hw/misc/vmcoreinfo.c b/hw/misc/vmcoreinfo.c index 987d6f52af..49e87d462b 100644 --- a/hw/misc/vmcoreinfo.c +++ b/hw/misc/vmcoreinfo.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/module.h" +#include "sysemu/reset.h" #include "hw/nvram/fw_cfg.h" #include "hw/misc/vmcoreinfo.h" diff --git a/hw/moxie/moxiesim.c b/hw/moxie/moxiesim.c index d771d393c2..16a7d58274 100644 --- a/hw/moxie/moxiesim.c +++ b/hw/moxie/moxiesim.c @@ -24,6 +24,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "qemu/error-report.h" #include "qapi/error.h" @@ -31,6 +32,7 @@ #include "hw/sysbus.h" #include "hw/hw.h" #include "net/net.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "hw/boards.h" #include "hw/loader.h" diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c index 6607c9142d..e0cf0c46d7 100644 --- a/hw/net/eepro100.c +++ b/hw/net/eepro100.c @@ -49,6 +49,7 @@ #include "hw/nvram/eeprom93xx.h" #include "sysemu/sysemu.h" #include "sysemu/dma.h" +#include "sysemu/reset.h" #include "qemu/bitops.h" #include "qemu/module.h" #include "qapi/error.h" diff --git a/hw/nios2/boot.c b/hw/nios2/boot.c index 276068c842..d78bc9ed0e 100644 --- a/hw/nios2/boot.c +++ b/hw/nios2/boot.c @@ -36,6 +36,7 @@ #include "qemu/config-file.h" #include "qemu/error-report.h" #include "sysemu/device_tree.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "hw/loader.h" #include "elf.h" diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index dcfd6d2ed3..3032f1c65f 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -27,6 +27,7 @@ #include "hw/hw.h" #include "sysemu/sysemu.h" #include "sysemu/dma.h" +#include "sysemu/reset.h" #include "hw/boards.h" #include "hw/nvram/fw_cfg.h" #include "hw/sysbus.h" diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c index b85f0df323..cb2fc5ba78 100644 --- a/hw/openrisc/openrisc_sim.c +++ b/hw/openrisc/openrisc_sim.c @@ -32,6 +32,7 @@ #include "sysemu/sysemu.h" #include "hw/sysbus.h" #include "sysemu/qtest.h" +#include "sysemu/reset.h" #define KERNEL_LOAD_ADDR 0x100 diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index dde4437595..36c7ca45ad 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -44,6 +44,7 @@ #include "hw/i386/pc.h" #include "hw/mips/mips.h" #include "hw/pci/pci_host.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "exec/address-spaces.h" diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index d9c70f7ce6..f3671d28b7 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -33,6 +33,7 @@ #include "qemu/range.h" #include "hw/xen/xen.h" #include "hw/pci-host/pam.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "hw/i386/ioapic.h" #include "qapi/visitor.h" diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index a3eac7f057..566f179bb1 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -28,6 +28,7 @@ #include "hw/boards.h" #include "sysemu/sysemu.h" #include "sysemu/kvm.h" +#include "sysemu/reset.h" #include "kvm_ppc.h" #include "sysemu/device_tree.h" #include "hw/ppc/openpic.h" diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index 09bc6068f3..0f9f351eb1 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -68,6 +68,7 @@ #include "elf.h" #include "qemu/error-report.h" #include "sysemu/kvm.h" +#include "sysemu/reset.h" #include "kvm_ppc.h" #include "hw/usb.h" #include "exec/address-spaces.h" diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c index 9ffde5b6f7..6640057473 100644 --- a/hw/ppc/mac_oldworld.c +++ b/hw/ppc/mac_oldworld.c @@ -47,6 +47,7 @@ #include "elf.h" #include "qemu/error-report.h" #include "sysemu/kvm.h" +#include "sysemu/reset.h" #include "kvm_ppc.h" #include "exec/address-spaces.h" diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index bd4531c822..96608883aa 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -23,6 +23,7 @@ #include "qapi/error.h" #include "sysemu/sysemu.h" #include "sysemu/numa.h" +#include "sysemu/reset.h" #include "sysemu/cpus.h" #include "sysemu/device_tree.h" #include "hw/hw.h" diff --git a/hw/ppc/pnv_core.c b/hw/ppc/pnv_core.c index c6411ecc1d..ff477ba6c9 100644 --- a/hw/ppc/pnv_core.c +++ b/hw/ppc/pnv_core.c @@ -18,6 +18,7 @@ */ #include "qemu/osdep.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "qapi/error.h" #include "qemu/log.h" diff --git a/hw/ppc/pnv_psi.c b/hw/ppc/pnv_psi.c index d7b6f5d75b..6b26d0f6bc 100644 --- a/hw/ppc/pnv_psi.c +++ b/hw/ppc/pnv_psi.c @@ -22,6 +22,7 @@ #include "target/ppc/cpu.h" #include "qemu/log.h" #include "qemu/module.h" +#include "sysemu/reset.h" #include "qapi/error.h" #include "monitor/monitor.h" diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c index 13318a9faf..5b278e7791 100644 --- a/hw/ppc/ppc405_boards.c +++ b/hw/ppc/ppc405_boards.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/units.h" #include "qapi/error.h" @@ -33,6 +34,7 @@ #include "hw/block/flash.h" #include "sysemu/sysemu.h" #include "sysemu/qtest.h" +#include "sysemu/reset.h" #include "sysemu/block-backend.h" #include "hw/boards.h" #include "qemu/log.h" diff --git a/hw/ppc/ppc405_uc.c b/hw/ppc/ppc405_uc.c index edb6b2d190..f9d98fe71e 100644 --- a/hw/ppc/ppc405_uc.c +++ b/hw/ppc/ppc405_uc.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/units.h" #include "qapi/error.h" @@ -32,6 +33,7 @@ #include "ppc405.h" #include "hw/char/serial.h" #include "qemu/timer.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "qemu/log.h" #include "exec/address-spaces.h" diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c index b4da099e3e..1bd92aa749 100644 --- a/hw/ppc/ppc440_bamboo.c +++ b/hw/ppc/ppc440_bamboo.c @@ -31,6 +31,7 @@ #include "ppc405.h" #include "sysemu/sysemu.h" #include "sysemu/qtest.h" +#include "sysemu/reset.h" #include "hw/sysbus.h" #define BINARY_DEVICE_TREE_FILE "bamboo.dtb" diff --git a/hw/ppc/ppc440_uc.c b/hw/ppc/ppc440_uc.c index 5c1a53d6e7..7329cfe651 100644 --- a/hw/ppc/ppc440_uc.c +++ b/hw/ppc/ppc440_uc.c @@ -21,6 +21,7 @@ #include "hw/ppc/ppc.h" #include "hw/pci/pci.h" #include "sysemu/block-backend.h" +#include "sysemu/reset.h" #include "ppc440.h" /*****************************************************************************/ diff --git a/hw/ppc/ppc4xx_devs.c b/hw/ppc/ppc4xx_devs.c index fdfeb67e65..e62bef3b8d 100644 --- a/hw/ppc/ppc4xx_devs.c +++ b/hw/ppc/ppc4xx_devs.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 "qemu/units.h" +#include "sysemu/reset.h" #include "cpu.h" #include "hw/hw.h" #include "hw/ppc/ppc.h" diff --git a/hw/ppc/ppc4xx_pci.c b/hw/ppc/ppc4xx_pci.c index e7cf8d50a5..b013319c60 100644 --- a/hw/ppc/ppc4xx_pci.c +++ b/hw/ppc/ppc4xx_pci.c @@ -24,6 +24,7 @@ #include "hw/ppc/ppc.h" #include "hw/ppc/ppc4xx.h" #include "qemu/module.h" +#include "sysemu/reset.h" #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" #include "exec/address-spaces.h" diff --git a/hw/ppc/ppc_booke.c b/hw/ppc/ppc_booke.c index 18d1457581..ba5f513ca5 100644 --- a/hw/ppc/ppc_booke.c +++ b/hw/ppc/ppc_booke.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 "cpu.h" #include "hw/hw.h" #include "hw/ppc/ppc.h" #include "qemu/timer.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "qemu/log.h" #include "hw/loader.h" diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index ab3c1df1fc..84e968e28c 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.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 "cpu.h" #include "hw/hw.h" @@ -45,6 +46,7 @@ #include "sysemu/arch_init.h" #include "sysemu/kvm.h" #include "sysemu/qtest.h" +#include "sysemu/reset.h" #include "exec/address-spaces.h" #include "trace.h" #include "elf.h" diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c index fbcddc5b00..c1d6f74d5b 100644 --- a/hw/ppc/sam460ex.c +++ b/hw/ppc/sam460ex.c @@ -31,6 +31,7 @@ #include "hw/block/flash.h" #include "sysemu/sysemu.h" #include "sysemu/qtest.h" +#include "sysemu/reset.h" #include "hw/sysbus.h" #include "hw/char/serial.h" #include "hw/i2c/ppc4xx_i2c.h" diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 821f0d4a49..5cade1a374 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -31,6 +31,7 @@ #include "sysemu/sysemu.h" #include "sysemu/numa.h" #include "sysemu/qtest.h" +#include "sysemu/reset.h" #include "hw/hw.h" #include "qemu/log.h" #include "hw/fw-path-provider.h" diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c index 5621fb9a3d..ccc8970c7c 100644 --- a/hw/ppc/spapr_cpu_core.c +++ b/hw/ppc/spapr_cpu_core.c @@ -6,6 +6,7 @@ * This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. */ + #include "qemu/osdep.h" #include "hw/cpu/core.h" #include "hw/ppc/spapr_cpu_core.h" @@ -19,6 +20,7 @@ #include "hw/ppc/ppc.h" #include "target/ppc/mmu-hash64.h" #include "sysemu/numa.h" +#include "sysemu/reset.h" #include "sysemu/hw_accel.h" #include "qemu/error-report.h" diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c index bacadfcac5..678493a9c5 100644 --- a/hw/ppc/spapr_drc.c +++ b/hw/ppc/spapr_drc.c @@ -23,6 +23,7 @@ #include "hw/ppc/spapr.h" /* for RTAS return codes */ #include "hw/pci-host/spapr.h" /* spapr_phb_remove_pci_device_cb callback */ #include "sysemu/device_tree.h" +#include "sysemu/reset.h" #include "trace.h" #define DRC_CONTAINER_PATH "/dr-connector" diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c index 834053a7d2..06f5a28601 100644 --- a/hw/ppc/virtex_ml507.c +++ b/hw/ppc/virtex_ml507.c @@ -32,6 +32,7 @@ #include "hw/block/flash.h" #include "sysemu/sysemu.h" #include "sysemu/qtest.h" +#include "sysemu/reset.h" #include "hw/boards.h" #include "sysemu/device_tree.h" #include "hw/loader.h" diff --git a/hw/riscv/riscv_hart.c b/hw/riscv/riscv_hart.c index ca69a1bcd8..61bd4d5170 100644 --- a/hw/riscv/riscv_hart.c +++ b/hw/riscv/riscv_hart.c @@ -21,6 +21,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/module.h" +#include "sysemu/reset.h" #include "hw/sysbus.h" #include "target/riscv/cpu.h" #include "hw/riscv/riscv_hart.h" diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index 60bd081d3e..2e5ce11a6b 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -14,6 +14,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "qapi/error.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "sysemu/tcg.h" #include "cpu.h" diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 5b6a9a4e55..4ffdd53a85 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -27,6 +27,7 @@ #include "qemu/error-report.h" #include "qemu/option.h" #include "s390-pci-bus.h" +#include "sysemu/reset.h" #include "hw/s390x/storage-keys.h" #include "hw/s390x/storage-attributes.h" #include "hw/s390x/event-facility.h" diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c index f22c79c867..da79bf0337 100644 --- a/hw/sh4/r2d.c +++ b/hw/sh4/r2d.c @@ -30,6 +30,7 @@ #include "hw/sysbus.h" #include "hw/hw.h" #include "hw/sh4/sh.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "hw/boards.h" #include "hw/pci/pci.h" diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c index 19cedebd16..c7ddfa2cfe 100644 --- a/hw/sparc/leon3.c +++ b/hw/sparc/leon3.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/units.h" #include "qemu/error-report.h" @@ -32,6 +33,7 @@ #include "hw/ptimer.h" #include "sysemu/sysemu.h" #include "sysemu/qtest.h" +#include "sysemu/reset.h" #include "hw/boards.h" #include "hw/loader.h" #include "elf.h" diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index b2342f2a89..93a69c12fb 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.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/units.h" #include "qapi/error.h" @@ -33,6 +34,7 @@ #include "hw/timer/m48t59.h" #include "hw/sparc/sparc32_dma.h" #include "hw/block/fdc.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "net/net.h" #include "hw/boards.h" diff --git a/hw/sparc64/sparc64.c b/hw/sparc64/sparc64.c index 689801f37d..100b2fab17 100644 --- a/hw/sparc64/sparc64.c +++ b/hw/sparc64/sparc64.c @@ -28,6 +28,7 @@ #include "hw/char/serial.h" #include "hw/sparc/sparc64.h" #include "qemu/timer.h" +#include "sysemu/reset.h" #include "trace.h" diff --git a/hw/timer/etraxfs_timer.c b/hw/timer/etraxfs_timer.c index 53834e197f..18887b2be2 100644 --- a/hw/timer/etraxfs_timer.c +++ b/hw/timer/etraxfs_timer.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "qemu/module.h" #include "qemu/timer.h" diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index ce4550b6f2..21fcba5e3a 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -31,6 +31,7 @@ #include "qemu/timer.h" #include "sysemu/sysemu.h" #include "sysemu/replay.h" +#include "sysemu/reset.h" #include "hw/timer/mc146818rtc.h" #include "qapi/error.h" #include "qapi/qapi-commands-misc-target.h" diff --git a/hw/tpm/tpm_ppi.c b/hw/tpm/tpm_ppi.c index cd8205f212..ff314592b4 100644 --- a/hw/tpm/tpm_ppi.c +++ b/hw/tpm/tpm_ppi.c @@ -16,7 +16,6 @@ #include "qapi/error.h" #include "cpu.h" #include "sysemu/memory_mapping.h" -#include "sysemu/reset.h" #include "migration/vmstate.h" #include "tpm_ppi.h" #include "trace.h" diff --git a/hw/vfio/common.c b/hw/vfio/common.c index a859298fda..a363b4495f 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -34,6 +34,7 @@ #include "qemu/range.h" #include "sysemu/balloon.h" #include "sysemu/kvm.h" +#include "sysemu/reset.h" #include "trace.h" #include "qapi/error.h" diff --git a/hw/watchdog/wdt_diag288.c b/hw/watchdog/wdt_diag288.c index 29e5b5dcf6..fec046ef09 100644 --- a/hw/watchdog/wdt_diag288.c +++ b/hw/watchdog/wdt_diag288.c @@ -12,6 +12,7 @@ */ #include "qemu/osdep.h" +#include "sysemu/reset.h" #include "sysemu/watchdog.h" #include "hw/sysbus.h" #include "qemu/timer.h" diff --git a/hw/xtensa/sim.c b/hw/xtensa/sim.c index 09165b6f4d..981dbb7bbe 100644 --- a/hw/xtensa/sim.c +++ b/hw/xtensa/sim.c @@ -28,6 +28,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "cpu.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "hw/boards.h" #include "hw/loader.h" diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c index f7f3e11e93..0a2cce3c64 100644 --- a/hw/xtensa/xtfpga.c +++ b/hw/xtensa/xtfpga.c @@ -41,6 +41,7 @@ #include "hw/block/flash.h" #include "chardev/char.h" #include "sysemu/device_tree.h" +#include "sysemu/reset.h" #include "qemu/error-report.h" #include "qemu/option.h" #include "bootparam.h" diff --git a/include/hw/hw.h b/include/hw/hw.h index b1b79964b5..a4fb2390e8 100644 --- a/include/hw/hw.h +++ b/include/hw/hw.h @@ -12,7 +12,6 @@ #include "hw/irq.h" #include "migration/vmstate.h" #include "migration/qemu-file-types.h" -#include "sysemu/reset.h" void QEMU_NORETURN hw_error(const char *fmt, ...) GCC_FMT_ATTR(1, 2); diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 805ce95247..97405186ba 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -26,6 +26,7 @@ #include "cpu.h" #include "exec/exec-all.h" #include "sysemu/kvm.h" +#include "sysemu/reset.h" #include "sysemu/hvf.h" #include "sysemu/cpus.h" #include "kvm_i386.h" diff --git a/target/i386/hax-all.c b/target/i386/hax-all.c index 9e7b77965d..bcacdd1d8f 100644 --- a/target/i386/hax-all.c +++ b/target/i386/hax-all.c @@ -30,6 +30,7 @@ #include "qemu-common.h" #include "hax-i386.h" #include "sysemu/accel.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "qemu/main-loop.h" #include "hw/boards.h" diff --git a/target/i386/kvm.c b/target/i386/kvm.c index ec7870c6af..38be57f2da 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -24,6 +24,7 @@ #include "sysemu/sysemu.h" #include "sysemu/hw_accel.h" #include "sysemu/kvm_int.h" +#include "sysemu/reset.h" #include "kvm_i386.h" #include "hyperv.h" #include "hyperv-proto.h" diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index 736a7903e2..3caba8d5e1 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -26,6 +26,7 @@ #include "internal.h" #include "kvm_s390x.h" #include "sysemu/kvm.h" +#include "sysemu/reset.h" #include "qemu/timer.h" #include "qemu/error-report.h" #include "qemu/module.h" diff --git a/vl.c b/vl.c index 53335a5470..ed2589817e 100644 --- a/vl.c +++ b/vl.c @@ -30,6 +30,7 @@ #include "qemu/cutils.h" #include "qemu/help_option.h" #include "qemu/uuid.h" +#include "sysemu/reset.h" #include "sysemu/seccomp.h" #include "sysemu/tcg.h" From patchwork Fri Jul 26 12:05:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 11060885 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BD8CA746 for ; Fri, 26 Jul 2019 12:07:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AD60328812 for ; Fri, 26 Jul 2019 12:07:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A142328AA8; Fri, 26 Jul 2019 12:07:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B656728812 for ; Fri, 26 Jul 2019 12:07:57 +0000 (UTC) Received: from localhost ([::1]:39270 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqz0u-0005G2-Lf for patchwork-qemu-devel@patchwork.kernel.org; Fri, 26 Jul 2019 08:07:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58525) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqyyv-0005Vl-7u for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqyyq-0007vV-AP for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59172) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqyyp-0007qx-VK for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:48 -0400 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 E7026859FE for ; Fri, 26 Jul 2019 12:05:45 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8A07736FB for ; Fri, 26 Jul 2019 12:05:45 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 86DD71132C38; Fri, 26 Jul 2019 14:05:42 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 26 Jul 2019 14:05:23 +0200 Message-Id: <20190726120542.9894-10-armbru@redhat.com> In-Reply-To: <20190726120542.9894-1-armbru@redhat.com> References: <20190726120542.9894-1-armbru@redhat.com> MIME-Version: 1.0 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.26]); Fri, 26 Jul 2019 12:05:45 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 09/28] Include migration/qemu-file-types.h a lot less X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP In my "build everything" tree, changing migration/qemu-file-types.h triggers a recompile of some 2600 out of 6600 objects (not counting tests and objects that don't depend on qemu/osdep.h). The culprit is again hw/hw.h, which supposedly includes it for convenience. Include migration/qemu-file-types.h only where it's needed. Touching it now recompiles less than 200 objects. Signed-off-by: Markus Armbruster --- hw/acpi/piix4.c | 1 + hw/block/virtio-blk.c | 1 + hw/char/virtio-serial-bus.c | 1 + hw/display/virtio-gpu.c | 1 + hw/intc/apic_common.c | 1 + hw/nvram/eeprom93xx.c | 1 + hw/nvram/fw_cfg.c | 1 + hw/pci-host/piix.c | 1 + hw/pci/msix.c | 1 + hw/pci/pci.c | 1 + hw/pci/shpc.c | 1 + hw/ppc/spapr.c | 1 + hw/s390x/s390-skeys.c | 1 + hw/s390x/tod.c | 1 + hw/s390x/virtio-ccw.c | 1 + hw/scsi/mptsas.c | 1 + hw/scsi/scsi-bus.c | 1 + hw/scsi/scsi-disk.c | 1 + hw/scsi/scsi-generic.c | 1 + hw/scsi/virtio-scsi.c | 1 + hw/timer/i8254_common.c | 1 + hw/timer/twl92230.c | 1 + hw/usb/redirect.c | 1 + hw/virtio/vhost.c | 1 + hw/virtio/virtio-mmio.c | 1 + hw/virtio/virtio-pci.c | 1 + hw/virtio/virtio.c | 1 + include/hw/hw.h | 1 - include/migration/cpu.h | 1 + 29 files changed, 28 insertions(+), 1 deletion(-) diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index a59e58d937..0d8c821f37 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -40,6 +40,7 @@ #include "hw/acpi/memory_hotplug.h" #include "hw/acpi/acpi_dev_interface.h" #include "hw/xen/xen.h" +#include "migration/qemu-file-types.h" #include "qom/cpu.h" #include "trace.h" diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index cbb3729158..1f40834d27 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -26,6 +26,7 @@ # include #endif #include "hw/virtio/virtio-bus.h" +#include "migration/qemu-file-types.h" #include "hw/virtio/virtio-access.h" /* Config size before the discard support (hide associated config fields) */ diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c index f7a54f261b..b868e54d72 100644 --- a/hw/char/virtio-serial-bus.c +++ b/hw/char/virtio-serial-bus.c @@ -22,6 +22,7 @@ #include "qapi/error.h" #include "qemu/iov.h" #include "qemu/module.h" +#include "migration/qemu-file-types.h" #include "monitor/monitor.h" #include "qemu/error-report.h" #include "qemu/queue.h" diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index 25d9e327fc..ed92071963 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -18,6 +18,7 @@ #include "trace.h" #include "sysemu/dma.h" #include "hw/virtio/virtio.h" +#include "migration/qemu-file-types.h" #include "hw/virtio/virtio-gpu.h" #include "hw/virtio/virtio-gpu-bswap.h" #include "hw/virtio/virtio-gpu-pixman.h" diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c index e764a2bb03..7045761281 100644 --- a/hw/intc/apic_common.c +++ b/hw/intc/apic_common.c @@ -31,6 +31,7 @@ #include "sysemu/kvm.h" #include "hw/qdev.h" #include "hw/sysbus.h" +#include "migration/qemu-file-types.h" static int apic_irq_delivered; bool apic_report_tpr_access; diff --git a/hw/nvram/eeprom93xx.c b/hw/nvram/eeprom93xx.c index 2db3d7cce6..5fc23df1d4 100644 --- a/hw/nvram/eeprom93xx.c +++ b/hw/nvram/eeprom93xx.c @@ -38,6 +38,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/nvram/eeprom93xx.h" +#include "migration/qemu-file-types.h" /* Debug EEPROM emulation. */ //~ #define DEBUG_EEPROM diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 3032f1c65f..8db0297d59 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -31,6 +31,7 @@ #include "hw/boards.h" #include "hw/nvram/fw_cfg.h" #include "hw/sysbus.h" +#include "migration/qemu-file-types.h" #include "trace.h" #include "qemu/error-report.h" #include "qemu/option.h" diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index f3671d28b7..e5955457ab 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -32,6 +32,7 @@ #include "qapi/error.h" #include "qemu/range.h" #include "hw/xen/xen.h" +#include "migration/qemu-file-types.h" #include "hw/pci-host/pam.h" #include "sysemu/reset.h" #include "sysemu/sysemu.h" diff --git a/hw/pci/msix.c b/hw/pci/msix.c index d39dcf32e8..ebe804b473 100644 --- a/hw/pci/msix.c +++ b/hw/pci/msix.c @@ -20,6 +20,7 @@ #include "hw/pci/msix.h" #include "hw/pci/pci.h" #include "hw/xen/xen.h" +#include "migration/qemu-file-types.h" #include "qemu/range.h" #include "qapi/error.h" #include "trace.h" diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 8076a80ab3..43a3cac138 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -29,6 +29,7 @@ #include "hw/pci/pci_bridge.h" #include "hw/pci/pci_bus.h" #include "hw/pci/pci_host.h" +#include "migration/qemu-file-types.h" #include "monitor/monitor.h" #include "net/net.h" #include "sysemu/sysemu.h" diff --git a/hw/pci/shpc.c b/hw/pci/shpc.c index 5a10c6e9a5..7f0aa28e44 100644 --- a/hw/pci/shpc.c +++ b/hw/pci/shpc.c @@ -4,6 +4,7 @@ #include "qemu/range.h" #include "qemu/error-report.h" #include "hw/pci/shpc.h" +#include "migration/qemu-file-types.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bus.h" #include "hw/pci/msi.h" diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 5cade1a374..76e815ceee 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -42,6 +42,7 @@ #include "sysemu/hw_accel.h" #include "kvm_ppc.h" #include "migration/misc.h" +#include "migration/qemu-file-types.h" #include "migration/global_state.h" #include "migration/register.h" #include "mmu-hash64.h" diff --git a/hw/s390x/s390-skeys.c b/hw/s390x/s390-skeys.c index e5bd92c0c7..d4807f7777 100644 --- a/hw/s390x/s390-skeys.c +++ b/hw/s390x/s390-skeys.c @@ -18,6 +18,7 @@ #include "qapi/qmp/qdict.h" #include "qemu/error-report.h" #include "sysemu/kvm.h" +#include "migration/qemu-file-types.h" #include "migration/register.h" #define S390_SKEYS_BUFFER_SIZE (128 * KiB) /* Room for 128k storage keys */ diff --git a/hw/s390x/tod.c b/hw/s390x/tod.c index a9fca8eb0b..1bf0875afa 100644 --- a/hw/s390x/tod.c +++ b/hw/s390x/tod.c @@ -14,6 +14,7 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "sysemu/kvm.h" +#include "migration/qemu-file-types.h" #include "migration/register.h" void s390_init_tod(void) diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 43d3a1b029..fa537bfba3 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -17,6 +17,7 @@ #include "sysemu/kvm.h" #include "net/net.h" #include "hw/virtio/virtio.h" +#include "migration/qemu-file-types.h" #include "hw/virtio/virtio-net.h" #include "hw/sysbus.h" #include "qemu/bitops.h" diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c index 3f94d5ab55..6d2c15a2bc 100644 --- a/hw/scsi/mptsas.c +++ b/hw/scsi/mptsas.c @@ -34,6 +34,7 @@ #include "trace.h" #include "qapi/error.h" #include "mptsas.h" +#include "migration/qemu-file-types.h" #include "mpi.h" #define NAA_LOCALLY_ASSIGNED_ID 0x3ULL diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index fdc3a0e4e0..81fe7c3301 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -5,6 +5,7 @@ #include "qemu/module.h" #include "qemu/option.h" #include "hw/scsi/scsi.h" +#include "migration/qemu-file-types.h" #include "scsi/constants.h" #include "hw/qdev.h" #include "sysemu/block-backend.h" diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index 8e95e3e38d..b5af00e1a4 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -25,6 +25,7 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "hw/scsi/scsi.h" +#include "migration/qemu-file-types.h" #include "hw/scsi/emulation.h" #include "scsi/constants.h" #include "sysemu/sysemu.h" diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c index f07891b3f6..6883cbb0ca 100644 --- a/hw/scsi/scsi-generic.c +++ b/hw/scsi/scsi-generic.c @@ -17,6 +17,7 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "hw/scsi/scsi.h" +#include "migration/qemu-file-types.h" #include "hw/scsi/emulation.h" #include "sysemu/block-backend.h" #include "trace.h" diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c index 61ce365fe9..06a3cbcbda 100644 --- a/hw/scsi/virtio-scsi.c +++ b/hw/scsi/virtio-scsi.c @@ -17,6 +17,7 @@ #include "qapi/error.h" #include "standard-headers/linux/virtio_ids.h" #include "hw/virtio/virtio-scsi.h" +#include "migration/qemu-file-types.h" #include "qemu/error-report.h" #include "qemu/iov.h" #include "qemu/module.h" diff --git a/hw/timer/i8254_common.c b/hw/timer/i8254_common.c index 76ca6ec444..3e980f2dee 100644 --- a/hw/timer/i8254_common.c +++ b/hw/timer/i8254_common.c @@ -30,6 +30,7 @@ #include "qemu/timer.h" #include "hw/timer/i8254.h" #include "hw/timer/i8254_internal.h" +#include "migration/qemu-file-types.h" /* val must be 0 or 1 */ void pit_set_gate(ISADevice *dev, int channel, int val) diff --git a/hw/timer/twl92230.c b/hw/timer/twl92230.c index 0ef4fc1fc1..91ae7bf203 100644 --- a/hw/timer/twl92230.c +++ b/hw/timer/twl92230.c @@ -24,6 +24,7 @@ #include "hw/hw.h" #include "qemu/timer.h" #include "hw/i2c/i2c.h" +#include "migration/qemu-file-types.h" #include "sysemu/sysemu.h" #include "ui/console.h" #include "qemu/bcd.h" diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index 998fc6e4b0..846e60f3bb 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -41,6 +41,7 @@ #include #include "hw/usb.h" +#include "migration/qemu-file-types.h" /* ERROR is defined below. Remove any previous definition. */ #undef ERROR diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index bc899fc60e..ba1006ad96 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -26,6 +26,7 @@ #include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-access.h" #include "migration/blocker.h" +#include "migration/qemu-file-types.h" #include "sysemu/dma.h" #include "trace.h" diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c index 97b7f35496..d4c0997074 100644 --- a/hw/virtio/virtio-mmio.c +++ b/hw/virtio/virtio-mmio.c @@ -23,6 +23,7 @@ #include "standard-headers/linux/virtio_mmio.h" #include "hw/sysbus.h" #include "hw/virtio/virtio.h" +#include "migration/qemu-file-types.h" #include "qemu/host-utils.h" #include "qemu/module.h" #include "sysemu/kvm.h" diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index ce928f2429..1769a70721 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -19,6 +19,7 @@ #include "standard-headers/linux/virtio_pci.h" #include "hw/virtio/virtio.h" +#include "migration/qemu-file-types.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bus.h" #include "qapi/error.h" diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index a94ea18a9c..79c7a910cc 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -19,6 +19,7 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "hw/virtio/virtio.h" +#include "migration/qemu-file-types.h" #include "qemu/atomic.h" #include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-access.h" diff --git a/include/hw/hw.h b/include/hw/hw.h index a4fb2390e8..b399627cbe 100644 --- a/include/hw/hw.h +++ b/include/hw/hw.h @@ -11,7 +11,6 @@ #include "exec/memory.h" #include "hw/irq.h" #include "migration/vmstate.h" -#include "migration/qemu-file-types.h" void QEMU_NORETURN hw_error(const char *fmt, ...) GCC_FMT_ATTR(1, 2); diff --git a/include/migration/cpu.h b/include/migration/cpu.h index 8424f1631a..21c4fc9eab 100644 --- a/include/migration/cpu.h +++ b/include/migration/cpu.h @@ -3,6 +3,7 @@ #define MIGRATION_CPU_H #include "exec/cpu-defs.h" +#include "migration/qemu-file-types.h" #if TARGET_LONG_BITS == 64 #define qemu_put_betl qemu_put_be64 From patchwork Fri Jul 26 12:05:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 11060869 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C1845746 for ; Fri, 26 Jul 2019 12:06:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B147628812 for ; Fri, 26 Jul 2019 12:06:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A5CC528AA8; Fri, 26 Jul 2019 12:06:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4238F28812 for ; Fri, 26 Jul 2019 12:06:23 +0000 (UTC) Received: from localhost ([::1]:39220 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqyzM-0006sV-FC for patchwork-qemu-devel@patchwork.kernel.org; Fri, 26 Jul 2019 08:06:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58427) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqyys-0005Vb-VQ for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqyyq-0007uJ-3l for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45988) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqyyp-0007qk-Pf for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:47 -0400 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 E80595AFE3 for ; Fri, 26 Jul 2019 12:05:45 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8F8A060A35 for ; Fri, 26 Jul 2019 12:05:45 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 935FA1132B4B; Fri, 26 Jul 2019 14:05:42 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 26 Jul 2019 14:05:24 +0200 Message-Id: <20190726120542.9894-11-armbru@redhat.com> In-Reply-To: <20190726120542.9894-1-armbru@redhat.com> References: <20190726120542.9894-1-armbru@redhat.com> MIME-Version: 1.0 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.39]); Fri, 26 Jul 2019 12:05:45 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 10/28] ide: Include hw/ide/internal a bit less outside hw/ide/ X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP According to hw/ide/internal's file comment, only files in hw/ide/ are supposed to include it. Drag reality slightly closer to supposition. Three includes outside hw/ide remain: hw/arm/sbsa-ref.c, include/hw/ide/pci.h, and include/hw/misc/macio/macio.h. Turns out board code needs ide-internal.h to wire up IDE stuff. More cleanup is needed. Left for another day. Signed-off-by: Markus Armbruster --- hw/arm/allwinner-a10.c | 1 + hw/arm/cubieboard.c | 1 + hw/arm/xlnx-zynqmp.c | 1 + hw/ide/ahci_internal.h | 1 + hw/ppc/mac.h | 1 - include/hw/arm/allwinner-a10.h | 1 - include/hw/arm/xlnx-zynqmp.h | 1 - include/hw/misc/mos6522.h | 1 - 8 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/arm/allwinner-a10.c b/hw/arm/allwinner-a10.c index 35e906ca54..3b0d3eccdd 100644 --- a/hw/arm/allwinner-a10.c +++ b/hw/arm/allwinner-a10.c @@ -16,6 +16,7 @@ */ #include "qemu/osdep.h" +#include "exec/address-spaces.h" #include "qapi/error.h" #include "qemu/module.h" #include "cpu.h" diff --git a/hw/arm/cubieboard.c b/hw/arm/cubieboard.c index f7c8a5985a..38e0ca0f53 100644 --- a/hw/arm/cubieboard.c +++ b/hw/arm/cubieboard.c @@ -16,6 +16,7 @@ */ #include "qemu/osdep.h" +#include "exec/address-spaces.h" #include "qapi/error.h" #include "cpu.h" #include "hw/sysbus.h" diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index a60830d37a..0f587e63d3 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -24,6 +24,7 @@ #include "hw/boards.h" #include "exec/address-spaces.h" #include "sysemu/kvm.h" +#include "sysemu/sysemu.h" #include "kvm_arm.h" #define GIC_NUM_SPI_INTR 160 diff --git a/hw/ide/ahci_internal.h b/hw/ide/ahci_internal.h index 95ecddcd3c..73424516da 100644 --- a/hw/ide/ahci_internal.h +++ b/hw/ide/ahci_internal.h @@ -25,6 +25,7 @@ #define HW_IDE_AHCI_INTERNAL_H #include "hw/ide/ahci.h" +#include "hw/ide/internal.h" #include "hw/sysbus.h" #define AHCI_MEM_BAR_SIZE 0x1000 diff --git a/hw/ppc/mac.h b/hw/ppc/mac.h index a741300ac9..6af87d1fa0 100644 --- a/hw/ppc/mac.h +++ b/hw/ppc/mac.h @@ -30,7 +30,6 @@ #include "exec/memory.h" #include "hw/boards.h" #include "hw/sysbus.h" -#include "hw/ide/internal.h" #include "hw/input/adb.h" #include "hw/misc/mos6522.h" #include "hw/pci/pci_host.h" diff --git a/include/hw/arm/allwinner-a10.h b/include/hw/arm/allwinner-a10.h index 7182ce5c4b..101b72a71d 100644 --- a/include/hw/arm/allwinner-a10.h +++ b/include/hw/arm/allwinner-a10.h @@ -7,7 +7,6 @@ #include "hw/timer/allwinner-a10-pit.h" #include "hw/intc/allwinner-a10-pic.h" #include "hw/net/allwinner_emac.h" -#include "hw/ide/pci.h" #include "hw/ide/ahci.h" #include "sysemu/sysemu.h" diff --git a/include/hw/arm/xlnx-zynqmp.h b/include/hw/arm/xlnx-zynqmp.h index 6cb65e7537..d7483c3b42 100644 --- a/include/hw/arm/xlnx-zynqmp.h +++ b/include/hw/arm/xlnx-zynqmp.h @@ -22,7 +22,6 @@ #include "hw/intc/arm_gic.h" #include "hw/net/cadence_gem.h" #include "hw/char/cadence_uart.h" -#include "hw/ide/pci.h" #include "hw/ide/ahci.h" #include "hw/sd/sdhci.h" #include "hw/ssi/xilinx_spips.h" diff --git a/include/hw/misc/mos6522.h b/include/hw/misc/mos6522.h index 03d9f0c059..493c907537 100644 --- a/include/hw/misc/mos6522.h +++ b/include/hw/misc/mos6522.h @@ -29,7 +29,6 @@ #include "exec/memory.h" #include "hw/sysbus.h" -#include "hw/ide/internal.h" #include "hw/input/adb.h" /* Bits in ACR */ From patchwork Fri Jul 26 12:05:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 11060889 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 430CF13A0 for ; Fri, 26 Jul 2019 12:08:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3334428AA5 for ; Fri, 26 Jul 2019 12:08:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 275C028AAA; Fri, 26 Jul 2019 12:08:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D43ED28AA5 for ; Fri, 26 Jul 2019 12:08:20 +0000 (UTC) Received: from localhost ([::1]:39286 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqz1H-0006zX-R9 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 26 Jul 2019 08:08:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58562) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqyyw-0005Vn-SR for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:06:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqyys-00085N-Ex for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60084) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqyyr-0007r5-T6 for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:50 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1AD1B3079B60 for ; Fri, 26 Jul 2019 12:05:46 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DC84D1001B02 for ; Fri, 26 Jul 2019 12:05:45 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 9934F1132B78; Fri, 26 Jul 2019 14:05:42 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 26 Jul 2019 14:05:25 +0200 Message-Id: <20190726120542.9894-12-armbru@redhat.com> In-Reply-To: <20190726120542.9894-1-armbru@redhat.com> References: <20190726120542.9894-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Fri, 26 Jul 2019 12:05:46 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 11/28] typedefs: Separate incomplete types and function types X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP While there, drop the obsolete file comment. Signed-off-by: Markus Armbruster --- include/qemu/typedefs.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index fcdaae58c4..29346648d4 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -1,10 +1,10 @@ #ifndef QEMU_TYPEDEFS_H #define QEMU_TYPEDEFS_H -/* A load of opaque types so that device init declarations don't have to - pull in all the real definitions. */ - -/* Please keep this list in case-insensitive alphabetical order */ +/* + * Incomplete struct types + * Please keep this list in case-insensitive alphabetical order. + */ typedef struct AdapterInfo AdapterInfo; typedef struct AddressSpace AddressSpace; typedef struct AioContext AioContext; @@ -101,6 +101,10 @@ typedef struct SHPCDevice SHPCDevice; typedef struct SSIBus SSIBus; typedef struct VirtIODevice VirtIODevice; typedef struct Visitor Visitor; + +/* + * Function types + */ typedef void SaveStateHandler(QEMUFile *f, void *opaque); typedef int LoadStateHandler(QEMUFile *f, void *opaque, int version_id); From patchwork Fri Jul 26 12:05:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 11060933 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EB72413A0 for ; Fri, 26 Jul 2019 12:11:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D04DC28AA5 for ; Fri, 26 Jul 2019 12:11:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C3D6628AAA; Fri, 26 Jul 2019 12:11:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2C3A428AA5 for ; Fri, 26 Jul 2019 12:11:20 +0000 (UTC) Received: from localhost ([::1]:39386 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqz4B-0002Pz-3D for patchwork-qemu-devel@patchwork.kernel.org; Fri, 26 Jul 2019 08:11:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58958) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqyz4-0005nj-0M for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:06:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqyys-00083T-1o for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:06:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52836) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqyyr-0007sM-1R for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:49 -0400 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 0346281F18 for ; Fri, 26 Jul 2019 12:05:47 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E522512C91 for ; Fri, 26 Jul 2019 12:05:45 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id A77EF1132B3B; Fri, 26 Jul 2019 14:05:42 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 26 Jul 2019 14:05:26 +0200 Message-Id: <20190726120542.9894-13-armbru@redhat.com> In-Reply-To: <20190726120542.9894-1-armbru@redhat.com> References: <20190726120542.9894-1-armbru@redhat.com> MIME-Version: 1.0 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]); Fri, 26 Jul 2019 12:05:47 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 12/28] Include hw/irq.h a lot less X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP In my "build everything" tree, changing hw/irq.h triggers a recompile of some 5400 out of 6600 objects (not counting tests and objects that don't depend on qemu/osdep.h). hw/hw.h supposedly includes it for convenience. Several other headers include it just to get qemu_irq and.or qemu_irq_handler. Move the qemu_irq and qemu_irq_handler typedefs from hw/irq.h to qemu/typedefs.h, and then include hw/irq.h only where it's still needed. Touching it now recompiles only some 500 objects. Signed-off-by: Markus Armbruster Reviewed-by: Alistair Francis --- hw/acpi/core.c | 1 + hw/acpi/piix4.c | 1 + hw/alpha/alpha_sys.h | 1 - hw/alpha/typhoon.c | 1 + hw/arm/armsse.c | 1 + hw/arm/exynos4210.c | 1 + hw/arm/exynos4_boards.c | 1 + hw/arm/integratorcp.c | 1 + hw/arm/msf2-soc.c | 1 + hw/arm/musicpal.c | 1 + hw/arm/omap1.c | 1 + hw/arm/omap2.c | 1 + hw/arm/palm.c | 2 ++ hw/arm/pxa2xx.c | 1 + hw/arm/pxa2xx_gpio.c | 1 + hw/arm/realview.c | 1 + hw/arm/smmuv3.c | 1 + hw/arm/spitz.c | 1 + hw/arm/stellaris.c | 1 + hw/arm/strongarm.c | 1 + hw/arm/tosa.c | 1 + hw/arm/versatilepb.c | 1 + hw/arm/virt.c | 1 + hw/arm/z2.c | 1 + hw/audio/cs4231a.c | 1 + hw/audio/gus.c | 1 + hw/audio/marvell_88w8618.c | 1 + hw/audio/milkymist-ac97.c | 1 + hw/audio/pl041.c | 1 + hw/audio/sb16.c | 1 + hw/block/fdc.c | 1 + hw/char/bcm2835_aux.c | 1 + hw/char/cadence_uart.c | 1 + hw/char/cmsdk-apb-uart.c | 1 + hw/char/escc.c | 1 + hw/char/etraxfs_ser.c | 1 + hw/char/exynos4210_uart.c | 1 + hw/char/grlib_apbuart.c | 1 + hw/char/imx_serial.c | 1 + hw/char/ipoctal232.c | 1 + hw/char/lm32_uart.c | 1 + hw/char/mcf_uart.c | 1 + hw/char/milkymist-uart.c | 1 + hw/char/nrf51_uart.c | 1 + hw/char/parallel.c | 1 + hw/char/pl011.c | 1 + hw/char/serial-pci-multi.c | 1 + hw/char/serial-pci.c | 1 + hw/char/serial.c | 1 + hw/char/sh_serial.c | 2 ++ hw/char/spapr_vty.c | 1 + hw/char/stm32f2xx_usart.c | 1 + hw/char/xilinx_uartlite.c | 1 + hw/core/or-irq.c | 1 + hw/core/qdev.c | 1 + hw/core/split-irq.c | 1 + hw/cpu/a15mpcore.c | 1 + hw/cpu/a9mpcore.c | 1 + hw/cpu/arm11mpcore.c | 1 + hw/cpu/realview_mpcore.c | 1 + hw/display/ads7846.c | 1 + hw/display/bcm2835_fb.c | 1 + hw/display/cg3.c | 1 + hw/display/exynos4210_fimd.c | 1 + hw/display/g364fb.c | 1 + hw/display/milkymist-tmu2.c | 1 + hw/display/omap_dss.c | 2 ++ hw/display/omap_lcdc.c | 2 ++ hw/display/pl110.c | 1 + hw/display/pxa2xx_lcd.c | 1 + hw/display/tc6393xb.c | 2 ++ hw/display/xlnx_dp.c | 1 + hw/dma/bcm2835_dma.c | 1 + hw/dma/etraxfs_dma.c | 2 ++ hw/dma/pl080.c | 1 + hw/dma/pl330.c | 1 + hw/dma/pxa2xx_dma.c | 1 + hw/dma/rc4030.c | 1 + hw/dma/sparc32_dma.c | 1 + hw/dma/xilinx_axidma.c | 1 + hw/dma/xlnx-zdma.c | 1 + hw/dma/xlnx-zynq-devcfg.c | 1 + hw/dma/xlnx_dpdma.c | 1 + hw/gpio/bcm2835_gpio.c | 1 + hw/gpio/gpio_key.c | 1 + hw/gpio/imx_gpio.c | 1 + hw/gpio/max7310.c | 1 + hw/gpio/mpc8xxx.c | 1 + hw/gpio/nrf51_gpio.c | 1 + hw/gpio/omap_gpio.c | 1 + hw/gpio/pl061.c | 1 + hw/gpio/zaurus.c | 1 + hw/hppa/dino.c | 1 + hw/hppa/hppa_sys.h | 1 - hw/i2c/aspeed_i2c.c | 1 + hw/i2c/bitbang_i2c.c | 1 + hw/i2c/exynos4210_i2c.c | 1 + hw/i2c/imx_i2c.c | 1 + hw/i2c/mpc_i2c.c | 1 + hw/i2c/omap_i2c.c | 1 + hw/i2c/ppc4xx_i2c.c | 1 + hw/i386/kvm/i8259.c | 1 + hw/i386/kvm/ioapic.c | 1 + hw/i386/pc.c | 1 + hw/i386/pc_piix.c | 1 + hw/i386/xen/xen-hvm.c | 1 + hw/input/lm832x.c | 1 + hw/input/milkymist-softusb.c | 1 + hw/input/pckbd.c | 1 + hw/input/pl050.c | 1 + hw/input/pxa2xx_keypad.c | 1 + hw/input/stellaris_input.c | 2 ++ hw/input/tsc2005.c | 1 + hw/input/tsc210x.c | 1 + hw/intc/allwinner-a10-pic.c | 1 + hw/intc/arm_gic.c | 1 + hw/intc/arm_gicv2m.c | 1 + hw/intc/arm_gicv3_cpuif.c | 1 + hw/intc/armv7m_nvic.c | 1 + hw/intc/aspeed_vic.c | 1 + hw/intc/bcm2835_ic.c | 1 + hw/intc/bcm2836_control.c | 1 + hw/intc/etraxfs_pic.c | 1 + hw/intc/exynos4210_combiner.c | 1 + hw/intc/heathrow_pic.c | 1 + hw/intc/i8259.c | 2 ++ hw/intc/imx_avic.c | 1 + hw/intc/lm32_pic.c | 1 + hw/intc/mips_gic.c | 1 + hw/intc/nios2_iic.c | 1 + hw/intc/omap_intc.c | 1 + hw/intc/ompic.c | 1 + hw/intc/openpic.c | 1 + hw/intc/pl190.c | 1 + hw/intc/puv3_intc.c | 1 + hw/intc/realview_gic.c | 1 + hw/intc/sh_intc.c | 1 + hw/intc/slavio_intctl.c | 1 + hw/intc/xics.c | 1 + hw/intc/xilinx_intc.c | 1 + hw/intc/xive.c | 1 + hw/intc/xlnx-pmu-iomod-intc.c | 1 + hw/intc/xlnx-zynqmp-ipi.c | 1 + hw/ipack/ipack.c | 1 + hw/ipack/tpci200.c | 1 + hw/ipmi/isa_ipmi_bt.c | 1 + hw/ipmi/isa_ipmi_kcs.c | 1 + hw/isa/i82378.c | 1 + hw/isa/lpc_ich9.c | 2 ++ hw/lm32/lm32_boards.c | 1 + hw/lm32/milkymist.c | 1 + hw/m68k/mcf5206.c | 2 ++ hw/m68k/mcf5208.c | 2 ++ hw/m68k/mcf_intc.c | 1 + hw/mips/gt64xxx_pci.c | 1 + hw/mips/mips_int.c | 1 + hw/mips/mips_malta.c | 1 + hw/misc/arm_sysctl.c | 1 + hw/misc/armsse-mhu.c | 1 + hw/misc/aspeed_xdma.c | 1 + hw/misc/bcm2835_mbox.c | 1 + hw/misc/bcm2835_property.c | 1 + hw/misc/eccmemctl.c | 1 + hw/misc/iotkit-secctl.c | 1 + hw/misc/macio/mac_dbdma.c | 1 + hw/misc/macio/pmu.c | 1 + hw/misc/max111x.c | 1 + hw/misc/milkymist-pfpu.c | 1 + hw/misc/mos6522.c | 1 + hw/misc/mst_fpga.c | 1 + hw/misc/nrf51_rng.c | 1 + hw/misc/omap_clk.c | 2 ++ hw/misc/omap_gpmc.c | 2 ++ hw/misc/pc-testdev.c | 1 + hw/misc/slavio_misc.c | 1 + hw/misc/tmp105.c | 1 + hw/misc/tz-mpc.c | 1 + hw/misc/tz-msc.c | 1 + hw/misc/tz-ppc.c | 1 + hw/misc/zynq-xadc.c | 1 + hw/net/allwinner_emac.c | 1 + hw/net/cadence_gem.c | 1 + hw/net/can/can_kvaser_pci.c | 1 + hw/net/can/can_mioe3680_pci.c | 1 + hw/net/can/can_pcm3680_pci.c | 1 + hw/net/can/can_sja1000.c | 2 ++ hw/net/dp8393x.c | 1 + hw/net/fsl_etsec/etsec.c | 1 + hw/net/ftgmac100.c | 1 + hw/net/imx_fec.c | 1 + hw/net/lan9118.c | 1 + hw/net/mcf_fec.c | 1 + hw/net/milkymist-minimac2.c | 1 + hw/net/mipsnet.c | 1 + hw/net/ne2000-pci.c | 2 ++ hw/net/ne2000.c | 1 + hw/net/opencores_eth.c | 1 + hw/net/pcnet-pci.c | 1 + hw/net/pcnet.c | 1 + hw/net/smc91c111.c | 1 + hw/net/spapr_llan.c | 1 + hw/net/stellaris_enet.c | 1 + hw/net/xgmac.c | 1 + hw/net/xilinx_axienet.c | 1 + hw/net/xilinx_ethlite.c | 1 + hw/nios2/cpu_pic.c | 1 + hw/openrisc/openrisc_sim.c | 1 + hw/openrisc/pic_cpu.c | 1 + hw/pci-host/bonito.c | 1 + hw/pci-host/designware.c | 1 + hw/pci-host/gpex.c | 1 + hw/pci-host/grackle.c | 1 + hw/pci-host/piix.c | 1 + hw/pci-host/ppce500.c | 1 + hw/pci-host/prep.c | 1 + hw/pci-host/sabre.c | 1 + hw/pci-host/uninorth.c | 1 + hw/pci-host/versatile.c | 1 + hw/pci-host/xilinx-pcie.c | 1 + hw/pci/pci.c | 1 + hw/pcmcia/pxa2xx.c | 1 + hw/ppc/e500.c | 1 + hw/ppc/pnv_lpc.c | 1 + hw/ppc/pnv_psi.c | 1 + hw/ppc/ppc.c | 2 ++ hw/ppc/ppc405_uc.c | 1 + hw/ppc/ppc440_pcix.c | 1 + hw/ppc/ppc440_uc.c | 1 + hw/ppc/ppc4xx_devs.c | 1 + hw/ppc/ppc4xx_pci.c | 1 + hw/ppc/prep.c | 1 + hw/ppc/prep_systemio.c | 1 + hw/ppc/spapr_events.c | 2 ++ hw/ppc/spapr_irq.c | 1 + hw/ppc/spapr_pci.c | 1 + hw/ppc/spapr_vio.c | 1 + hw/riscv/sifive_gpio.c | 1 + hw/riscv/sifive_uart.c | 1 + hw/scsi/esp-pci.c | 1 + hw/scsi/esp.c | 1 + hw/scsi/lsi53c895a.c | 1 + hw/sd/bcm2835_sdhost.c | 1 + hw/sd/omap_mmc.c | 2 ++ hw/sd/pl181.c | 1 + hw/sd/pxa2xx_mmci.c | 1 + hw/sd/sd.c | 1 + hw/sd/sdhci.c | 1 + hw/sh4/r2d.c | 1 + hw/sh4/sh7750.c | 2 ++ hw/sh4/sh_pci.c | 1 + hw/sparc/leon3.c | 1 + hw/sparc/sun4m.c | 1 + hw/sparc/sun4m_iommu.c | 1 + hw/ssi/aspeed_smc.c | 1 + hw/ssi/imx_spi.c | 1 + hw/ssi/mss-spi.c | 1 + hw/ssi/omap_spi.c | 2 ++ hw/ssi/pl022.c | 1 + hw/ssi/xilinx_spi.c | 1 + hw/ssi/xilinx_spips.c | 1 + hw/timer/a9gtimer.c | 1 + hw/timer/allwinner-a10-pit.c | 1 + hw/timer/altera_timer.c | 1 + hw/timer/arm_mptimer.c | 1 + hw/timer/arm_timer.c | 1 + hw/timer/armv7m_systick.c | 1 + hw/timer/aspeed_timer.c | 1 + hw/timer/cadence_ttc.c | 1 + hw/timer/cmsdk-apb-dualtimer.c | 1 + hw/timer/cmsdk-apb-timer.c | 1 + hw/timer/etraxfs_timer.c | 1 + hw/timer/exynos4210_mct.c | 1 + hw/timer/exynos4210_pwm.c | 1 + hw/timer/exynos4210_rtc.c | 1 + hw/timer/grlib_gptimer.c | 1 + hw/timer/hpet.c | 1 + hw/timer/i8254.c | 1 + hw/timer/imx_epit.c | 1 + hw/timer/imx_gpt.c | 1 + hw/timer/lm32_timer.c | 1 + hw/timer/m48t59.c | 1 + hw/timer/mc146818rtc.c | 1 + hw/timer/milkymist-sysctl.c | 1 + hw/timer/mss-timer.c | 1 + hw/timer/nrf51_timer.c | 1 + hw/timer/omap_gptimer.c | 2 ++ hw/timer/pl031.c | 1 + hw/timer/puv3_ost.c | 1 + hw/timer/pxa2xx_timer.c | 1 + hw/timer/sh_timer.c | 1 + hw/timer/slavio_timer.c | 1 + hw/timer/stm32f2xx_timer.c | 1 + hw/timer/twl92230.c | 1 + hw/timer/xilinx_timer.c | 1 + hw/timer/xlnx-zynqmp-rtc.c | 1 + hw/tpm/tpm_tis.c | 1 + hw/unicore32/puv3.c | 1 + hw/usb/hcd-ehci.c | 1 + hw/usb/hcd-ohci.c | 1 + hw/vfio/platform.c | 1 + hw/virtio/virtio-mmio.c | 1 + hw/watchdog/cmsdk-apb-watchdog.c | 1 + hw/xtensa/mx_pic.c | 1 + hw/xtensa/pic_cpu.c | 1 + include/hw/acpi/acpi.h | 1 - include/hw/arm/boot.h | 1 - include/hw/arm/omap.h | 1 - include/hw/arm/soc_dma.h | 1 - include/hw/block/fdc.h | 1 - include/hw/bt.h | 1 - include/hw/core/split-irq.h | 1 - include/hw/cris/etraxfs_dma.h | 1 - include/hw/display/blizzard.h | 1 - include/hw/display/tc6393xb.h | 1 - include/hw/hw.h | 1 - include/hw/ide/internal.h | 1 + include/hw/input/gamepad.h | 1 - include/hw/input/tsc2xxx.h | 1 - include/hw/irq.h | 4 ---- include/hw/isa/vt82c686.h | 1 - include/hw/mips/mips.h | 1 - include/hw/misc/cbus.h | 1 - include/hw/net/lan9118.h | 1 - include/hw/net/smc91c111.h | 1 - include/hw/or-irq.h | 1 - include/hw/ppc/spapr_irq.h | 1 - include/hw/qdev-core.h | 1 - include/hw/sh4/sh_intc.h | 1 - include/hw/timer/m48t59.h | 1 - include/hw/tricore/tricore.h | 1 - include/hw/vfio/vfio-platform.h | 1 - include/hw/xen/xen.h | 1 - include/hw/xtensa/mx_pic.h | 1 - include/qemu/typedefs.h | 9 +++++++++ include/sysemu/kvm.h | 1 - target/arm/helper.c | 1 + target/arm/kvm.c | 1 + target/mips/cp0_timer.c | 1 + 338 files changed, 336 insertions(+), 34 deletions(-) diff --git a/hw/acpi/core.c b/hw/acpi/core.c index 228828a494..39e9fb1a6c 100644 --- a/hw/acpi/core.c +++ b/hw/acpi/core.c @@ -22,6 +22,7 @@ #include "qemu/osdep.h" #include "sysemu/sysemu.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/acpi/acpi.h" #include "hw/nvram/fw_cfg.h" #include "qemu/config-file.h" diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 0d8c821f37..8f9a7ba2ab 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -22,6 +22,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/i386/pc.h" +#include "hw/irq.h" #include "hw/isa/apm.h" #include "hw/i2c/pm_smbus.h" #include "hw/pci/pci.h" diff --git a/hw/alpha/alpha_sys.h b/hw/alpha/alpha_sys.h index b6d8369ed7..4e127a6de8 100644 --- a/hw/alpha/alpha_sys.h +++ b/hw/alpha/alpha_sys.h @@ -8,7 +8,6 @@ #include "hw/pci/pci_host.h" #include "hw/ide.h" #include "hw/i386/pc.h" -#include "hw/irq.h" PCIBus *typhoon_init(ram_addr_t, ISABus **, qemu_irq *, AlphaCPU *[4], diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c index 3f34a5153f..6797eb0abe 100644 --- a/hw/alpha/typhoon.c +++ b/hw/alpha/typhoon.c @@ -12,6 +12,7 @@ #include "qapi/error.h" #include "cpu.h" #include "hw/hw.h" +#include "hw/irq.h" #include "sysemu/sysemu.h" #include "alpha_sys.h" #include "exec/address-spaces.h" diff --git a/hw/arm/armsse.c b/hw/arm/armsse.c index b5c614cc3a..85cfa414eb 100644 --- a/hw/arm/armsse.c +++ b/hw/arm/armsse.c @@ -19,6 +19,7 @@ #include "hw/registerfields.h" #include "hw/arm/armsse.h" #include "hw/arm/boot.h" +#include "hw/irq.h" /* Format of the System Information block SYS_CONFIG register */ typedef enum SysConfigFormat { diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c index becd864c19..9aa5ec3f5d 100644 --- a/hw/arm/exynos4210.c +++ b/hw/arm/exynos4210.c @@ -26,6 +26,7 @@ #include "qemu/log.h" #include "cpu.h" #include "hw/cpu/a9mpcore.h" +#include "hw/irq.h" #include "hw/boards.h" #include "sysemu/sysemu.h" #include "hw/sysbus.h" diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c index ac0b0dc2a9..7624e16084 100644 --- a/hw/arm/exynos4_boards.c +++ b/hw/arm/exynos4_boards.c @@ -34,6 +34,7 @@ #include "hw/arm/exynos4210.h" #include "hw/net/lan9118.h" #include "hw/boards.h" +#include "hw/irq.h" #define SMDK_LAN9118_BASE_ADDR 0x05000000 diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index 200c0107f0..d6025684f4 100644 --- a/hw/arm/integratorcp.c +++ b/hw/arm/integratorcp.c @@ -20,6 +20,7 @@ #include "sysemu/sysemu.h" #include "qemu/error-report.h" #include "hw/char/pl011.h" +#include "hw/irq.h" #define TYPE_INTEGRATOR_CM "integrator_core" #define INTEGRATOR_CM(obj) \ diff --git a/hw/arm/msf2-soc.c b/hw/arm/msf2-soc.c index 1ccb644df7..4e5251c92e 100644 --- a/hw/arm/msf2-soc.c +++ b/hw/arm/msf2-soc.c @@ -27,6 +27,7 @@ #include "qapi/error.h" #include "exec/address-spaces.h" #include "hw/char/serial.h" +#include "hw/irq.h" #include "hw/boards.h" #include "hw/arm/msf2-soc.h" #include "hw/misc/unimp.h" diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index 95d56f3208..848e49f459 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -23,6 +23,7 @@ #include "hw/block/flash.h" #include "ui/console.h" #include "hw/i2c/i2c.h" +#include "hw/irq.h" #include "hw/audio/wm8750.h" #include "sysemu/block-backend.h" #include "exec/address-spaces.h" diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c index beaddaf11f..cce671014b 100644 --- a/hw/arm/omap1.c +++ b/hw/arm/omap1.c @@ -24,6 +24,7 @@ #include "cpu.h" #include "hw/boards.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/arm/boot.h" #include "hw/arm/omap.h" #include "sysemu/sysemu.h" diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c index 7d4cac1f46..397630e2f2 100644 --- a/hw/arm/omap2.c +++ b/hw/arm/omap2.c @@ -26,6 +26,7 @@ #include "sysemu/reset.h" #include "hw/boards.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/arm/boot.h" #include "hw/arm/omap.h" #include "sysemu/sysemu.h" diff --git a/hw/arm/palm.c b/hw/arm/palm.c index 9eb9612bce..a5eccb7290 100644 --- a/hw/arm/palm.c +++ b/hw/arm/palm.c @@ -16,6 +16,7 @@ * You should have received a copy of the GNU General Public License along * with this program; if not, see . */ + #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/hw.h" @@ -27,6 +28,7 @@ #include "hw/boards.h" #include "hw/arm/boot.h" #include "hw/input/tsc2xxx.h" +#include "hw/irq.h" #include "hw/loader.h" #include "exec/address-spaces.h" #include "cpu.h" diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c index e2e43ae6e8..ab3fbd7b64 100644 --- a/hw/arm/pxa2xx.c +++ b/hw/arm/pxa2xx.c @@ -18,6 +18,7 @@ #include "sysemu/sysemu.h" #include "hw/char/serial.h" #include "hw/i2c/i2c.h" +#include "hw/irq.h" #include "hw/ssi/ssi.h" #include "chardev/char-fe.h" #include "sysemu/blockdev.h" diff --git a/hw/arm/pxa2xx_gpio.c b/hw/arm/pxa2xx_gpio.c index d1fc9cba67..1b1fc499dc 100644 --- a/hw/arm/pxa2xx_gpio.c +++ b/hw/arm/pxa2xx_gpio.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #include "cpu.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "hw/arm/pxa.h" #include "qemu/log.h" diff --git a/hw/arm/realview.c b/hw/arm/realview.c index 7c56c8d2ed..b108a9ab26 100644 --- a/hw/arm/realview.c +++ b/hw/arm/realview.c @@ -25,6 +25,7 @@ #include "hw/char/pl011.h" #include "hw/cpu/a9mpcore.h" #include "hw/intc/realview_gic.h" +#include "hw/irq.h" #define SMP_BOOT_ADDR 0xe0000000 #define SMP_BOOTREG_ADDR 0x10000030 diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c index e96d5beb9a..ccca60720e 100644 --- a/hw/arm/smmuv3.c +++ b/hw/arm/smmuv3.c @@ -18,6 +18,7 @@ #include "qemu/osdep.h" #include "hw/boards.h" +#include "hw/irq.h" #include "sysemu/sysemu.h" #include "hw/sysbus.h" #include "hw/qdev-core.h" diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c index 723cf5d592..b90431ffea 100644 --- a/hw/arm/spitz.c +++ b/hw/arm/spitz.c @@ -18,6 +18,7 @@ #include "sysemu/sysemu.h" #include "hw/pcmcia.h" #include "hw/i2c/i2c.h" +#include "hw/irq.h" #include "hw/ssi/ssi.h" #include "hw/block/flash.h" #include "qemu/timer.h" diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c index 499035f5c8..088ae2dbd7 100644 --- a/hw/arm/stellaris.c +++ b/hw/arm/stellaris.c @@ -22,6 +22,7 @@ #include "hw/arm/armv7m.h" #include "hw/char/pl011.h" #include "hw/input/gamepad.h" +#include "hw/irq.h" #include "hw/watchdog/cmsdk-apb-watchdog.h" #include "hw/misc/unimp.h" #include "cpu.h" diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c index fed51a8183..2e016f4b77 100644 --- a/hw/arm/strongarm.c +++ b/hw/arm/strongarm.c @@ -31,6 +31,7 @@ #include "qemu-common.h" #include "cpu.h" #include "hw/boards.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "strongarm.h" #include "qemu/error-report.h" diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c index 7843d68d46..80c61aef16 100644 --- a/hw/arm/tosa.c +++ b/hw/arm/tosa.c @@ -21,6 +21,7 @@ #include "hw/boards.h" #include "hw/display/tc6393xb.h" #include "hw/i2c/i2c.h" +#include "hw/irq.h" #include "hw/ssi/ssi.h" #include "hw/sysbus.h" #include "exec/address-spaces.h" diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c index e5857117ac..bc922345a6 100644 --- a/hw/arm/versatilepb.c +++ b/hw/arm/versatilepb.c @@ -17,6 +17,7 @@ #include "sysemu/sysemu.h" #include "hw/pci/pci.h" #include "hw/i2c/i2c.h" +#include "hw/irq.h" #include "hw/boards.h" #include "exec/address-spaces.h" #include "hw/block/flash.h" diff --git a/hw/arm/virt.c b/hw/arm/virt.c index d9496c9363..0e5152ed3b 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -57,6 +57,7 @@ #include "hw/arm/fdt.h" #include "hw/intc/arm_gic.h" #include "hw/intc/arm_gicv3_common.h" +#include "hw/irq.h" #include "kvm_arm.h" #include "hw/firmware/smbios.h" #include "qapi/visitor.h" diff --git a/hw/arm/z2.c b/hw/arm/z2.c index 44aa748d39..366d46ff5f 100644 --- a/hw/arm/z2.c +++ b/hw/arm/z2.c @@ -16,6 +16,7 @@ #include "hw/arm/pxa.h" #include "hw/arm/boot.h" #include "hw/i2c/i2c.h" +#include "hw/irq.h" #include "hw/ssi/ssi.h" #include "hw/boards.h" #include "sysemu/sysemu.h" diff --git a/hw/audio/cs4231a.c b/hw/audio/cs4231a.c index 7216b41cc1..9eeab137c7 100644 --- a/hw/audio/cs4231a.c +++ b/hw/audio/cs4231a.c @@ -26,6 +26,7 @@ #include "hw/hw.h" #include "hw/audio/soundhw.h" #include "audio/audio.h" +#include "hw/irq.h" #include "hw/isa/isa.h" #include "hw/qdev.h" #include "qemu/module.h" diff --git a/hw/audio/gus.c b/hw/audio/gus.c index 9ab51631d9..61230147ce 100644 --- a/hw/audio/gus.c +++ b/hw/audio/gus.c @@ -28,6 +28,7 @@ #include "hw/hw.h" #include "hw/audio/soundhw.h" #include "audio/audio.h" +#include "hw/irq.h" #include "hw/isa/isa.h" #include "gusemu.h" #include "gustate.h" diff --git a/hw/audio/marvell_88w8618.c b/hw/audio/marvell_88w8618.c index ff1a0d0d8f..167b478ec6 100644 --- a/hw/audio/marvell_88w8618.c +++ b/hw/audio/marvell_88w8618.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/audio/wm8750.h" #include "audio/audio.h" #include "qapi/error.h" diff --git a/hw/audio/milkymist-ac97.c b/hw/audio/milkymist-ac97.c index bf6a5a6b96..3ba382ee4d 100644 --- a/hw/audio/milkymist-ac97.c +++ b/hw/audio/milkymist-ac97.c @@ -23,6 +23,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "trace.h" #include "audio/audio.h" diff --git a/hw/audio/pl041.c b/hw/audio/pl041.c index 59c6ce1f2e..47f0dfff18 100644 --- a/hw/audio/pl041.c +++ b/hw/audio/pl041.c @@ -21,6 +21,7 @@ */ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/audio/sb16.c b/hw/audio/sb16.c index a2db06a2bb..ba5a5dd022 100644 --- a/hw/audio/sb16.c +++ b/hw/audio/sb16.c @@ -26,6 +26,7 @@ #include "hw/hw.h" #include "hw/audio/soundhw.h" #include "audio/audio.h" +#include "hw/irq.h" #include "hw/isa/isa.h" #include "hw/qdev.h" #include "qemu/timer.h" diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 77af9979de..982b0e4aee 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -33,6 +33,7 @@ #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/timer.h" +#include "hw/irq.h" #include "hw/isa/isa.h" #include "hw/sysbus.h" #include "hw/block/block.h" diff --git a/hw/char/bcm2835_aux.c b/hw/char/bcm2835_aux.c index 94679d276c..8395c79520 100644 --- a/hw/char/bcm2835_aux.c +++ b/hw/char/bcm2835_aux.c @@ -22,6 +22,7 @@ #include "qemu/osdep.h" #include "hw/char/bcm2835_aux.h" +#include "hw/irq.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/char/cadence_uart.c b/hw/char/cadence_uart.c index fa25fe24da..6b9eb140c7 100644 --- a/hw/char/cadence_uart.c +++ b/hw/char/cadence_uart.c @@ -29,6 +29,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/char/cadence_uart.h" +#include "hw/irq.h" #ifdef CADENCE_UART_ERR_DEBUG #define DB_PRINT(...) do { \ diff --git a/hw/char/cmsdk-apb-uart.c b/hw/char/cmsdk-apb-uart.c index 606c9cc7d6..dd96a3302e 100644 --- a/hw/char/cmsdk-apb-uart.c +++ b/hw/char/cmsdk-apb-uart.c @@ -25,6 +25,7 @@ #include "chardev/char-fe.h" #include "chardev/char-serial.h" #include "hw/char/cmsdk-apb-uart.h" +#include "hw/irq.h" REG32(DATA, 0) REG32(STATE, 4) diff --git a/hw/char/escc.c b/hw/char/escc.c index 8ddbb4be4f..678d494d39 100644 --- a/hw/char/escc.c +++ b/hw/char/escc.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "qemu/module.h" #include "hw/char/escc.h" diff --git a/hw/char/etraxfs_ser.c b/hw/char/etraxfs_ser.c index 9745bca86c..e93f31c76a 100644 --- a/hw/char/etraxfs_ser.c +++ b/hw/char/etraxfs_ser.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "chardev/char-fe.h" #include "qemu/log.h" diff --git a/hw/char/exynos4210_uart.c b/hw/char/exynos4210_uart.c index c5700eeaec..dabcd07415 100644 --- a/hw/char/exynos4210_uart.c +++ b/hw/char/exynos4210_uart.c @@ -28,6 +28,7 @@ #include "chardev/char-serial.h" #include "hw/arm/exynos4210.h" +#include "hw/irq.h" #undef DEBUG_UART #undef DEBUG_UART_EXTEND diff --git a/hw/char/grlib_apbuart.c b/hw/char/grlib_apbuart.c index c2bb3ac153..13013e8a1c 100644 --- a/hw/char/grlib_apbuart.c +++ b/hw/char/grlib_apbuart.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/sparc/grlib.h" #include "hw/sysbus.h" #include "qemu/module.h" diff --git a/hw/char/imx_serial.c b/hw/char/imx_serial.c index 0655a9571b..f79e47d4ee 100644 --- a/hw/char/imx_serial.c +++ b/hw/char/imx_serial.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "hw/char/imx_serial.h" +#include "hw/irq.h" #include "sysemu/sysemu.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/char/ipoctal232.c b/hw/char/ipoctal232.c index 5ab731e408..7674e2d7b6 100644 --- a/hw/char/ipoctal232.c +++ b/hw/char/ipoctal232.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #include "hw/ipack/ipack.h" +#include "hw/irq.h" #include "qemu/bitops.h" #include "qemu/module.h" #include "chardev/char-fe.h" diff --git a/hw/char/lm32_uart.c b/hw/char/lm32_uart.c index d047a44e34..377032567a 100644 --- a/hw/char/lm32_uart.c +++ b/hw/char/lm32_uart.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "trace.h" #include "chardev/char-fe.h" diff --git a/hw/char/mcf_uart.c b/hw/char/mcf_uart.c index 7b06110c4d..c403a1fdc6 100644 --- a/hw/char/mcf_uart.c +++ b/hw/char/mcf_uart.c @@ -8,6 +8,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "qemu/module.h" #include "hw/m68k/mcf.h" diff --git a/hw/char/milkymist-uart.c b/hw/char/milkymist-uart.c index 8a78fcca8f..d4641b5f44 100644 --- a/hw/char/milkymist-uart.c +++ b/hw/char/milkymist-uart.c @@ -23,6 +23,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "trace.h" #include "chardev/char-fe.h" diff --git a/hw/char/nrf51_uart.c b/hw/char/nrf51_uart.c index c90b491477..bbe766d3c6 100644 --- a/hw/char/nrf51_uart.c +++ b/hw/char/nrf51_uart.c @@ -16,6 +16,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/char/nrf51_uart.h" +#include "hw/irq.h" #include "trace.h" static void nrf51_uart_update_irq(NRF51UARTState *s) diff --git a/hw/char/parallel.c b/hw/char/parallel.c index fed15dc548..ea8ab35e59 100644 --- a/hw/char/parallel.c +++ b/hw/char/parallel.c @@ -29,6 +29,7 @@ #include "hw/hw.h" #include "chardev/char-parallel.h" #include "chardev/char-fe.h" +#include "hw/irq.h" #include "hw/isa/isa.h" #include "hw/char/parallel.h" #include "sysemu/reset.h" diff --git a/hw/char/pl011.c b/hw/char/pl011.c index c1ae2f31f5..a2da375528 100644 --- a/hw/char/pl011.c +++ b/hw/char/pl011.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "hw/char/pl011.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "chardev/char-fe.h" #include "qemu/log.h" diff --git a/hw/char/serial-pci-multi.c b/hw/char/serial-pci-multi.c index 63dcbaa984..65dbfbd205 100644 --- a/hw/char/serial-pci-multi.c +++ b/hw/char/serial-pci-multi.c @@ -30,6 +30,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/char/serial.h" +#include "hw/irq.h" #include "hw/pci/pci.h" #define PCI_SERIAL_MAX_PORTS 4 diff --git a/hw/char/serial-pci.c b/hw/char/serial-pci.c index 9028efbda8..808d32b508 100644 --- a/hw/char/serial-pci.c +++ b/hw/char/serial-pci.c @@ -29,6 +29,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/char/serial.h" +#include "hw/irq.h" #include "hw/pci/pci.h" typedef struct PCISerialState { diff --git a/hw/char/serial.c b/hw/char/serial.c index a9e42f7d97..1d977287ea 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/char/serial.h" +#include "hw/irq.h" #include "chardev/char-serial.h" #include "qapi/error.h" #include "qemu/timer.h" diff --git a/hw/char/sh_serial.c b/hw/char/sh_serial.c index 67740b7ee6..7a40aa90af 100644 --- a/hw/char/sh_serial.c +++ b/hw/char/sh_serial.c @@ -24,8 +24,10 @@ * 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/irq.h" #include "hw/sh4/sh.h" #include "chardev/char-fe.h" #include "qapi/error.h" diff --git a/hw/char/spapr_vty.c b/hw/char/spapr_vty.c index 871d2666f3..f360ab3612 100644 --- a/hw/char/spapr_vty.c +++ b/hw/char/spapr_vty.c @@ -5,6 +5,7 @@ #include "cpu.h" #include "hw/qdev.h" #include "chardev/char-fe.h" +#include "hw/irq.h" #include "hw/ppc/spapr.h" #include "hw/ppc/spapr_vio.h" diff --git a/hw/char/stm32f2xx_usart.c b/hw/char/stm32f2xx_usart.c index 40c365b908..f43eb74fb1 100644 --- a/hw/char/stm32f2xx_usart.c +++ b/hw/char/stm32f2xx_usart.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "hw/char/stm32f2xx_usart.h" +#include "hw/irq.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/char/xilinx_uartlite.c b/hw/char/xilinx_uartlite.c index 880962a756..250eed945c 100644 --- a/hw/char/xilinx_uartlite.c +++ b/hw/char/xilinx_uartlite.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "qemu/module.h" #include "chardev/char-fe.h" diff --git a/hw/core/or-irq.c b/hw/core/or-irq.c index 123a8c644a..6ed34d9238 100644 --- a/hw/core/or-irq.c +++ b/hw/core/or-irq.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/or-irq.h" #include "qemu/module.h" diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 94ebc0a4a1..5c4b67a408 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -35,6 +35,7 @@ #include "qemu/error-report.h" #include "qemu/option.h" #include "hw/hotplug.h" +#include "hw/irq.h" #include "hw/boards.h" #include "hw/sysbus.h" diff --git a/hw/core/split-irq.c b/hw/core/split-irq.c index c606f4a802..6808e812b5 100644 --- a/hw/core/split-irq.c +++ b/hw/core/split-irq.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/core/split-irq.h" +#include "hw/irq.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/cpu/a15mpcore.c b/hw/cpu/a15mpcore.c index 980f230d75..fc19ed0214 100644 --- a/hw/cpu/a15mpcore.c +++ b/hw/cpu/a15mpcore.c @@ -22,6 +22,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/cpu/a15mpcore.h" +#include "hw/irq.h" #include "sysemu/kvm.h" #include "kvm_arm.h" diff --git a/hw/cpu/a9mpcore.c b/hw/cpu/a9mpcore.c index 187e4d939e..9dda4d8888 100644 --- a/hw/cpu/a9mpcore.c +++ b/hw/cpu/a9mpcore.c @@ -12,6 +12,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/cpu/a9mpcore.h" +#include "hw/irq.h" #include "qom/cpu.h" static void a9mp_priv_set_irq(void *opaque, int irq, int level) diff --git a/hw/cpu/arm11mpcore.c b/hw/cpu/arm11mpcore.c index 2404f93a3e..c611a6ff32 100644 --- a/hw/cpu/arm11mpcore.c +++ b/hw/cpu/arm11mpcore.c @@ -12,6 +12,7 @@ #include "qemu/module.h" #include "hw/cpu/arm11mpcore.h" #include "hw/intc/realview_gic.h" +#include "hw/irq.h" static void mpcore_priv_set_irq(void *opaque, int irq, int level) diff --git a/hw/cpu/realview_mpcore.c b/hw/cpu/realview_mpcore.c index f06294bb5e..34da446d94 100644 --- a/hw/cpu/realview_mpcore.c +++ b/hw/cpu/realview_mpcore.c @@ -13,6 +13,7 @@ #include "qemu/module.h" #include "hw/cpu/arm11mpcore.h" #include "hw/intc/realview_gic.h" +#include "hw/irq.h" #define TYPE_REALVIEW_MPCORE_RIRQ "realview_mpcore" #define REALVIEW_MPCORE_RIRQ(obj) \ diff --git a/hw/display/ads7846.c b/hw/display/ads7846.c index 1a97e97638..12d8272615 100644 --- a/hw/display/ads7846.c +++ b/hw/display/ads7846.c @@ -11,6 +11,7 @@ */ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/ssi/ssi.h" #include "qemu/module.h" #include "ui/console.h" diff --git a/hw/display/bcm2835_fb.c b/hw/display/bcm2835_fb.c index 2311ec75b8..e446355f29 100644 --- a/hw/display/bcm2835_fb.c +++ b/hw/display/bcm2835_fb.c @@ -26,6 +26,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/display/bcm2835_fb.h" +#include "hw/irq.h" #include "framebuffer.h" #include "ui/pixel_ops.h" #include "hw/misc/bcm2835_mbox_defs.h" diff --git a/hw/display/cg3.c b/hw/display/cg3.c index a7340dc1c2..7cf9ebd604 100644 --- a/hw/display/cg3.c +++ b/hw/display/cg3.c @@ -29,6 +29,7 @@ #include "qemu/error-report.h" #include "ui/console.h" #include "hw/sysbus.h" +#include "hw/irq.h" #include "hw/loader.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/display/exynos4210_fimd.c b/hw/display/exynos4210_fimd.c index 61f7408b1c..889622eefa 100644 --- a/hw/display/exynos4210_fimd.c +++ b/hw/display/exynos4210_fimd.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "ui/console.h" #include "ui/pixel_ops.h" diff --git a/hw/display/g364fb.c b/hw/display/g364fb.c index 1774b4452e..89248f87df 100644 --- a/hw/display/g364fb.c +++ b/hw/display/g364fb.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "hw/hw.h" +#include "hw/irq.h" #include "qemu/error-report.h" #include "qemu/module.h" #include "ui/console.h" diff --git a/hw/display/milkymist-tmu2.c b/hw/display/milkymist-tmu2.c index e1ed018b8f..3f92378410 100644 --- a/hw/display/milkymist-tmu2.c +++ b/hw/display/milkymist-tmu2.c @@ -26,6 +26,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "trace.h" #include "qapi/error.h" diff --git a/hw/display/omap_dss.c b/hw/display/omap_dss.c index 601f178fdd..637aae8d39 100644 --- a/hw/display/omap_dss.c +++ b/hw/display/omap_dss.c @@ -17,8 +17,10 @@ * You should have received a copy of the GNU General Public License along * with this program; if not, see . */ + #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "ui/console.h" #include "hw/arm/omap.h" diff --git a/hw/display/omap_lcdc.c b/hw/display/omap_lcdc.c index 07a5effe04..b00ce04b3b 100644 --- a/hw/display/omap_lcdc.c +++ b/hw/display/omap_lcdc.c @@ -16,8 +16,10 @@ * You should have received a copy of the GNU General Public License along * with this program; if not, see . */ + #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "ui/console.h" #include "hw/arm/omap.h" #include "framebuffer.h" diff --git a/hw/display/pl110.c b/hw/display/pl110.c index 2bdfc3cc49..8fb510ee73 100644 --- a/hw/display/pl110.c +++ b/hw/display/pl110.c @@ -8,6 +8,7 @@ */ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "ui/console.h" #include "framebuffer.h" diff --git a/hw/display/pxa2xx_lcd.c b/hw/display/pxa2xx_lcd.c index b83f80753a..7aca3912f5 100644 --- a/hw/display/pxa2xx_lcd.c +++ b/hw/display/pxa2xx_lcd.c @@ -12,6 +12,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "ui/console.h" #include "hw/arm/pxa.h" #include "ui/pixel_ops.h" diff --git a/hw/display/tc6393xb.c b/hw/display/tc6393xb.c index 0b7c59cde7..10e7f74c74 100644 --- a/hw/display/tc6393xb.c +++ b/hw/display/tc6393xb.c @@ -10,10 +10,12 @@ * 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 "qapi/error.h" #include "qemu/host-utils.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/display/tc6393xb.h" #include "hw/block/flash.h" #include "ui/console.h" diff --git a/hw/display/xlnx_dp.c b/hw/display/xlnx_dp.c index cc5b650df0..4daac38070 100644 --- a/hw/display/xlnx_dp.c +++ b/hw/display/xlnx_dp.c @@ -27,6 +27,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/display/xlnx_dp.h" +#include "hw/irq.h" #ifndef DEBUG_DP #define DEBUG_DP 0 diff --git a/hw/dma/bcm2835_dma.c b/hw/dma/bcm2835_dma.c index a39e8f4968..090c73d951 100644 --- a/hw/dma/bcm2835_dma.c +++ b/hw/dma/bcm2835_dma.c @@ -6,6 +6,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/dma/bcm2835_dma.h" +#include "hw/irq.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/dma/etraxfs_dma.c b/hw/dma/etraxfs_dma.c index 85783eb847..4285443c81 100644 --- a/hw/dma/etraxfs_dma.c +++ b/hw/dma/etraxfs_dma.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 "hw/hw.h" +#include "hw/irq.h" #include "exec/address-spaces.h" #include "sysemu/sysemu.h" diff --git a/hw/dma/pl080.c b/hw/dma/pl080.c index 7e5762457b..be7f9c71a8 100644 --- a/hw/dma/pl080.c +++ b/hw/dma/pl080.c @@ -13,6 +13,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/dma/pl080.h" +#include "hw/irq.h" #include "qapi/error.h" #define PL080_CONF_E 0x1 diff --git a/hw/dma/pl330.c b/hw/dma/pl330.c index 58df965a46..2e59120944 100644 --- a/hw/dma/pl330.c +++ b/hw/dma/pl330.c @@ -16,6 +16,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "qapi/error.h" #include "qemu/timer.h" diff --git a/hw/dma/pxa2xx_dma.c b/hw/dma/pxa2xx_dma.c index d6fb957417..1c273fb309 100644 --- a/hw/dma/pxa2xx_dma.c +++ b/hw/dma/pxa2xx_dma.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/arm/pxa.h" #include "hw/sysbus.h" #include "qapi/error.h" diff --git a/hw/dma/rc4030.c b/hw/dma/rc4030.c index 155af9b26a..f7650f617c 100644 --- a/hw/dma/rc4030.c +++ b/hw/dma/rc4030.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/mips/mips.h" #include "hw/sysbus.h" #include "qemu/timer.h" diff --git a/hw/dma/sparc32_dma.c b/hw/dma/sparc32_dma.c index 88765d0c25..a05b6be95c 100644 --- a/hw/dma/sparc32_dma.c +++ b/hw/dma/sparc32_dma.c @@ -27,6 +27,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/sparc/sparc32_dma.h" #include "hw/sparc/sun4m_iommu.h" #include "hw/sysbus.h" diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c index 921be178d9..83b52e4ac7 100644 --- a/hw/dma/xilinx_axidma.c +++ b/hw/dma/xilinx_axidma.c @@ -26,6 +26,7 @@ #include "hw/sysbus.h" #include "qapi/error.h" #include "qemu/timer.h" +#include "hw/irq.h" #include "hw/ptimer.h" #include "qemu/log.h" #include "qemu/main-loop.h" diff --git a/hw/dma/xlnx-zdma.c b/hw/dma/xlnx-zdma.c index 51e1ead4fa..5afd77a5b8 100644 --- a/hw/dma/xlnx-zdma.c +++ b/hw/dma/xlnx-zdma.c @@ -28,6 +28,7 @@ #include "qemu/osdep.h" #include "hw/dma/xlnx-zdma.h" +#include "hw/irq.h" #include "qemu/bitops.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/dma/xlnx-zynq-devcfg.c b/hw/dma/xlnx-zynq-devcfg.c index 7a03ce1b02..855c784758 100644 --- a/hw/dma/xlnx-zynq-devcfg.c +++ b/hw/dma/xlnx-zynq-devcfg.c @@ -26,6 +26,7 @@ #include "qemu/osdep.h" #include "hw/dma/xlnx-zynq-devcfg.h" +#include "hw/irq.h" #include "qemu/bitops.h" #include "sysemu/sysemu.h" #include "sysemu/dma.h" diff --git a/hw/dma/xlnx_dpdma.c b/hw/dma/xlnx_dpdma.c index e834f81e17..1bba7f2159 100644 --- a/hw/dma/xlnx_dpdma.c +++ b/hw/dma/xlnx_dpdma.c @@ -27,6 +27,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/dma/xlnx_dpdma.h" +#include "hw/irq.h" #ifndef DEBUG_DPDMA #define DEBUG_DPDMA 0 diff --git a/hw/gpio/bcm2835_gpio.c b/hw/gpio/bcm2835_gpio.c index ba8dd6c393..ea3f3f2bda 100644 --- a/hw/gpio/bcm2835_gpio.c +++ b/hw/gpio/bcm2835_gpio.c @@ -19,6 +19,7 @@ #include "hw/sysbus.h" #include "hw/sd/sd.h" #include "hw/gpio/bcm2835_gpio.h" +#include "hw/irq.h" #define GPFSEL0 0x00 #define GPFSEL1 0x04 diff --git a/hw/gpio/gpio_key.c b/hw/gpio/gpio_key.c index 7d5510257e..66866fa87c 100644 --- a/hw/gpio/gpio_key.c +++ b/hw/gpio/gpio_key.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "qemu/module.h" #include "qemu/timer.h" diff --git a/hw/gpio/imx_gpio.c b/hw/gpio/imx_gpio.c index a51af72c1f..3d3c9644db 100644 --- a/hw/gpio/imx_gpio.c +++ b/hw/gpio/imx_gpio.c @@ -19,6 +19,7 @@ #include "qemu/osdep.h" #include "hw/gpio/imx_gpio.h" +#include "hw/irq.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/gpio/max7310.c b/hw/gpio/max7310.c index 273da622ca..b0925ab1a1 100644 --- a/hw/gpio/max7310.c +++ b/hw/gpio/max7310.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "hw/i2c/i2c.h" +#include "hw/irq.h" #include "qemu/module.h" #define TYPE_MAX7310 "max7310" diff --git a/hw/gpio/mpc8xxx.c b/hw/gpio/mpc8xxx.c index 6ff56dc3f2..f3b90b4b33 100644 --- a/hw/gpio/mpc8xxx.c +++ b/hw/gpio/mpc8xxx.c @@ -20,6 +20,7 @@ */ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "qemu/module.h" diff --git a/hw/gpio/nrf51_gpio.c b/hw/gpio/nrf51_gpio.c index dd6c16a841..24a890911a 100644 --- a/hw/gpio/nrf51_gpio.c +++ b/hw/gpio/nrf51_gpio.c @@ -14,6 +14,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/gpio/nrf51_gpio.h" +#include "hw/irq.h" #include "trace.h" /* diff --git a/hw/gpio/omap_gpio.c b/hw/gpio/omap_gpio.c index e2785c5dc7..6ab51a9428 100644 --- a/hw/gpio/omap_gpio.c +++ b/hw/gpio/omap_gpio.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/arm/omap.h" #include "hw/sysbus.h" #include "qemu/error-report.h" diff --git a/hw/gpio/pl061.c b/hw/gpio/pl061.c index 02c01fd521..c605d91c93 100644 --- a/hw/gpio/pl061.c +++ b/hw/gpio/pl061.c @@ -9,6 +9,7 @@ */ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/gpio/zaurus.c b/hw/gpio/zaurus.c index f2f1f67266..98aa416931 100644 --- a/hw/gpio/zaurus.c +++ b/hw/gpio/zaurus.c @@ -18,6 +18,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/arm/sharpsl.h" #include "hw/sysbus.h" #include "qemu/module.h" diff --git a/hw/hppa/dino.c b/hw/hppa/dino.c index e94614abbd..90da6bcbb9 100644 --- a/hw/hppa/dino.c +++ b/hw/hppa/dino.c @@ -16,6 +16,7 @@ #include "qapi/error.h" #include "cpu.h" #include "hw/hw.h" +#include "hw/irq.h" #include "sysemu/sysemu.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bus.h" diff --git a/hw/hppa/hppa_sys.h b/hw/hppa/hppa_sys.h index f5f983bf4c..43d25d21fc 100644 --- a/hw/hppa/hppa_sys.h +++ b/hw/hppa/hppa_sys.h @@ -7,7 +7,6 @@ #include "hw/pci/pci_host.h" #include "hw/ide.h" #include "hw/i386/pc.h" -#include "hw/irq.h" #include "hppa_hardware.h" diff --git a/hw/i2c/aspeed_i2c.c b/hw/i2c/aspeed_i2c.c index 219ad3806f..bb7ef3cbf3 100644 --- a/hw/i2c/aspeed_i2c.c +++ b/hw/i2c/aspeed_i2c.c @@ -23,6 +23,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/i2c/aspeed_i2c.h" +#include "hw/irq.h" /* I2C Global Register */ diff --git a/hw/i2c/bitbang_i2c.c b/hw/i2c/bitbang_i2c.c index 60c7a9be0b..2289128aaf 100644 --- a/hw/i2c/bitbang_i2c.c +++ b/hw/i2c/bitbang_i2c.c @@ -12,6 +12,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/i2c/bitbang_i2c.h" #include "hw/sysbus.h" #include "qemu/module.h" diff --git a/hw/i2c/exynos4210_i2c.c b/hw/i2c/exynos4210_i2c.c index 70a97a3e2d..07d83d5a63 100644 --- a/hw/i2c/exynos4210_i2c.c +++ b/hw/i2c/exynos4210_i2c.c @@ -25,6 +25,7 @@ #include "qemu/timer.h" #include "hw/sysbus.h" #include "hw/i2c/i2c.h" +#include "hw/irq.h" #ifndef EXYNOS4_I2C_DEBUG #define EXYNOS4_I2C_DEBUG 0 diff --git a/hw/i2c/imx_i2c.c b/hw/i2c/imx_i2c.c index ce7a94c282..1d6b695615 100644 --- a/hw/i2c/imx_i2c.c +++ b/hw/i2c/imx_i2c.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "hw/i2c/imx_i2c.h" +#include "hw/irq.h" #include "hw/i2c/i2c.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/i2c/mpc_i2c.c b/hw/i2c/mpc_i2c.c index e9a1127050..0aa4cacb65 100644 --- a/hw/i2c/mpc_i2c.c +++ b/hw/i2c/mpc_i2c.c @@ -19,6 +19,7 @@ #include "qemu/osdep.h" #include "hw/i2c/i2c.h" +#include "hw/irq.h" #include "qemu/log.h" #include "qemu/module.h" #include "hw/sysbus.h" diff --git a/hw/i2c/omap_i2c.c b/hw/i2c/omap_i2c.c index d7ebeae8e2..309a37b1fa 100644 --- a/hw/i2c/omap_i2c.c +++ b/hw/i2c/omap_i2c.c @@ -22,6 +22,7 @@ #include "qemu/module.h" #include "hw/hw.h" #include "hw/i2c/i2c.h" +#include "hw/irq.h" #include "hw/arm/omap.h" #include "hw/sysbus.h" #include "qemu/error-report.h" diff --git a/hw/i2c/ppc4xx_i2c.c b/hw/i2c/ppc4xx_i2c.c index 462729db4e..d110b417c6 100644 --- a/hw/i2c/ppc4xx_i2c.c +++ b/hw/i2c/ppc4xx_i2c.c @@ -30,6 +30,7 @@ #include "cpu.h" #include "hw/hw.h" #include "hw/i2c/ppc4xx_i2c.h" +#include "hw/irq.h" #define PPC4xx_I2C_MEM_SIZE 18 diff --git a/hw/i386/kvm/i8259.c b/hw/i386/kvm/i8259.c index bfdeab29be..d0c1b1deac 100644 --- a/hw/i386/kvm/i8259.c +++ b/hw/i386/kvm/i8259.c @@ -14,6 +14,7 @@ #include "hw/isa/i8259_internal.h" #include "qemu/module.h" #include "hw/i386/apic_internal.h" +#include "hw/irq.h" #include "sysemu/kvm.h" #define TYPE_KVM_I8259 "kvm-i8259" diff --git a/hw/i386/kvm/ioapic.c b/hw/i386/kvm/ioapic.c index e453692199..99ef530967 100644 --- a/hw/i386/kvm/ioapic.c +++ b/hw/i386/kvm/ioapic.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "monitor/monitor.h" #include "hw/i386/pc.h" +#include "hw/irq.h" #include "hw/i386/ioapic_internal.h" #include "hw/i386/apic_internal.h" #include "sysemu/kvm.h" diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 73b55500b0..1453696975 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -46,6 +46,7 @@ #include "hw/dma/i8257.h" #include "hw/timer/i8254.h" #include "hw/input/i8042.h" +#include "hw/irq.h" #include "hw/audio/pcspk.h" #include "hw/pci/msi.h" #include "hw/sysbus.h" diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index c2280c72ef..129f47493b 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -38,6 +38,7 @@ #include "net/net.h" #include "hw/boards.h" #include "hw/ide.h" +#include "hw/irq.h" #include "sysemu/kvm.h" #include "hw/kvm/clock.h" #include "sysemu/sysemu.h" diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c index e8e79e0917..f769cd91f2 100644 --- a/hw/i386/xen/xen-hvm.c +++ b/hw/i386/xen/xen-hvm.c @@ -14,6 +14,7 @@ #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" #include "hw/i386/pc.h" +#include "hw/irq.h" #include "hw/i386/apic-msidef.h" #include "hw/xen/xen_common.h" #include "hw/xen/xen-legacy-backend.h" diff --git a/hw/input/lm832x.c b/hw/input/lm832x.c index ebb72c6590..2ab6d3290b 100644 --- a/hw/input/lm832x.c +++ b/hw/input/lm832x.c @@ -21,6 +21,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/i2c/i2c.h" +#include "hw/irq.h" #include "qemu/module.h" #include "qemu/timer.h" #include "sysemu/reset.h" diff --git a/hw/input/milkymist-softusb.c b/hw/input/milkymist-softusb.c index f779cd4370..92e07fbd8c 100644 --- a/hw/input/milkymist-softusb.c +++ b/hw/input/milkymist-softusb.c @@ -28,6 +28,7 @@ #include "trace.h" #include "ui/console.h" #include "hw/input/hid.h" +#include "hw/irq.h" #include "qemu/error-report.h" #include "qemu/module.h" diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c index 5d06a53362..7e76ee7ad3 100644 --- a/hw/input/pckbd.c +++ b/hw/input/pckbd.c @@ -28,6 +28,7 @@ #include "hw/isa/isa.h" #include "hw/i386/pc.h" #include "hw/input/ps2.h" +#include "hw/irq.h" #include "hw/input/i8042.h" #include "sysemu/reset.h" #include "sysemu/sysemu.h" diff --git a/hw/input/pl050.c b/hw/input/pl050.c index b79bf1647d..2318dbfeac 100644 --- a/hw/input/pl050.c +++ b/hw/input/pl050.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "hw/input/ps2.h" +#include "hw/irq.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/input/pxa2xx_keypad.c b/hw/input/pxa2xx_keypad.c index 93db9ed25b..4788c96d19 100644 --- a/hw/input/pxa2xx_keypad.c +++ b/hw/input/pxa2xx_keypad.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/arm/pxa.h" #include "ui/console.h" diff --git a/hw/input/stellaris_input.c b/hw/input/stellaris_input.c index 20c87d86f4..55d6132bf5 100644 --- a/hw/input/stellaris_input.c +++ b/hw/input/stellaris_input.c @@ -6,9 +6,11 @@ * * This code is licensed under the GPL. */ + #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/input/gamepad.h" +#include "hw/irq.h" #include "ui/console.h" typedef struct { diff --git a/hw/input/tsc2005.c b/hw/input/tsc2005.c index 0a0431744c..e21356c18d 100644 --- a/hw/input/tsc2005.c +++ b/hw/input/tsc2005.c @@ -25,6 +25,7 @@ #include "sysemu/reset.h" #include "ui/console.h" #include "hw/input/tsc2xxx.h" +#include "hw/irq.h" #include "trace.h" #define TSC_CUT_RESOLUTION(value, p) ((value) >> (16 - (p ? 12 : 10))) diff --git a/hw/input/tsc210x.c b/hw/input/tsc210x.c index d2486f4b4e..be7d948168 100644 --- a/hw/input/tsc210x.c +++ b/hw/input/tsc210x.c @@ -27,6 +27,7 @@ #include "ui/console.h" #include "hw/arm/omap.h" /* For I2SCodec */ #include "hw/input/tsc2xxx.h" +#include "hw/irq.h" #define TSC_DATA_REGISTERS_PAGE 0x0 #define TSC_CONTROL_REGISTERS_PAGE 0x1 diff --git a/hw/intc/allwinner-a10-pic.c b/hw/intc/allwinner-a10-pic.c index 080bdd791f..9df3e18539 100644 --- a/hw/intc/allwinner-a10-pic.c +++ b/hw/intc/allwinner-a10-pic.c @@ -19,6 +19,7 @@ #include "hw/sysbus.h" #include "sysemu/sysemu.h" #include "hw/intc/allwinner-a10-pic.h" +#include "hw/irq.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c index 77427a4188..7af591daac 100644 --- a/hw/intc/arm_gic.c +++ b/hw/intc/arm_gic.c @@ -19,6 +19,7 @@ */ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "gic_internal.h" #include "qapi/error.h" diff --git a/hw/intc/arm_gicv2m.c b/hw/intc/arm_gicv2m.c index 05f299fc7f..2c96d4fba0 100644 --- a/hw/intc/arm_gicv2m.c +++ b/hw/intc/arm_gicv2m.c @@ -28,6 +28,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/sysbus.h" +#include "hw/irq.h" #include "hw/pci/msi.h" #include "sysemu/kvm.h" #include "qemu/log.h" diff --git a/hw/intc/arm_gicv3_cpuif.c b/hw/intc/arm_gicv3_cpuif.c index 3b212d91c8..a254b0ce87 100644 --- a/hw/intc/arm_gicv3_cpuif.c +++ b/hw/intc/arm_gicv3_cpuif.c @@ -17,6 +17,7 @@ #include "qemu/main-loop.h" #include "trace.h" #include "gicv3_internal.h" +#include "hw/irq.h" #include "cpu.h" void gicv3_set_gicv3state(CPUState *cpu, GICv3CPUState *s) diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c index 9f8f0d3ff5..69670a2d97 100644 --- a/hw/intc/armv7m_nvic.c +++ b/hw/intc/armv7m_nvic.c @@ -16,6 +16,7 @@ #include "hw/sysbus.h" #include "qemu/timer.h" #include "hw/intc/armv7m_nvic.h" +#include "hw/irq.h" #include "target/arm/cpu.h" #include "exec/exec-all.h" #include "qemu/log.h" diff --git a/hw/intc/aspeed_vic.c b/hw/intc/aspeed_vic.c index 266a309f3b..e17343cd73 100644 --- a/hw/intc/aspeed_vic.c +++ b/hw/intc/aspeed_vic.c @@ -29,6 +29,7 @@ #include "qemu/osdep.h" #include "hw/intc/aspeed_vic.h" +#include "hw/irq.h" #include "qemu/bitops.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/intc/bcm2835_ic.c b/hw/intc/bcm2835_ic.c index 61d37643a1..20db52bd8e 100644 --- a/hw/intc/bcm2835_ic.c +++ b/hw/intc/bcm2835_ic.c @@ -14,6 +14,7 @@ #include "qemu/osdep.h" #include "hw/intc/bcm2835_ic.h" +#include "hw/irq.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/intc/bcm2836_control.c b/hw/intc/bcm2836_control.c index 66417c85e4..a983fe565f 100644 --- a/hw/intc/bcm2836_control.c +++ b/hw/intc/bcm2836_control.c @@ -17,6 +17,7 @@ #include "qemu/osdep.h" #include "hw/intc/bcm2836_control.h" +#include "hw/irq.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/intc/etraxfs_pic.c b/hw/intc/etraxfs_pic.c index 20e1391d64..dc72dd5412 100644 --- a/hw/intc/etraxfs_pic.c +++ b/hw/intc/etraxfs_pic.c @@ -26,6 +26,7 @@ #include "hw/sysbus.h" #include "qemu/module.h" #include "hw/hw.h" +#include "hw/irq.h" //#include "pc.h" //#include "etraxfs.h" diff --git a/hw/intc/exynos4210_combiner.c b/hw/intc/exynos4210_combiner.c index 6fed0e8d16..ed558115f6 100644 --- a/hw/intc/exynos4210_combiner.c +++ b/hw/intc/exynos4210_combiner.c @@ -32,6 +32,7 @@ #include "qemu/module.h" #include "hw/arm/exynos4210.h" +#include "hw/irq.h" //#define DEBUG_COMBINER diff --git a/hw/intc/heathrow_pic.c b/hw/intc/heathrow_pic.c index c282ac4006..ac1f7c0c8f 100644 --- a/hw/intc/heathrow_pic.c +++ b/hw/intc/heathrow_pic.c @@ -28,6 +28,7 @@ #include "hw/ppc/mac.h" #include "qemu/module.h" #include "hw/intc/heathrow_pic.h" +#include "hw/irq.h" #include "trace.h" static inline int heathrow_check_irq(HeathrowPICState *pic) diff --git a/hw/intc/i8259.c b/hw/intc/i8259.c index 76f3d873b8..e581e6b0ab 100644 --- a/hw/intc/i8259.c +++ b/hw/intc/i8259.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 "hw/hw.h" #include "hw/i386/pc.h" +#include "hw/irq.h" #include "hw/isa/isa.h" #include "qemu/timer.h" #include "qemu/log.h" diff --git a/hw/intc/imx_avic.c b/hw/intc/imx_avic.c index 83a4101528..022ed05b6f 100644 --- a/hw/intc/imx_avic.c +++ b/hw/intc/imx_avic.c @@ -17,6 +17,7 @@ #include "qemu/osdep.h" #include "hw/intc/imx_avic.h" +#include "hw/irq.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/intc/lm32_pic.c b/hw/intc/lm32_pic.c index 170fa7a1ac..c133d30cf2 100644 --- a/hw/intc/lm32_pic.c +++ b/hw/intc/lm32_pic.c @@ -26,6 +26,7 @@ #include "trace.h" #include "hw/lm32/lm32_pic.h" #include "hw/intc/intc.h" +#include "hw/irq.h" #define TYPE_LM32_PIC "lm32-pic" #define LM32_PIC(obj) OBJECT_CHECK(LM32PicState, (obj), TYPE_LM32_PIC) diff --git a/hw/intc/mips_gic.c b/hw/intc/mips_gic.c index e27e333766..166eb6ecce 100644 --- a/hw/intc/mips_gic.c +++ b/hw/intc/mips_gic.c @@ -21,6 +21,7 @@ #include "sysemu/reset.h" #include "kvm_mips.h" #include "hw/intc/mips_gic.h" +#include "hw/irq.h" static void mips_gic_set_vp_irq(MIPSGICState *gic, int vp, int pin) { diff --git a/hw/intc/nios2_iic.c b/hw/intc/nios2_iic.c index 7329434b91..3a5d86c2a4 100644 --- a/hw/intc/nios2_iic.c +++ b/hw/intc/nios2_iic.c @@ -22,6 +22,7 @@ #include "qemu/module.h" #include "qapi/error.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "cpu.h" diff --git a/hw/intc/omap_intc.c b/hw/intc/omap_intc.c index 053e67c66b..4b3ddc0a67 100644 --- a/hw/intc/omap_intc.c +++ b/hw/intc/omap_intc.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/arm/omap.h" #include "hw/sysbus.h" #include "qemu/error-report.h" diff --git a/hw/intc/ompic.c b/hw/intc/ompic.c index 9cb310a5dd..31004ac613 100644 --- a/hw/intc/ompic.c +++ b/hw/intc/ompic.c @@ -11,6 +11,7 @@ #include "qemu/module.h" #include "qapi/error.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "exec/memory.h" diff --git a/hw/intc/openpic.c b/hw/intc/openpic.c index 9b4fc6cf43..49d64bccfe 100644 --- a/hw/intc/openpic.c +++ b/hw/intc/openpic.c @@ -36,6 +36,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/ppc/mac.h" #include "hw/pci/pci.h" #include "hw/ppc/openpic.h" diff --git a/hw/intc/pl190.c b/hw/intc/pl190.c index b4f31efc45..1a5e760f0f 100644 --- a/hw/intc/pl190.c +++ b/hw/intc/pl190.c @@ -8,6 +8,7 @@ */ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/intc/puv3_intc.c b/hw/intc/puv3_intc.c index e2f6d9875a..e018955ce8 100644 --- a/hw/intc/puv3_intc.c +++ b/hw/intc/puv3_intc.c @@ -10,6 +10,7 @@ */ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/sysbus.h" #undef DEBUG_PUV3 diff --git a/hw/intc/realview_gic.c b/hw/intc/realview_gic.c index 99557544db..ac22a2abde 100644 --- a/hw/intc/realview_gic.c +++ b/hw/intc/realview_gic.c @@ -11,6 +11,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/intc/realview_gic.h" +#include "hw/irq.h" static void realview_gic_set_irq(void *opaque, int irq, int level) { diff --git a/hw/intc/sh_intc.c b/hw/intc/sh_intc.c index bac7886f25..62521500f9 100644 --- a/hw/intc/sh_intc.c +++ b/hw/intc/sh_intc.c @@ -12,6 +12,7 @@ #include "cpu.h" #include "hw/sh4/sh_intc.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/sh4/sh.h" //#define DEBUG_INTC diff --git a/hw/intc/slavio_intctl.c b/hw/intc/slavio_intctl.c index ca528753bf..e97afcadf6 100644 --- a/hw/intc/slavio_intctl.c +++ b/hw/intc/slavio_intctl.c @@ -27,6 +27,7 @@ #include "qemu/module.h" #include "hw/sysbus.h" #include "hw/intc/intc.h" +#include "hw/irq.h" #include "trace.h" //#define DEBUG_IRQ_COUNT diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 9ed224ce5f..beb37b1a2b 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -37,6 +37,7 @@ #include "qapi/visitor.h" #include "monitor/monitor.h" #include "hw/intc/intc.h" +#include "hw/irq.h" #include "sysemu/kvm.h" #include "sysemu/reset.h" diff --git a/hw/intc/xilinx_intc.c b/hw/intc/xilinx_intc.c index d5363e977f..baf5353cd1 100644 --- a/hw/intc/xilinx_intc.c +++ b/hw/intc/xilinx_intc.c @@ -26,6 +26,7 @@ #include "hw/sysbus.h" #include "qemu/module.h" #include "hw/hw.h" +#include "hw/irq.h" #define D(x) diff --git a/hw/intc/xive.c b/hw/intc/xive.c index b27d6b8646..d977ed568f 100644 --- a/hw/intc/xive.c +++ b/hw/intc/xive.c @@ -17,6 +17,7 @@ #include "sysemu/reset.h" #include "hw/qdev-properties.h" #include "monitor/monitor.h" +#include "hw/irq.h" #include "hw/ppc/xive.h" #include "hw/ppc/xive_regs.h" diff --git a/hw/intc/xlnx-pmu-iomod-intc.c b/hw/intc/xlnx-pmu-iomod-intc.c index 0b8ff897dc..9fcd17c6fd 100644 --- a/hw/intc/xlnx-pmu-iomod-intc.c +++ b/hw/intc/xlnx-pmu-iomod-intc.c @@ -31,6 +31,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/intc/xlnx-pmu-iomod-intc.h" +#include "hw/irq.h" #ifndef XLNX_PMU_IO_INTC_ERR_DEBUG #define XLNX_PMU_IO_INTC_ERR_DEBUG 0 diff --git a/hw/intc/xlnx-zynqmp-ipi.c b/hw/intc/xlnx-zynqmp-ipi.c index 0dad6c04f5..43a1b789b5 100644 --- a/hw/intc/xlnx-zynqmp-ipi.c +++ b/hw/intc/xlnx-zynqmp-ipi.c @@ -32,6 +32,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/intc/xlnx-zynqmp-ipi.h" +#include "hw/irq.h" #ifndef XLNX_ZYNQMP_IPI_ERR_DEBUG #define XLNX_ZYNQMP_IPI_ERR_DEBUG 0 diff --git a/hw/ipack/ipack.c b/hw/ipack/ipack.c index 6b1b72f94d..b8ff979d72 100644 --- a/hw/ipack/ipack.c +++ b/hw/ipack/ipack.c @@ -12,6 +12,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/ipack/ipack.h" +#include "hw/irq.h" IPackDevice *ipack_device_find(IPackBus *bus, int32_t slot) { diff --git a/hw/ipack/tpci200.c b/hw/ipack/tpci200.c index d4d85107d0..7ee9d01771 100644 --- a/hw/ipack/tpci200.c +++ b/hw/ipack/tpci200.c @@ -11,6 +11,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "hw/ipack/ipack.h" +#include "hw/irq.h" #include "hw/pci/pci.h" #include "qemu/bitops.h" #include "qemu/module.h" diff --git a/hw/ipmi/isa_ipmi_bt.c b/hw/ipmi/isa_ipmi_bt.c index 1846d5b9a4..af07278c19 100644 --- a/hw/ipmi/isa_ipmi_bt.c +++ b/hw/ipmi/isa_ipmi_bt.c @@ -28,6 +28,7 @@ #include "qapi/error.h" #include "hw/hw.h" #include "hw/ipmi/ipmi.h" +#include "hw/irq.h" #include "hw/isa/isa.h" /* Control register */ diff --git a/hw/ipmi/isa_ipmi_kcs.c b/hw/ipmi/isa_ipmi_kcs.c index 068f341256..583497685a 100644 --- a/hw/ipmi/isa_ipmi_kcs.c +++ b/hw/ipmi/isa_ipmi_kcs.c @@ -28,6 +28,7 @@ #include "qapi/error.h" #include "hw/hw.h" #include "hw/ipmi/ipmi.h" +#include "hw/irq.h" #include "hw/isa/isa.h" #define IPMI_KCS_OBF_BIT 0 diff --git a/hw/isa/i82378.c b/hw/isa/i82378.c index c08970b24a..90ebba59b7 100644 --- a/hw/isa/i82378.c +++ b/hw/isa/i82378.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "hw/pci/pci.h" #include "hw/i386/pc.h" +#include "hw/irq.h" #include "hw/timer/i8254.h" #include "hw/audio/pcspk.h" diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c index a7081bd52d..42a1232787 100644 --- a/hw/isa/lpc_ich9.c +++ b/hw/isa/lpc_ich9.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 "cpu.h" #include "hw/hw.h" @@ -35,6 +36,7 @@ #include "hw/isa/isa.h" #include "hw/sysbus.h" #include "hw/i386/pc.h" +#include "hw/irq.h" #include "hw/isa/apm.h" #include "hw/i386/ioapic.h" #include "hw/pci/pci.h" diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c index e075ebc8a6..d710980045 100644 --- a/hw/lm32/lm32_boards.c +++ b/hw/lm32/lm32_boards.c @@ -23,6 +23,7 @@ #include "cpu.h" #include "hw/sysbus.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/block/flash.h" #include "hw/boards.h" #include "hw/loader.h" diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c index 33669ee19b..864712d977 100644 --- a/hw/lm32/milkymist.c +++ b/hw/lm32/milkymist.c @@ -24,6 +24,7 @@ #include "cpu.h" #include "hw/sysbus.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/block/flash.h" #include "sysemu/sysemu.h" #include "sysemu/qtest.h" diff --git a/hw/m68k/mcf5206.c b/hw/m68k/mcf5206.c index 1c17f83eed..5ee1498f48 100644 --- a/hw/m68k/mcf5206.c +++ b/hw/m68k/mcf5206.c @@ -5,10 +5,12 @@ * * This code is licensed under the GPL */ + #include "qemu/osdep.h" #include "qemu/error-report.h" #include "cpu.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/m68k/mcf.h" #include "qemu/timer.h" #include "hw/ptimer.h" diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c index 6f6efae9fc..3a21c62809 100644 --- a/hw/m68k/mcf5208.c +++ b/hw/m68k/mcf5208.c @@ -5,6 +5,7 @@ * * This code is licensed under the GPL */ + #include "qemu/osdep.h" #include "qemu/units.h" #include "qemu/error-report.h" @@ -12,6 +13,7 @@ #include "qemu-common.h" #include "cpu.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/m68k/mcf.h" #include "hw/m68k/mcf_fec.h" #include "qemu/timer.h" diff --git a/hw/m68k/mcf_intc.c b/hw/m68k/mcf_intc.c index a613aed820..d9e03a06ab 100644 --- a/hw/m68k/mcf_intc.c +++ b/hw/m68k/mcf_intc.c @@ -10,6 +10,7 @@ #include "qemu/module.h" #include "cpu.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "hw/m68k/mcf.h" diff --git a/hw/mips/gt64xxx_pci.c b/hw/mips/gt64xxx_pci.c index 2fa313f498..15d4adb3cd 100644 --- a/hw/mips/gt64xxx_pci.c +++ b/hw/mips/gt64xxx_pci.c @@ -30,6 +30,7 @@ #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" #include "hw/i386/pc.h" +#include "hw/irq.h" #include "exec/address-spaces.h" #include "trace.h" diff --git a/hw/mips/mips_int.c b/hw/mips/mips_int.c index f899f6ceb3..ae4244c32e 100644 --- a/hw/mips/mips_int.c +++ b/hw/mips/mips_int.c @@ -23,6 +23,7 @@ #include "qemu/osdep.h" #include "qemu/main-loop.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/mips/cpudevs.h" #include "cpu.h" #include "sysemu/kvm.h" diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 29bc8de5cf..02200ab7d4 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -43,6 +43,7 @@ #include "qemu/log.h" #include "hw/mips/bios.h" #include "hw/ide.h" +#include "hw/irq.h" #include "hw/loader.h" #include "elf.h" #include "hw/timer/mc146818rtc.h" diff --git a/hw/misc/arm_sysctl.c b/hw/misc/arm_sysctl.c index 457dfadfab..be8c9c0a7f 100644 --- a/hw/misc/arm_sysctl.c +++ b/hw/misc/arm_sysctl.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "qemu/timer.h" #include "qemu/bitops.h" #include "hw/sysbus.h" diff --git a/hw/misc/armsse-mhu.c b/hw/misc/armsse-mhu.c index 514321a9ec..f8d4187bb8 100644 --- a/hw/misc/armsse-mhu.c +++ b/hw/misc/armsse-mhu.c @@ -23,6 +23,7 @@ #include "sysemu/sysemu.h" #include "hw/sysbus.h" #include "hw/registerfields.h" +#include "hw/irq.h" #include "hw/misc/armsse-mhu.h" REG32(CPU0INTR_STAT, 0x0) diff --git a/hw/misc/aspeed_xdma.c b/hw/misc/aspeed_xdma.c index eebd4ad540..18a83bcc6c 100644 --- a/hw/misc/aspeed_xdma.c +++ b/hw/misc/aspeed_xdma.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "qemu/error-report.h" +#include "hw/irq.h" #include "hw/misc/aspeed_xdma.h" #include "qapi/error.h" diff --git a/hw/misc/bcm2835_mbox.c b/hw/misc/bcm2835_mbox.c index a87da5ee53..e484d25c29 100644 --- a/hw/misc/bcm2835_mbox.c +++ b/hw/misc/bcm2835_mbox.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "hw/irq.h" #include "hw/misc/bcm2835_mbox.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/bcm2835_property.c b/hw/misc/bcm2835_property.c index 0bf789cf60..51cd93fc8b 100644 --- a/hw/misc/bcm2835_property.c +++ b/hw/misc/bcm2835_property.c @@ -6,6 +6,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/misc/bcm2835_property.h" +#include "hw/irq.h" #include "hw/misc/bcm2835_mbox_defs.h" #include "sysemu/dma.h" #include "qemu/log.h" diff --git a/hw/misc/eccmemctl.c b/hw/misc/eccmemctl.c index 8386db07df..c16d56c8c7 100644 --- a/hw/misc/eccmemctl.c +++ b/hw/misc/eccmemctl.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "qemu/module.h" #include "trace.h" diff --git a/hw/misc/iotkit-secctl.c b/hw/misc/iotkit-secctl.c index 58fd94b14f..963fd6efd3 100644 --- a/hw/misc/iotkit-secctl.c +++ b/hw/misc/iotkit-secctl.c @@ -16,6 +16,7 @@ #include "trace.h" #include "hw/sysbus.h" #include "hw/registerfields.h" +#include "hw/irq.h" #include "hw/misc/iotkit-secctl.h" /* Registers in the secure privilege control block */ diff --git a/hw/misc/macio/mac_dbdma.c b/hw/misc/macio/mac_dbdma.c index 548625a5f0..8a1de8c31d 100644 --- a/hw/misc/macio/mac_dbdma.c +++ b/hw/misc/macio/mac_dbdma.c @@ -39,6 +39,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/ppc/mac_dbdma.h" #include "qemu/main-loop.h" #include "qemu/module.h" diff --git a/hw/misc/macio/pmu.c b/hw/misc/macio/pmu.c index 753561d3f1..6280bcbc61 100644 --- a/hw/misc/macio/pmu.c +++ b/hw/misc/macio/pmu.c @@ -33,6 +33,7 @@ #include "hw/hw.h" #include "hw/ppc/mac.h" #include "hw/input/adb.h" +#include "hw/irq.h" #include "hw/misc/mos6522.h" #include "hw/misc/macio/gpio.h" #include "hw/misc/macio/pmu.h" diff --git a/hw/misc/max111x.c b/hw/misc/max111x.c index d373ece0c9..6fd7210c67 100644 --- a/hw/misc/max111x.c +++ b/hw/misc/max111x.c @@ -11,6 +11,7 @@ */ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/ssi/ssi.h" #include "qemu/module.h" diff --git a/hw/misc/milkymist-pfpu.c b/hw/misc/milkymist-pfpu.c index 1c27f1a4bc..fb21b898d1 100644 --- a/hw/misc/milkymist-pfpu.c +++ b/hw/misc/milkymist-pfpu.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "trace.h" #include "qemu/log.h" diff --git a/hw/misc/mos6522.c b/hw/misc/mos6522.c index e72ed69d51..84c677c131 100644 --- a/hw/misc/mos6522.c +++ b/hw/misc/mos6522.c @@ -27,6 +27,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/input/adb.h" +#include "hw/irq.h" #include "hw/misc/mos6522.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" diff --git a/hw/misc/mst_fpga.c b/hw/misc/mst_fpga.c index fd18303724..256746ac15 100644 --- a/hw/misc/mst_fpga.c +++ b/hw/misc/mst_fpga.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "qemu/module.h" diff --git a/hw/misc/nrf51_rng.c b/hw/misc/nrf51_rng.c index 96ef4330eb..cf1bec223e 100644 --- a/hw/misc/nrf51_rng.c +++ b/hw/misc/nrf51_rng.c @@ -14,6 +14,7 @@ #include "qemu/module.h" #include "qapi/error.h" #include "hw/arm/nrf51.h" +#include "hw/irq.h" #include "hw/misc/nrf51_rng.h" #include "qemu/guest-random.h" diff --git a/hw/misc/omap_clk.c b/hw/misc/omap_clk.c index 9ea14186d4..c77ca2fc74 100644 --- a/hw/misc/omap_clk.c +++ b/hw/misc/omap_clk.c @@ -18,8 +18,10 @@ * You should have received a copy of the GNU General Public License along * with this program; if not, see . */ + #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/arm/omap.h" struct clk { diff --git a/hw/misc/omap_gpmc.c b/hw/misc/omap_gpmc.c index 84f9e4c612..6253b0b2d4 100644 --- a/hw/misc/omap_gpmc.c +++ b/hw/misc/omap_gpmc.c @@ -18,8 +18,10 @@ * You should have received a copy of the GNU General Public License along * with this program; if not, see . */ + #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/block/flash.h" #include "hw/arm/omap.h" #include "exec/memory.h" diff --git a/hw/misc/pc-testdev.c b/hw/misc/pc-testdev.c index 1f9abd52b8..46adb6b5fc 100644 --- a/hw/misc/pc-testdev.c +++ b/hw/misc/pc-testdev.c @@ -39,6 +39,7 @@ #include "hw/hw.h" #include "hw/qdev.h" #include "qemu/module.h" +#include "hw/irq.h" #include "hw/isa/isa.h" #define IOMEM_LEN 0x10000 diff --git a/hw/misc/slavio_misc.c b/hw/misc/slavio_misc.c index 9c2cf04646..5f351950db 100644 --- a/hw/misc/slavio_misc.c +++ b/hw/misc/slavio_misc.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "sysemu/sysemu.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "qemu/module.h" #include "trace.h" diff --git a/hw/misc/tmp105.c b/hw/misc/tmp105.c index 19def5c20f..2e304218f4 100644 --- a/hw/misc/tmp105.c +++ b/hw/misc/tmp105.c @@ -21,6 +21,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/i2c/i2c.h" +#include "hw/irq.h" #include "tmp105.h" #include "qapi/error.h" #include "qapi/visitor.h" diff --git a/hw/misc/tz-mpc.c b/hw/misc/tz-mpc.c index 45a3e31c3d..802aeb7377 100644 --- a/hw/misc/tz-mpc.c +++ b/hw/misc/tz-mpc.c @@ -16,6 +16,7 @@ #include "trace.h" #include "hw/sysbus.h" #include "hw/registerfields.h" +#include "hw/irq.h" #include "hw/misc/tz-mpc.h" /* Our IOMMU has two IOMMU indexes, one for secure transactions and one for diff --git a/hw/misc/tz-msc.c b/hw/misc/tz-msc.c index 52b96ba70d..7d1a536ce4 100644 --- a/hw/misc/tz-msc.c +++ b/hw/misc/tz-msc.c @@ -16,6 +16,7 @@ #include "trace.h" #include "hw/sysbus.h" #include "hw/registerfields.h" +#include "hw/irq.h" #include "hw/misc/tz-msc.h" static void tz_msc_update_irq(TZMSC *s) diff --git a/hw/misc/tz-ppc.c b/hw/misc/tz-ppc.c index 2a14a26f29..54db7fc152 100644 --- a/hw/misc/tz-ppc.c +++ b/hw/misc/tz-ppc.c @@ -16,6 +16,7 @@ #include "trace.h" #include "hw/sysbus.h" #include "hw/registerfields.h" +#include "hw/irq.h" #include "hw/misc/tz-ppc.h" static void tz_ppc_update_irq(TZPPC *s) diff --git a/hw/misc/zynq-xadc.c b/hw/misc/zynq-xadc.c index f1e48601dc..c5cff5a8a9 100644 --- a/hw/misc/zynq-xadc.c +++ b/hw/misc/zynq-xadc.c @@ -15,6 +15,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/misc/zynq-xadc.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" diff --git a/hw/net/allwinner_emac.c b/hw/net/allwinner_emac.c index eecda52800..dad25bd4e9 100644 --- a/hw/net/allwinner_emac.c +++ b/hw/net/allwinner_emac.c @@ -21,6 +21,7 @@ #include "hw/sysbus.h" #include "net/net.h" #include "qemu/fifo8.h" +#include "hw/irq.h" #include "hw/net/allwinner_emac.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c index d412085884..f4e4a4dd87 100644 --- a/hw/net/cadence_gem.c +++ b/hw/net/cadence_gem.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include /* For crc32 */ +#include "hw/irq.h" #include "hw/net/cadence_gem.h" #include "qapi/error.h" #include "qemu/log.h" diff --git a/hw/net/can/can_kvaser_pci.c b/hw/net/can/can_kvaser_pci.c index df639f8fa0..3b8e38eb83 100644 --- a/hw/net/can/can_kvaser_pci.c +++ b/hw/net/can/can_kvaser_pci.c @@ -37,6 +37,7 @@ #include "qapi/error.h" #include "chardev/char.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/pci/pci.h" #include "net/can_emu.h" diff --git a/hw/net/can/can_mioe3680_pci.c b/hw/net/can/can_mioe3680_pci.c index 7af0993d7a..c09ae69261 100644 --- a/hw/net/can/can_mioe3680_pci.c +++ b/hw/net/can/can_mioe3680_pci.c @@ -33,6 +33,7 @@ #include "qapi/error.h" #include "chardev/char.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/pci/pci.h" #include "net/can_emu.h" diff --git a/hw/net/can/can_pcm3680_pci.c b/hw/net/can/can_pcm3680_pci.c index 3f7312af07..843a76cf37 100644 --- a/hw/net/can/can_pcm3680_pci.c +++ b/hw/net/can/can_pcm3680_pci.c @@ -33,6 +33,7 @@ #include "qapi/error.h" #include "chardev/char.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/pci/pci.h" #include "net/can_emu.h" diff --git a/hw/net/can/can_sja1000.c b/hw/net/can/can_sja1000.c index 9a85038c8a..ee079d355f 100644 --- a/hw/net/can/can_sja1000.c +++ b/hw/net/can/can_sja1000.c @@ -24,10 +24,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "qemu/log.h" #include "chardev/char.h" #include "hw/hw.h" +#include "hw/irq.h" #include "net/can_emu.h" #include "can_sja1000.h" diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c index bdb0b3b2c2..70a78ad337 100644 --- a/hw/net/dp8393x.c +++ b/hw/net/dp8393x.c @@ -18,6 +18,7 @@ */ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "net/net.h" #include "qapi/error.h" diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c index 2a8b99a2e4..e217238296 100644 --- a/hw/net/fsl_etsec/etsec.c +++ b/hw/net/fsl_etsec/etsec.c @@ -29,6 +29,7 @@ #include "qemu/osdep.h" #include "sysemu/sysemu.h" #include "hw/sysbus.h" +#include "hw/irq.h" #include "hw/ptimer.h" #include "etsec.h" #include "registers.h" diff --git a/hw/net/ftgmac100.c b/hw/net/ftgmac100.c index d2cded5e94..2848bff3e5 100644 --- a/hw/net/ftgmac100.c +++ b/hw/net/ftgmac100.c @@ -12,6 +12,7 @@ */ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/net/ftgmac100.h" #include "sysemu/dma.h" #include "qemu/log.h" diff --git a/hw/net/imx_fec.c b/hw/net/imx_fec.c index 404154ebbf..fe9d9028fa 100644 --- a/hw/net/imx_fec.c +++ b/hw/net/imx_fec.c @@ -22,6 +22,7 @@ */ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/net/imx_fec.h" #include "sysemu/dma.h" #include "qemu/log.h" diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c index f6120be219..e2da54cbd8 100644 --- a/hw/net/lan9118.c +++ b/hw/net/lan9118.c @@ -14,6 +14,7 @@ #include "hw/sysbus.h" #include "net/net.h" #include "net/eth.h" +#include "hw/irq.h" #include "hw/net/lan9118.h" #include "sysemu/sysemu.h" #include "hw/ptimer.h" diff --git a/hw/net/mcf_fec.c b/hw/net/mcf_fec.c index 78468fad6b..e4a3b55eb6 100644 --- a/hw/net/mcf_fec.c +++ b/hw/net/mcf_fec.c @@ -8,6 +8,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "net/net.h" #include "qemu/module.h" #include "hw/m68k/mcf.h" diff --git a/hw/net/milkymist-minimac2.c b/hw/net/milkymist-minimac2.c index 41ef7a4456..bad1066781 100644 --- a/hw/net/milkymist-minimac2.c +++ b/hw/net/milkymist-minimac2.c @@ -26,6 +26,7 @@ #include "qapi/error.h" #include "cpu.h" /* FIXME: why does this use TARGET_PAGE_ALIGN? */ #include "hw/hw.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "trace.h" #include "net/net.h" diff --git a/hw/net/mipsnet.c b/hw/net/mipsnet.c index c5fbd8431f..007c94aa30 100644 --- a/hw/net/mipsnet.c +++ b/hw/net/mipsnet.c @@ -1,5 +1,6 @@ #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "net/net.h" #include "qemu/module.h" #include "trace.h" diff --git a/hw/net/ne2000-pci.c b/hw/net/ne2000-pci.c index cb05744f3c..4f28e31baa 100644 --- a/hw/net/ne2000-pci.c +++ b/hw/net/ne2000-pci.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 "hw/irq.h" #include "hw/pci/pci.h" #include "ne2000.h" #include "sysemu/sysemu.h" diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c index 1cf4b57341..4b9231c495 100644 --- a/hw/net/ne2000.c +++ b/hw/net/ne2000.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "net/eth.h" #include "qemu/module.h" +#include "hw/irq.h" #include "ne2000.h" #include "sysemu/sysemu.h" #include "trace.h" diff --git a/hw/net/opencores_eth.c b/hw/net/opencores_eth.c index a5abb8df46..3e759d79d8 100644 --- a/hw/net/opencores_eth.c +++ b/hw/net/opencores_eth.c @@ -33,6 +33,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/net/mii.h" #include "hw/sysbus.h" #include "net/net.h" diff --git a/hw/net/pcnet-pci.c b/hw/net/pcnet-pci.c index 600d09ce92..df8cb6621f 100644 --- a/hw/net/pcnet-pci.c +++ b/hw/net/pcnet-pci.c @@ -28,6 +28,7 @@ */ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/pci/pci.h" #include "net/net.h" #include "qemu/module.h" diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c index 16683091c9..f73e3422f4 100644 --- a/hw/net/pcnet.c +++ b/hw/net/pcnet.c @@ -37,6 +37,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" +#include "hw/irq.h" #include "hw/qdev.h" #include "net/net.h" #include "net/eth.h" diff --git a/hw/net/smc91c111.c b/hw/net/smc91c111.c index 4a612eebe9..f5149124e6 100644 --- a/hw/net/smc91c111.c +++ b/hw/net/smc91c111.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "net/net.h" +#include "hw/irq.h" #include "hw/net/smc91c111.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/net/spapr_llan.c b/hw/net/spapr_llan.c index f162d49025..1867c355e3 100644 --- a/hw/net/spapr_llan.c +++ b/hw/net/spapr_llan.c @@ -28,6 +28,7 @@ #include "qemu/osdep.h" #include "cpu.h" #include "hw/hw.h" +#include "hw/irq.h" #include "qemu/log.h" #include "qemu/module.h" #include "net/net.h" diff --git a/hw/net/stellaris_enet.c b/hw/net/stellaris_enet.c index 2f645bfb71..756ac5600b 100644 --- a/hw/net/stellaris_enet.c +++ b/hw/net/stellaris_enet.c @@ -8,6 +8,7 @@ */ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "net/net.h" #include "qemu/log.h" diff --git a/hw/net/xgmac.c b/hw/net/xgmac.c index f49df95b07..c2efc77452 100644 --- a/hw/net/xgmac.c +++ b/hw/net/xgmac.c @@ -25,6 +25,7 @@ */ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c index feeaca680e..b1247a1d9b 100644 --- a/hw/net/xilinx_axienet.c +++ b/hw/net/xilinx_axienet.c @@ -30,6 +30,7 @@ #include "net/net.h" #include "net/checksum.h" +#include "hw/irq.h" #include "hw/stream.h" #define DPHY(x) diff --git a/hw/net/xilinx_ethlite.c b/hw/net/xilinx_ethlite.c index 8f3a8f8597..27a4fc8d87 100644 --- a/hw/net/xilinx_ethlite.c +++ b/hw/net/xilinx_ethlite.c @@ -27,6 +27,7 @@ #include "cpu.h" /* FIXME should not use tswap* */ #include "hw/sysbus.h" #include "hw/hw.h" +#include "hw/irq.h" #include "net/net.h" #define D(x) diff --git a/hw/nios2/cpu_pic.c b/hw/nios2/cpu_pic.c index 5525e25ff0..1c1989d56a 100644 --- a/hw/nios2/cpu_pic.c +++ b/hw/nios2/cpu_pic.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "cpu.h" +#include "hw/irq.h" #include "qemu/config-file.h" diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c index cb2fc5ba78..965d5b44ee 100644 --- a/hw/openrisc/openrisc_sim.c +++ b/hw/openrisc/openrisc_sim.c @@ -23,6 +23,7 @@ #include "qapi/error.h" #include "cpu.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/boards.h" #include "elf.h" #include "hw/char/serial.h" diff --git a/hw/openrisc/pic_cpu.c b/hw/openrisc/pic_cpu.c index 2f53cfc82e..d3f179ff8d 100644 --- a/hw/openrisc/pic_cpu.c +++ b/hw/openrisc/pic_cpu.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "cpu.h" /* OpenRISC pic handler */ diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index 36c7ca45ad..ca526bd71b 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -42,6 +42,7 @@ #include "hw/hw.h" #include "hw/pci/pci.h" #include "hw/i386/pc.h" +#include "hw/irq.h" #include "hw/mips/mips.h" #include "hw/pci/pci_host.h" #include "sysemu/reset.h" diff --git a/hw/pci-host/designware.c b/hw/pci-host/designware.c index 9ae8c0deb7..de4300d554 100644 --- a/hw/pci-host/designware.c +++ b/hw/pci-host/designware.c @@ -25,6 +25,7 @@ #include "hw/pci/pci_bridge.h" #include "hw/pci/pci_host.h" #include "hw/pci/pcie_port.h" +#include "hw/irq.h" #include "hw/pci-host/designware.h" #define DESIGNWARE_PCIE_PORT_LINK_CONTROL 0x710 diff --git a/hw/pci-host/gpex.c b/hw/pci-host/gpex.c index 629d1a4624..72c58a054b 100644 --- a/hw/pci-host/gpex.c +++ b/hw/pci-host/gpex.c @@ -32,6 +32,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/pci-host/gpex.h" #include "qemu/module.h" diff --git a/hw/pci-host/grackle.c b/hw/pci-host/grackle.c index ed3b3c361f..912f8bf13f 100644 --- a/hw/pci-host/grackle.c +++ b/hw/pci-host/grackle.c @@ -28,6 +28,7 @@ #include "hw/ppc/mac.h" #include "hw/pci/pci.h" #include "hw/intc/heathrow_pic.h" +#include "hw/irq.h" #include "qapi/error.h" #include "qemu/module.h" #include "trace.h" diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index e5955457ab..ecf634a04d 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/i386/pc.h" +#include "hw/irq.h" #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" #include "hw/isa/isa.h" diff --git a/hw/pci-host/ppce500.c b/hw/pci-host/ppce500.c index 21eaa30a20..406ebf0438 100644 --- a/hw/pci-host/ppce500.c +++ b/hw/pci-host/ppce500.c @@ -16,6 +16,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/ppc/e500-ccsr.h" #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c index c564f234af..2b68af9811 100644 --- a/hw/pci-host/prep.c +++ b/hw/pci-host/prep.c @@ -32,6 +32,7 @@ #include "hw/pci/pci_bus.h" #include "hw/pci/pci_host.h" #include "hw/i386/pc.h" +#include "hw/irq.h" #include "hw/loader.h" #include "hw/or-irq.h" #include "exec/address-spaces.h" diff --git a/hw/pci-host/sabre.c b/hw/pci-host/sabre.c index 2cec1116af..772ac1f725 100644 --- a/hw/pci-host/sabre.c +++ b/hw/pci-host/sabre.c @@ -30,6 +30,7 @@ #include "hw/pci/pci_host.h" #include "hw/pci/pci_bridge.h" #include "hw/pci/pci_bus.h" +#include "hw/irq.h" #include "hw/pci-bridge/simba.h" #include "hw/pci-host/sabre.h" #include "sysemu/sysemu.h" diff --git a/hw/pci-host/uninorth.c b/hw/pci-host/uninorth.c index 680fefd066..4ffb2d0d03 100644 --- a/hw/pci-host/uninorth.c +++ b/hw/pci-host/uninorth.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/ppc/mac.h" #include "qemu/module.h" #include "hw/pci/pci.h" diff --git a/hw/pci-host/versatile.c b/hw/pci-host/versatile.c index 791b321ea0..221cc40134 100644 --- a/hw/pci-host/versatile.c +++ b/hw/pci-host/versatile.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "hw/irq.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bus.h" #include "hw/pci/pci_host.h" diff --git a/hw/pci-host/xilinx-pcie.c b/hw/pci-host/xilinx-pcie.c index 192b697453..f42fabbbe7 100644 --- a/hw/pci-host/xilinx-pcie.c +++ b/hw/pci-host/xilinx-pcie.c @@ -22,6 +22,7 @@ #include "qemu/units.h" #include "qapi/error.h" #include "hw/pci/pci_bridge.h" +#include "hw/irq.h" #include "hw/pci-host/xilinx-pcie.h" enum root_cfg_reg { diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 43a3cac138..bc7ce92dcb 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bridge.h" #include "hw/pci/pci_bus.h" diff --git a/hw/pcmcia/pxa2xx.c b/hw/pcmcia/pxa2xx.c index 8993b784bb..26ab2267de 100644 --- a/hw/pcmcia/pxa2xx.c +++ b/hw/pcmcia/pxa2xx.c @@ -12,6 +12,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "qemu/module.h" #include "hw/pcmcia.h" diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 566f179bb1..0451a4e338 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -45,6 +45,7 @@ #include "hw/platform-bus.h" #include "hw/net/fsl_etsec/etsec.h" #include "hw/i2c/i2c.h" +#include "hw/irq.h" #define EPAPR_MAGIC (0x45504150) #define BINARY_DEVICE_TREE_FILE "mpc8544ds.dtb" diff --git a/hw/ppc/pnv_lpc.c b/hw/ppc/pnv_lpc.c index a9f150c3ca..d4433d73e1 100644 --- a/hw/ppc/pnv_lpc.c +++ b/hw/ppc/pnv_lpc.c @@ -23,6 +23,7 @@ #include "qapi/error.h" #include "qemu/log.h" #include "qemu/module.h" +#include "hw/irq.h" #include "hw/isa/isa.h" #include "hw/ppc/pnv.h" diff --git a/hw/ppc/pnv_psi.c b/hw/ppc/pnv_psi.c index 6b26d0f6bc..e66aeec4aa 100644 --- a/hw/ppc/pnv_psi.c +++ b/hw/ppc/pnv_psi.c @@ -19,6 +19,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "target/ppc/cpu.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c index a9e508c496..163a34ee4c 100644 --- a/hw/ppc/ppc.c +++ b/hw/ppc/ppc.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 "cpu.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/ppc/ppc.h" #include "hw/ppc/ppc_e500.h" #include "qemu/timer.h" diff --git a/hw/ppc/ppc405_uc.c b/hw/ppc/ppc405_uc.c index f9d98fe71e..bb62714fd9 100644 --- a/hw/ppc/ppc405_uc.c +++ b/hw/ppc/ppc405_uc.c @@ -30,6 +30,7 @@ #include "hw/ppc/ppc.h" #include "hw/boards.h" #include "hw/i2c/ppc4xx_i2c.h" +#include "hw/irq.h" #include "ppc405.h" #include "hw/char/serial.h" #include "qemu/timer.h" diff --git a/hw/ppc/ppc440_pcix.c b/hw/ppc/ppc440_pcix.c index ca54631f9d..77a78388c1 100644 --- a/hw/ppc/ppc440_pcix.c +++ b/hw/ppc/ppc440_pcix.c @@ -24,6 +24,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/ppc/ppc.h" #include "hw/ppc/ppc4xx.h" #include "hw/pci/pci.h" diff --git a/hw/ppc/ppc440_uc.c b/hw/ppc/ppc440_uc.c index 7329cfe651..6570c2d120 100644 --- a/hw/ppc/ppc440_uc.c +++ b/hw/ppc/ppc440_uc.c @@ -16,6 +16,7 @@ #include "qemu/module.h" #include "cpu.h" #include "hw/hw.h" +#include "hw/irq.h" #include "exec/address-spaces.h" #include "exec/memory.h" #include "hw/ppc/ppc.h" diff --git a/hw/ppc/ppc4xx_devs.c b/hw/ppc/ppc4xx_devs.c index e62bef3b8d..49d714756f 100644 --- a/hw/ppc/ppc4xx_devs.c +++ b/hw/ppc/ppc4xx_devs.c @@ -27,6 +27,7 @@ #include "sysemu/reset.h" #include "cpu.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/ppc/ppc.h" #include "hw/ppc/ppc4xx.h" #include "hw/boards.h" diff --git a/hw/ppc/ppc4xx_pci.c b/hw/ppc/ppc4xx_pci.c index b013319c60..27f25f4e58 100644 --- a/hw/ppc/ppc4xx_pci.c +++ b/hw/ppc/ppc4xx_pci.c @@ -21,6 +21,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/ppc/ppc.h" #include "hw/ppc/ppc4xx.h" #include "qemu/module.h" diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index 84e968e28c..01dc7e111b 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -39,6 +39,7 @@ #include "qemu/error-report.h" #include "qemu/log.h" #include "hw/ide.h" +#include "hw/irq.h" #include "hw/loader.h" #include "hw/timer/mc146818rtc.h" #include "hw/isa/pc87312.h" diff --git a/hw/ppc/prep_systemio.c b/hw/ppc/prep_systemio.c index df7603b986..898ab1533f 100644 --- a/hw/ppc/prep_systemio.c +++ b/hw/ppc/prep_systemio.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/isa/isa.h" #include "exec/address-spaces.h" #include "qemu/error-report.h" /* for error_report() */ diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c index ae0f093f59..d75359c5f3 100644 --- a/hw/ppc/spapr_events.c +++ b/hw/ppc/spapr_events.c @@ -24,6 +24,7 @@ * THE SOFTWARE. * */ + #include "qemu/osdep.h" #include "qapi/error.h" #include "cpu.h" @@ -35,6 +36,7 @@ #include "hw/ppc/spapr.h" #include "hw/ppc/spapr_vio.h" #include "hw/pci/pci.h" +#include "hw/irq.h" #include "hw/pci-host/spapr.h" #include "hw/ppc/spapr_drc.h" #include "qemu/help_option.h" diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c index ff3df0bbd8..132b7a8253 100644 --- a/hw/ppc/spapr_irq.c +++ b/hw/ppc/spapr_irq.c @@ -11,6 +11,7 @@ #include "qemu/log.h" #include "qemu/error-report.h" #include "qapi/error.h" +#include "hw/irq.h" #include "hw/ppc/spapr.h" #include "hw/ppc/spapr_cpu_core.h" #include "hw/ppc/spapr_xive.h" diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index 9003fe9010..54d0a32c17 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -27,6 +27,7 @@ #include "qapi/error.h" #include "cpu.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "hw/pci/pci.h" #include "hw/pci/msi.h" diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c index 583c13deda..0f4f4bedd3 100644 --- a/hw/ppc/spapr_vio.c +++ b/hw/ppc/spapr_vio.c @@ -24,6 +24,7 @@ #include "qapi/error.h" #include "qapi/visitor.h" #include "hw/hw.h" +#include "hw/irq.h" #include "qemu/log.h" #include "sysemu/sysemu.h" #include "hw/boards.h" diff --git a/hw/riscv/sifive_gpio.c b/hw/riscv/sifive_gpio.c index 06bd8112d7..da19daa880 100644 --- a/hw/riscv/sifive_gpio.c +++ b/hw/riscv/sifive_gpio.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" +#include "hw/irq.h" #include "hw/riscv/sifive_gpio.h" #include "trace.h" diff --git a/hw/riscv/sifive_uart.c b/hw/riscv/sifive_uart.c index 3b3f94f51d..d18613fb33 100644 --- a/hw/riscv/sifive_uart.c +++ b/hw/riscv/sifive_uart.c @@ -22,6 +22,7 @@ #include "chardev/char.h" #include "chardev/char-fe.h" #include "target/riscv/cpu.h" +#include "hw/irq.h" #include "hw/riscv/sifive_uart.h" /* diff --git a/hw/scsi/esp-pci.c b/hw/scsi/esp-pci.c index 342f500f82..f945502f3a 100644 --- a/hw/scsi/esp-pci.c +++ b/hw/scsi/esp-pci.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/pci/pci.h" +#include "hw/irq.h" #include "hw/nvram/eeprom93xx.h" #include "hw/scsi/esp.h" #include "trace.h" diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index 7508d035ca..3b717e9526 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "hw/irq.h" #include "hw/scsi/esp.h" #include "trace.h" #include "qemu/log.h" diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c index 10468c1ec1..1a042aa00b 100644 --- a/hw/scsi/lsi53c895a.c +++ b/hw/scsi/lsi53c895a.c @@ -16,6 +16,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/pci/pci.h" #include "hw/scsi/scsi.h" #include "sysemu/dma.h" diff --git a/hw/sd/bcm2835_sdhost.c b/hw/sd/bcm2835_sdhost.c index 2778fb0de4..4609cc031c 100644 --- a/hw/sd/bcm2835_sdhost.c +++ b/hw/sd/bcm2835_sdhost.c @@ -15,6 +15,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "sysemu/blockdev.h" +#include "hw/irq.h" #include "hw/sd/bcm2835_sdhost.h" #include "trace.h" diff --git a/hw/sd/omap_mmc.c b/hw/sd/omap_mmc.c index d0c98ca021..15a0bbe87d 100644 --- a/hw/sd/omap_mmc.c +++ b/hw/sd/omap_mmc.c @@ -18,9 +18,11 @@ * You should have received a copy of the GNU General Public License along * with this program; if not, see . */ + #include "qemu/osdep.h" #include "qemu/log.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/arm/omap.h" #include "hw/sd/sd.h" diff --git a/hw/sd/pl181.c b/hw/sd/pl181.c index 81b406dbf0..3c615f2b8f 100644 --- a/hw/sd/pl181.c +++ b/hw/sd/pl181.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #include "sysemu/blockdev.h" #include "hw/sysbus.h" +#include "hw/irq.h" #include "hw/sd/sd.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/sd/pxa2xx_mmci.c b/hw/sd/pxa2xx_mmci.c index 81ff5cea86..1eb1248cad 100644 --- a/hw/sd/pxa2xx_mmci.c +++ b/hw/sd/pxa2xx_mmci.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "hw/arm/pxa.h" #include "hw/sd/sd.h" diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 917195a65b..21adf2be16 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -34,6 +34,7 @@ #include "qemu/units.h" #include "hw/qdev.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/registerfields.h" #include "sysemu/block-backend.h" #include "hw/sd/sd.h" diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 7b80b1d93f..46c7fbd677 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -27,6 +27,7 @@ #include "qemu/error-report.h" #include "qapi/error.h" #include "hw/hw.h" +#include "hw/irq.h" #include "sysemu/dma.h" #include "qemu/timer.h" #include "qemu/bitops.h" diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c index da79bf0337..9838ea3323 100644 --- a/hw/sh4/r2d.c +++ b/hw/sh4/r2d.c @@ -37,6 +37,7 @@ #include "net/net.h" #include "sh7750_regs.h" #include "hw/ide.h" +#include "hw/irq.h" #include "hw/loader.h" #include "hw/usb.h" #include "hw/block/flash.h" diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c index 2fb6e618d9..b35d07265d 100644 --- a/hw/sh4/sh7750.c +++ b/hw/sh4/sh7750.c @@ -22,8 +22,10 @@ * 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/irq.h" #include "hw/sh4/sh.h" #include "sysemu/sysemu.h" #include "sh7750_regs.h" diff --git a/hw/sh4/sh_pci.c b/hw/sh4/sh_pci.c index b15f264e99..71afd23b67 100644 --- a/hw/sh4/sh_pci.c +++ b/hw/sh4/sh_pci.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "hw/sh4/sh.h" +#include "hw/irq.h" #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" #include "qemu/bswap.h" diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c index c7ddfa2cfe..9c43806690 100644 --- a/hw/sparc/leon3.c +++ b/hw/sparc/leon3.c @@ -29,6 +29,7 @@ #include "qemu-common.h" #include "cpu.h" #include "hw/hw.h" +#include "hw/irq.h" #include "qemu/timer.h" #include "hw/ptimer.h" #include "sysemu/sysemu.h" diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 93a69c12fb..0f9cda19f3 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -44,6 +44,7 @@ #include "hw/nvram/fw_cfg.h" #include "hw/char/escc.h" #include "hw/empty_slot.h" +#include "hw/irq.h" #include "hw/loader.h" #include "elf.h" #include "trace.h" diff --git a/hw/sparc/sun4m_iommu.c b/hw/sparc/sun4m_iommu.c index 45a61ecf87..36b5c0c133 100644 --- a/hw/sparc/sun4m_iommu.c +++ b/hw/sparc/sun4m_iommu.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/sparc/sun4m_iommu.h" #include "hw/sysbus.h" #include "qemu/module.h" diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c index 81f2fb7f70..eb6eee6586 100644 --- a/hw/ssi/aspeed_smc.c +++ b/hw/ssi/aspeed_smc.c @@ -29,6 +29,7 @@ #include "qemu/module.h" #include "qemu/error-report.h" +#include "hw/irq.h" #include "hw/ssi/aspeed_smc.h" /* CE Type Setting Register */ diff --git a/hw/ssi/imx_spi.c b/hw/ssi/imx_spi.c index 5cec9b5d05..79c8a6dae7 100644 --- a/hw/ssi/imx_spi.c +++ b/hw/ssi/imx_spi.c @@ -9,6 +9,7 @@ */ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/ssi/imx_spi.h" #include "sysemu/sysemu.h" #include "qemu/log.h" diff --git a/hw/ssi/mss-spi.c b/hw/ssi/mss-spi.c index 4c9da5d2b2..d000c91341 100644 --- a/hw/ssi/mss-spi.c +++ b/hw/ssi/mss-spi.c @@ -24,6 +24,7 @@ */ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/ssi/mss-spi.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/ssi/omap_spi.c b/hw/ssi/omap_spi.c index f278a55160..7c7e689707 100644 --- a/hw/ssi/omap_spi.c +++ b/hw/ssi/omap_spi.c @@ -19,9 +19,11 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ + #include "qemu/osdep.h" #include "qemu/log.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/arm/omap.h" /* Multichannel SPI */ diff --git a/hw/ssi/pl022.c b/hw/ssi/pl022.c index fec73cae26..286b08438d 100644 --- a/hw/ssi/pl022.c +++ b/hw/ssi/pl022.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "hw/irq.h" #include "hw/ssi/pl022.h" #include "hw/ssi/ssi.h" #include "qemu/log.h" diff --git a/hw/ssi/xilinx_spi.c b/hw/ssi/xilinx_spi.c index 1379cb164b..5495d3e3cb 100644 --- a/hw/ssi/xilinx_spi.c +++ b/hw/ssi/xilinx_spi.c @@ -31,6 +31,7 @@ #include "qemu/module.h" #include "qemu/fifo8.h" +#include "hw/irq.h" #include "hw/ssi/ssi.h" #ifdef XILINX_SPI_ERR_DEBUG diff --git a/hw/ssi/xilinx_spips.c b/hw/ssi/xilinx_spips.c index b29e0a4a89..451d5a0783 100644 --- a/hw/ssi/xilinx_spips.c +++ b/hw/ssi/xilinx_spips.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "sysemu/sysemu.h" +#include "hw/irq.h" #include "hw/ptimer.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/timer/a9gtimer.c b/hw/timer/a9gtimer.c index 09e2a7b7bf..0d18497322 100644 --- a/hw/timer/a9gtimer.c +++ b/hw/timer/a9gtimer.c @@ -21,6 +21,7 @@ */ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/timer/a9gtimer.h" #include "qapi/error.h" #include "qemu/timer.h" diff --git a/hw/timer/allwinner-a10-pit.c b/hw/timer/allwinner-a10-pit.c index 763e1090ec..490e584604 100644 --- a/hw/timer/allwinner-a10-pit.c +++ b/hw/timer/allwinner-a10-pit.c @@ -16,6 +16,7 @@ */ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "sysemu/sysemu.h" #include "hw/timer/allwinner-a10-pit.h" diff --git a/hw/timer/altera_timer.c b/hw/timer/altera_timer.c index 5c1d9e4074..0dd4f321f7 100644 --- a/hw/timer/altera_timer.c +++ b/hw/timer/altera_timer.c @@ -24,6 +24,7 @@ #include "hw/sysbus.h" #include "sysemu/sysemu.h" +#include "hw/irq.h" #include "hw/ptimer.h" #define R_STATUS 0 diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c index 93044aacfd..3092b85d91 100644 --- a/hw/timer/arm_mptimer.c +++ b/hw/timer/arm_mptimer.c @@ -20,6 +20,7 @@ */ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/ptimer.h" #include "hw/timer/arm_mptimer.h" #include "qapi/error.h" diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c index f0a753404d..30ad2245da 100644 --- a/hw/timer/arm_timer.c +++ b/hw/timer/arm_timer.c @@ -11,6 +11,7 @@ #include "hw/sysbus.h" #include "qemu/timer.h" #include "hw/qdev.h" +#include "hw/irq.h" #include "hw/ptimer.h" #include "qemu/main-loop.h" #include "qemu/module.h" diff --git a/hw/timer/armv7m_systick.c b/hw/timer/armv7m_systick.c index 94640743b5..8a91ba345b 100644 --- a/hw/timer/armv7m_systick.c +++ b/hw/timer/armv7m_systick.c @@ -11,6 +11,7 @@ #include "qemu/osdep.h" #include "hw/timer/armv7m_systick.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "qemu/timer.h" #include "qemu/log.h" diff --git a/hw/timer/aspeed_timer.c b/hw/timer/aspeed_timer.c index 29cc5e8070..c8e4892989 100644 --- a/hw/timer/aspeed_timer.c +++ b/hw/timer/aspeed_timer.c @@ -11,6 +11,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "hw/timer/aspeed_timer.h" #include "qemu/bitops.h" diff --git a/hw/timer/cadence_ttc.c b/hw/timer/cadence_ttc.c index 115d935f84..810c08a0ae 100644 --- a/hw/timer/cadence_ttc.c +++ b/hw/timer/cadence_ttc.c @@ -17,6 +17,7 @@ */ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "qemu/module.h" #include "qemu/timer.h" diff --git a/hw/timer/cmsdk-apb-dualtimer.c b/hw/timer/cmsdk-apb-dualtimer.c index 383f6e12b1..7328abb40b 100644 --- a/hw/timer/cmsdk-apb-dualtimer.c +++ b/hw/timer/cmsdk-apb-dualtimer.c @@ -23,6 +23,7 @@ #include "qemu/main-loop.h" #include "qemu/module.h" #include "hw/sysbus.h" +#include "hw/irq.h" #include "hw/registerfields.h" #include "hw/timer/cmsdk-apb-dualtimer.h" diff --git a/hw/timer/cmsdk-apb-timer.c b/hw/timer/cmsdk-apb-timer.c index 2e7318b81f..07f82e5fa1 100644 --- a/hw/timer/cmsdk-apb-timer.c +++ b/hw/timer/cmsdk-apb-timer.c @@ -34,6 +34,7 @@ #include "qapi/error.h" #include "trace.h" #include "hw/sysbus.h" +#include "hw/irq.h" #include "hw/registerfields.h" #include "hw/timer/cmsdk-apb-timer.h" diff --git a/hw/timer/etraxfs_timer.c b/hw/timer/etraxfs_timer.c index 18887b2be2..2fd54ad4dc 100644 --- a/hw/timer/etraxfs_timer.c +++ b/hw/timer/etraxfs_timer.c @@ -28,6 +28,7 @@ #include "sysemu/sysemu.h" #include "qemu/module.h" #include "qemu/timer.h" +#include "hw/irq.h" #include "hw/ptimer.h" #define D(x) diff --git a/hw/timer/exynos4210_mct.c b/hw/timer/exynos4210_mct.c index 874c7b8522..25e2125af8 100644 --- a/hw/timer/exynos4210_mct.c +++ b/hw/timer/exynos4210_mct.c @@ -61,6 +61,7 @@ #include "hw/ptimer.h" #include "hw/arm/exynos4210.h" +#include "hw/irq.h" //#define DEBUG_MCT diff --git a/hw/timer/exynos4210_pwm.c b/hw/timer/exynos4210_pwm.c index 9bc0327785..2af7b374cc 100644 --- a/hw/timer/exynos4210_pwm.c +++ b/hw/timer/exynos4210_pwm.c @@ -29,6 +29,7 @@ #include "hw/ptimer.h" #include "hw/arm/exynos4210.h" +#include "hw/irq.h" //#define DEBUG_PWM diff --git a/hw/timer/exynos4210_rtc.c b/hw/timer/exynos4210_rtc.c index 0ecedf7394..b9dfaf51f7 100644 --- a/hw/timer/exynos4210_rtc.c +++ b/hw/timer/exynos4210_rtc.c @@ -35,6 +35,7 @@ #include "hw/ptimer.h" #include "hw/hw.h" +#include "hw/irq.h" #include "sysemu/sysemu.h" #include "hw/arm/exynos4210.h" diff --git a/hw/timer/grlib_gptimer.c b/hw/timer/grlib_gptimer.c index e45a49075b..28ba1259d0 100644 --- a/hw/timer/grlib_gptimer.c +++ b/hw/timer/grlib_gptimer.c @@ -26,6 +26,7 @@ #include "hw/sparc/grlib.h" #include "hw/sysbus.h" #include "qemu/timer.h" +#include "hw/irq.h" #include "hw/ptimer.h" #include "qemu/main-loop.h" #include "qemu/module.h" diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c index 41024f39fb..17838df783 100644 --- a/hw/timer/hpet.c +++ b/hw/timer/hpet.c @@ -27,6 +27,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/i386/pc.h" +#include "hw/irq.h" #include "ui/console.h" #include "qapi/error.h" #include "qemu/error-report.h" diff --git a/hw/timer/i8254.c b/hw/timer/i8254.c index 0972c4724e..97258757b1 100644 --- a/hw/timer/i8254.c +++ b/hw/timer/i8254.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "qemu/module.h" #include "qemu/timer.h" #include "hw/timer/i8254.h" diff --git a/hw/timer/imx_epit.c b/hw/timer/imx_epit.c index 7a883160f4..afeb74339a 100644 --- a/hw/timer/imx_epit.c +++ b/hw/timer/imx_epit.c @@ -14,6 +14,7 @@ #include "qemu/osdep.h" #include "hw/timer/imx_epit.h" +#include "hw/irq.h" #include "hw/misc/imx_ccm.h" #include "qemu/main-loop.h" #include "qemu/module.h" diff --git a/hw/timer/imx_gpt.c b/hw/timer/imx_gpt.c index 3086c03774..b4cfc52019 100644 --- a/hw/timer/imx_gpt.c +++ b/hw/timer/imx_gpt.c @@ -13,6 +13,7 @@ */ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/timer/imx_gpt.h" #include "qemu/main-loop.h" #include "qemu/module.h" diff --git a/hw/timer/lm32_timer.c b/hw/timer/lm32_timer.c index 6ce876c6ae..4beffc1396 100644 --- a/hw/timer/lm32_timer.c +++ b/hw/timer/lm32_timer.c @@ -23,6 +23,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "trace.h" #include "qemu/timer.h" diff --git a/hw/timer/m48t59.c b/hw/timer/m48t59.c index 030c8872a2..e2479c504a 100644 --- a/hw/timer/m48t59.c +++ b/hw/timer/m48t59.c @@ -26,6 +26,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/timer/m48t59.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index 21fcba5e3a..0410cccafa 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -28,6 +28,7 @@ #include "qemu/module.h" #include "qemu/bcd.h" #include "hw/hw.h" +#include "hw/irq.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" #include "sysemu/replay.h" diff --git a/hw/timer/milkymist-sysctl.c b/hw/timer/milkymist-sysctl.c index a9d250877c..0f9c39715d 100644 --- a/hw/timer/milkymist-sysctl.c +++ b/hw/timer/milkymist-sysctl.c @@ -23,6 +23,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "sysemu/sysemu.h" #include "trace.h" diff --git a/hw/timer/mss-timer.c b/hw/timer/mss-timer.c index 6add47af99..1be9baf9c0 100644 --- a/hw/timer/mss-timer.c +++ b/hw/timer/mss-timer.c @@ -27,6 +27,7 @@ #include "qemu/main-loop.h" #include "qemu/module.h" #include "qemu/log.h" +#include "hw/irq.h" #include "hw/timer/mss-timer.h" #ifndef MSS_TIMER_ERR_DEBUG diff --git a/hw/timer/nrf51_timer.c b/hw/timer/nrf51_timer.c index 29fb81a744..297403c4fd 100644 --- a/hw/timer/nrf51_timer.c +++ b/hw/timer/nrf51_timer.c @@ -15,6 +15,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/arm/nrf51.h" +#include "hw/irq.h" #include "hw/timer/nrf51_timer.h" #include "trace.h" diff --git a/hw/timer/omap_gptimer.c b/hw/timer/omap_gptimer.c index ae2dc99832..c34f60b5d4 100644 --- a/hw/timer/omap_gptimer.c +++ b/hw/timer/omap_gptimer.c @@ -17,8 +17,10 @@ * You should have received a copy of the GNU General Public License along * with this program; if not, see . */ + #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "qemu/timer.h" #include "hw/arm/omap.h" diff --git a/hw/timer/pl031.c b/hw/timer/pl031.c index 1a7e2ee06b..435c4a6c7e 100644 --- a/hw/timer/pl031.c +++ b/hw/timer/pl031.c @@ -14,6 +14,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "hw/timer/pl031.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" diff --git a/hw/timer/puv3_ost.c b/hw/timer/puv3_ost.c index 4a8ae37ffd..6fe370049b 100644 --- a/hw/timer/puv3_ost.c +++ b/hw/timer/puv3_ost.c @@ -11,6 +11,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "hw/irq.h" #include "hw/ptimer.h" #include "qemu/main-loop.h" #include "qemu/module.h" diff --git a/hw/timer/pxa2xx_timer.c b/hw/timer/pxa2xx_timer.c index 8c1ef43cd5..9c3b2b80ab 100644 --- a/hw/timer/pxa2xx_timer.c +++ b/hw/timer/pxa2xx_timer.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" #include "hw/arm/pxa.h" diff --git a/hw/timer/sh_timer.c b/hw/timer/sh_timer.c index 91b18ba312..adcc0c138e 100644 --- a/hw/timer/sh_timer.c +++ b/hw/timer/sh_timer.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/sh4/sh.h" #include "qemu/timer.h" #include "qemu/main-loop.h" diff --git a/hw/timer/slavio_timer.c b/hw/timer/slavio_timer.c index 005fd599e8..310a0a126a 100644 --- a/hw/timer/slavio_timer.c +++ b/hw/timer/slavio_timer.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "qemu/timer.h" +#include "hw/irq.h" #include "hw/ptimer.h" #include "hw/sysbus.h" #include "trace.h" diff --git a/hw/timer/stm32f2xx_timer.c b/hw/timer/stm32f2xx_timer.c index 4c49dc4995..d7af928667 100644 --- a/hw/timer/stm32f2xx_timer.c +++ b/hw/timer/stm32f2xx_timer.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/timer/stm32f2xx_timer.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/timer/twl92230.c b/hw/timer/twl92230.c index 91ae7bf203..795f894a39 100644 --- a/hw/timer/twl92230.c +++ b/hw/timer/twl92230.c @@ -24,6 +24,7 @@ #include "hw/hw.h" #include "qemu/timer.h" #include "hw/i2c/i2c.h" +#include "hw/irq.h" #include "migration/qemu-file-types.h" #include "sysemu/sysemu.h" #include "ui/console.h" diff --git a/hw/timer/xilinx_timer.c b/hw/timer/xilinx_timer.c index 16bcd0393b..c4a83af8b9 100644 --- a/hw/timer/xilinx_timer.c +++ b/hw/timer/xilinx_timer.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "hw/irq.h" #include "hw/ptimer.h" #include "qemu/log.h" #include "qemu/main-loop.h" diff --git a/hw/timer/xlnx-zynqmp-rtc.c b/hw/timer/xlnx-zynqmp-rtc.c index 36daf0c7e7..48c3fba677 100644 --- a/hw/timer/xlnx-zynqmp-rtc.c +++ b/hw/timer/xlnx-zynqmp-rtc.c @@ -31,6 +31,7 @@ #include "qemu/bitops.h" #include "qemu/log.h" #include "qemu/module.h" +#include "hw/irq.h" #include "hw/ptimer.h" #include "qemu/cutils.h" #include "sysemu/sysemu.h" diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c index 174618ac30..5cfe1e3050 100644 --- a/hw/tpm/tpm_tis.c +++ b/hw/tpm/tpm_tis.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/isa/isa.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/unicore32/puv3.c b/hw/unicore32/puv3.c index 132e6086ee..7e933de228 100644 --- a/hw/unicore32/puv3.c +++ b/hw/unicore32/puv3.c @@ -20,6 +20,7 @@ #undef DEBUG_PUV3 #include "hw/unicore32/puv3.h" #include "hw/input/i8042.h" +#include "hw/irq.h" #define KERNEL_LOAD_ADDR 0x03000000 #define KERNEL_MAX_SIZE 0x00800000 /* Just a guess */ diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c index 62dab0592f..d2189fc844 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -28,6 +28,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "hw/irq.h" #include "hw/usb/ehci-regs.h" #include "hw/usb/hcd-ehci.h" #include "trace.h" diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c index 4f6fdbc0a7..1ced5cd71a 100644 --- a/hw/usb/hcd-ohci.c +++ b/hw/usb/hcd-ohci.c @@ -27,6 +27,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "qapi/error.h" #include "qemu/module.h" #include "qemu/timer.h" diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c index 622e609fb4..708df2ec0d 100644 --- a/hw/vfio/platform.c +++ b/hw/vfio/platform.c @@ -29,6 +29,7 @@ #include "qemu/queue.h" #include "hw/sysbus.h" #include "trace.h" +#include "hw/irq.h" #include "hw/platform-bus.h" #include "sysemu/kvm.h" diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c index d4c0997074..3dc525dea4 100644 --- a/hw/virtio/virtio-mmio.c +++ b/hw/virtio/virtio-mmio.c @@ -21,6 +21,7 @@ #include "qemu/osdep.h" #include "standard-headers/linux/virtio_mmio.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "hw/virtio/virtio.h" #include "migration/qemu-file-types.h" diff --git a/hw/watchdog/cmsdk-apb-watchdog.c b/hw/watchdog/cmsdk-apb-watchdog.c index 54ac393020..a79da39dd5 100644 --- a/hw/watchdog/cmsdk-apb-watchdog.c +++ b/hw/watchdog/cmsdk-apb-watchdog.c @@ -28,6 +28,7 @@ #include "qemu/module.h" #include "sysemu/watchdog.h" #include "hw/sysbus.h" +#include "hw/irq.h" #include "hw/registerfields.h" #include "hw/watchdog/cmsdk-apb-watchdog.h" diff --git a/hw/xtensa/mx_pic.c b/hw/xtensa/mx_pic.c index 7075db9d4b..912de66206 100644 --- a/hw/xtensa/mx_pic.c +++ b/hw/xtensa/mx_pic.c @@ -27,6 +27,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/irq.h" #include "hw/xtensa/mx_pic.h" #include "qemu/log.h" diff --git a/hw/xtensa/pic_cpu.c b/hw/xtensa/pic_cpu.c index df3acbb541..b708290d7b 100644 --- a/hw/xtensa/pic_cpu.c +++ b/hw/xtensa/pic_cpu.c @@ -28,6 +28,7 @@ #include "qemu/osdep.h" #include "cpu.h" #include "hw/hw.h" +#include "hw/irq.h" #include "qemu/log.h" #include "qemu/timer.h" diff --git a/include/hw/acpi/acpi.h b/include/hw/acpi/acpi.h index c91e2b9df2..1f2dafbd7d 100644 --- a/include/hw/acpi/acpi.h +++ b/include/hw/acpi/acpi.h @@ -22,7 +22,6 @@ #include "qemu/notify.h" #include "exec/memory.h" -#include "hw/irq.h" #include "hw/acpi/acpi_dev_interface.h" /* diff --git a/include/hw/arm/boot.h b/include/hw/arm/boot.h index c48cc4c2bc..350d4b0498 100644 --- a/include/hw/arm/boot.h +++ b/include/hw/arm/boot.h @@ -13,7 +13,6 @@ #include "exec/memory.h" #include "target/arm/cpu-qom.h" -#include "hw/irq.h" #include "qemu/notify.h" typedef enum { diff --git a/include/hw/arm/omap.h b/include/hw/arm/omap.h index d21e418242..2fda996648 100644 --- a/include/hw/arm/omap.h +++ b/include/hw/arm/omap.h @@ -21,7 +21,6 @@ #define HW_ARM_OMAP_H #include "exec/memory.h" -#include "hw/irq.h" #include "hw/input/tsc2xxx.h" #include "target/arm/cpu-qom.h" #include "qemu/log.h" diff --git a/include/hw/arm/soc_dma.h b/include/hw/arm/soc_dma.h index fae322997e..7886291d54 100644 --- a/include/hw/arm/soc_dma.h +++ b/include/hw/arm/soc_dma.h @@ -22,7 +22,6 @@ #define HW_SOC_DMA_H #include "exec/memory.h" -#include "hw/irq.h" struct soc_dma_s; struct soc_dma_ch_s; diff --git a/include/hw/block/fdc.h b/include/hw/block/fdc.h index f4fe2f471b..c15ff4c623 100644 --- a/include/hw/block/fdc.h +++ b/include/hw/block/fdc.h @@ -2,7 +2,6 @@ #define HW_FDC_H #include "exec/hwaddr.h" -#include "hw/irq.h" #include "qapi/qapi-types-block.h" /* fdc.c */ diff --git a/include/hw/bt.h b/include/hw/bt.h index b5e11d4d43..d9ee2fc29a 100644 --- a/include/hw/bt.h +++ b/include/hw/bt.h @@ -26,7 +26,6 @@ #ifndef HW_BT_H #define HW_BT_H -#include "hw/irq.h" /* BD Address */ typedef struct { diff --git a/include/hw/core/split-irq.h b/include/hw/core/split-irq.h index bb87157c5a..872a39aa4f 100644 --- a/include/hw/core/split-irq.h +++ b/include/hw/core/split-irq.h @@ -35,7 +35,6 @@ #ifndef HW_SPLIT_IRQ_H #define HW_SPLIT_IRQ_H -#include "hw/irq.h" #include "hw/sysbus.h" #include "qom/object.h" diff --git a/include/hw/cris/etraxfs_dma.h b/include/hw/cris/etraxfs_dma.h index 31ae360611..095d76b956 100644 --- a/include/hw/cris/etraxfs_dma.h +++ b/include/hw/cris/etraxfs_dma.h @@ -2,7 +2,6 @@ #define HW_ETRAXFS_DMA_H #include "exec/hwaddr.h" -#include "hw/irq.h" struct dma_context_metadata { /* data descriptor md */ diff --git a/include/hw/display/blizzard.h b/include/hw/display/blizzard.h index ef72bbc186..5b33018835 100644 --- a/include/hw/display/blizzard.h +++ b/include/hw/display/blizzard.h @@ -11,7 +11,6 @@ #ifndef HW_DISPLAY_BLIZZARD_H #define HW_DISPLAY_BLIZZARD_H -#include "hw/irq.h" void *s1d13745_init(qemu_irq gpio_int); void s1d13745_write(void *opaque, int dc, uint16_t value); diff --git a/include/hw/display/tc6393xb.h b/include/hw/display/tc6393xb.h index 5c4da91f80..c653ef717b 100644 --- a/include/hw/display/tc6393xb.h +++ b/include/hw/display/tc6393xb.h @@ -13,7 +13,6 @@ #define HW_DISPLAY_TC6393XB_H #include "exec/memory.h" -#include "hw/irq.h" typedef struct TC6393xbState TC6393xbState; diff --git a/include/hw/hw.h b/include/hw/hw.h index b399627cbe..38d2fb1f40 100644 --- a/include/hw/hw.h +++ b/include/hw/hw.h @@ -9,7 +9,6 @@ #include "exec/cpu-common.h" #include "qom/object.h" #include "exec/memory.h" -#include "hw/irq.h" #include "migration/vmstate.h" void QEMU_NORETURN hw_error(const char *fmt, ...) GCC_FMT_ATTR(1, 2); diff --git a/include/hw/ide/internal.h b/include/hw/ide/internal.h index 8efd03132b..c6954c1d56 100644 --- a/include/hw/ide/internal.h +++ b/include/hw/ide/internal.h @@ -7,6 +7,7 @@ * non-internal declarations are in hw/ide.h */ #include "hw/ide.h" +#include "hw/irq.h" #include "hw/isa/isa.h" #include "sysemu/dma.h" #include "sysemu/sysemu.h" diff --git a/include/hw/input/gamepad.h b/include/hw/input/gamepad.h index e20211baef..6f6aa2406a 100644 --- a/include/hw/input/gamepad.h +++ b/include/hw/input/gamepad.h @@ -11,7 +11,6 @@ #ifndef HW_INPUT_GAMEPAD_H #define HW_INPUT_GAMEPAD_H -#include "hw/irq.h" /* stellaris_input.c */ void stellaris_gamepad_init(int n, qemu_irq *irq, const int *keycode); diff --git a/include/hw/input/tsc2xxx.h b/include/hw/input/tsc2xxx.h index dbfe5c55c1..3cd8f1bf55 100644 --- a/include/hw/input/tsc2xxx.h +++ b/include/hw/input/tsc2xxx.h @@ -11,7 +11,6 @@ #ifndef HW_INPUT_TSC2XXX_H #define HW_INPUT_TSC2XXX_H -#include "hw/irq.h" #include "ui/console.h" typedef struct uWireSlave { diff --git a/include/hw/irq.h b/include/hw/irq.h index 7a40e3ed26..fe527f6f51 100644 --- a/include/hw/irq.h +++ b/include/hw/irq.h @@ -5,10 +5,6 @@ #define TYPE_IRQ "irq" -typedef struct IRQState *qemu_irq; - -typedef void (*qemu_irq_handler)(void *opaque, int n, int level); - void qemu_set_irq(qemu_irq irq, int level); static inline void qemu_irq_raise(qemu_irq irq) diff --git a/include/hw/isa/vt82c686.h b/include/hw/isa/vt82c686.h index a54c3fe60a..f23f45dfb1 100644 --- a/include/hw/isa/vt82c686.h +++ b/include/hw/isa/vt82c686.h @@ -1,7 +1,6 @@ #ifndef HW_VT82C686_H #define HW_VT82C686_H -#include "hw/irq.h" #define TYPE_VT82C686B_SUPERIO "vt82c686b-superio" diff --git a/include/hw/mips/mips.h b/include/hw/mips/mips.h index 2f6774d540..0af4c3d5d7 100644 --- a/include/hw/mips/mips.h +++ b/include/hw/mips/mips.h @@ -6,7 +6,6 @@ #define INITRD_PAGE_MASK (~((1 << 16) - 1)) #include "exec/memory.h" -#include "hw/irq.h" /* gt64xxx.c */ PCIBus *gt64120_register(qemu_irq *pic); diff --git a/include/hw/misc/cbus.h b/include/hw/misc/cbus.h index c899943e03..5334984020 100644 --- a/include/hw/misc/cbus.h +++ b/include/hw/misc/cbus.h @@ -13,7 +13,6 @@ #ifndef HW_MISC_CBUS_H #define HW_MISC_CBUS_H -#include "hw/irq.h" typedef struct { qemu_irq clk; diff --git a/include/hw/net/lan9118.h b/include/hw/net/lan9118.h index 500acb4c14..3d0c67f339 100644 --- a/include/hw/net/lan9118.h +++ b/include/hw/net/lan9118.h @@ -11,7 +11,6 @@ #ifndef HW_NET_LAN9118_H #define HW_NET_LAN9118_H -#include "hw/irq.h" #include "net/net.h" #define TYPE_LAN9118 "lan9118" diff --git a/include/hw/net/smc91c111.h b/include/hw/net/smc91c111.h index a66ba4112f..df5b11dcef 100644 --- a/include/hw/net/smc91c111.h +++ b/include/hw/net/smc91c111.h @@ -11,7 +11,6 @@ #ifndef HW_NET_SMC91C111_H #define HW_NET_SMC91C111_H -#include "hw/irq.h" #include "net/net.h" void smc91c111_init(NICInfo *, uint32_t, qemu_irq); diff --git a/include/hw/or-irq.h b/include/hw/or-irq.h index 5a31e5a188..3a3230dd84 100644 --- a/include/hw/or-irq.h +++ b/include/hw/or-irq.h @@ -25,7 +25,6 @@ #ifndef HW_OR_IRQ_H #define HW_OR_IRQ_H -#include "hw/irq.h" #include "hw/sysbus.h" #include "qom/object.h" diff --git a/include/hw/ppc/spapr_irq.h b/include/hw/ppc/spapr_irq.h index cd6e18b05e..8132e00366 100644 --- a/include/hw/ppc/spapr_irq.h +++ b/include/hw/ppc/spapr_irq.h @@ -10,7 +10,6 @@ #ifndef HW_SPAPR_IRQ_H #define HW_SPAPR_IRQ_H -#include "hw/irq.h" #include "target/ppc/cpu-qom.h" /* diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index e157fc4acd..b0c1d0e410 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -4,7 +4,6 @@ #include "qemu/queue.h" #include "qemu/bitmap.h" #include "qom/object.h" -#include "hw/irq.h" #include "hw/hotplug.h" #include "sysemu/sysemu.h" diff --git a/include/hw/sh4/sh_intc.h b/include/hw/sh4/sh_intc.h index 3d3efde059..65f3425057 100644 --- a/include/hw/sh4/sh_intc.h +++ b/include/hw/sh4/sh_intc.h @@ -2,7 +2,6 @@ #define SH_INTC_H #include "exec/memory.h" -#include "hw/irq.h" typedef unsigned char intc_enum; diff --git a/include/hw/timer/m48t59.h b/include/hw/timer/m48t59.h index d3fb50e08c..f74854c026 100644 --- a/include/hw/timer/m48t59.h +++ b/include/hw/timer/m48t59.h @@ -2,7 +2,6 @@ #define HW_M48T59_H #include "exec/hwaddr.h" -#include "hw/irq.h" #include "qom/object.h" #define TYPE_NVRAM "nvram" diff --git a/include/hw/tricore/tricore.h b/include/hw/tricore/tricore.h index 89ef922c67..c19ed3f013 100644 --- a/include/hw/tricore/tricore.h +++ b/include/hw/tricore/tricore.h @@ -2,7 +2,6 @@ #define HW_TRICORE_H #include "exec/memory.h" -#include "hw/irq.h" struct tricore_boot_info { uint64_t ram_size; diff --git a/include/hw/vfio/vfio-platform.h b/include/hw/vfio/vfio-platform.h index 30d3c28d3b..4ec70c813a 100644 --- a/include/hw/vfio/vfio-platform.h +++ b/include/hw/vfio/vfio-platform.h @@ -20,7 +20,6 @@ #include "hw/vfio/vfio-common.h" #include "qemu/event_notifier.h" #include "qemu/queue.h" -#include "hw/irq.h" #define TYPE_VFIO_PLATFORM "vfio-platform" diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h index 9c7b5f78dc..5ac1c6dc55 100644 --- a/include/hw/xen/xen.h +++ b/include/hw/xen/xen.h @@ -9,7 +9,6 @@ */ #include "exec/cpu-common.h" -#include "hw/irq.h" /* xen-machine.c */ enum xen_mode { diff --git a/include/hw/xtensa/mx_pic.h b/include/hw/xtensa/mx_pic.h index c9ea9e737c..500424c8d3 100644 --- a/include/hw/xtensa/mx_pic.h +++ b/include/hw/xtensa/mx_pic.h @@ -29,7 +29,6 @@ #define XTENSA_MX_PIC_H #include "exec/memory.h" -#include "hw/irq.h" struct XtensaMxPic; typedef struct XtensaMxPic XtensaMxPic; diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 29346648d4..c32efb5b18 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -102,10 +102,19 @@ typedef struct SSIBus SSIBus; typedef struct VirtIODevice VirtIODevice; typedef struct Visitor Visitor; +/* + * Pointer types + * Such typedefs should be limited to cases where the typedef's users + * are oblivious of its "pointer-ness". + * Please keep this list in case-insensitive alphabetical order. + */ +typedef struct IRQState *qemu_irq; + /* * Function types */ typedef void SaveStateHandler(QEMUFile *f, void *opaque); typedef int LoadStateHandler(QEMUFile *f, void *opaque, int version_id); +typedef void (*qemu_irq_handler)(void *opaque, int n, int level); #endif /* QEMU_TYPEDEFS_H */ diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index acd90aebb6..c8ea412f62 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -17,7 +17,6 @@ #include "qemu/queue.h" #include "qom/cpu.h" #include "exec/memattrs.h" -#include "hw/irq.h" #ifdef NEED_CPU_H # ifdef CONFIG_KVM diff --git a/target/arm/helper.c b/target/arm/helper.c index 20f8728be1..1084b618ee 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -20,6 +20,7 @@ #include "qemu/qemu-print.h" #include "exec/exec-all.h" #include /* For crc32 */ +#include "hw/irq.h" #include "hw/semihosting/semihost.h" #include "sysemu/cpus.h" #include "sysemu/kvm.h" diff --git a/target/arm/kvm.c b/target/arm/kvm.c index fe4f461d4e..36a1e60bd4 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -27,6 +27,7 @@ #include "exec/memattrs.h" #include "exec/address-spaces.h" #include "hw/boards.h" +#include "hw/irq.h" #include "qemu/log.h" const KVMCapabilityInfo kvm_arch_required_capabilities[] = { diff --git a/target/mips/cp0_timer.c b/target/mips/cp0_timer.c index f4716395df..48c18d7818 100644 --- a/target/mips/cp0_timer.c +++ b/target/mips/cp0_timer.c @@ -21,6 +21,7 @@ */ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/mips/cpudevs.h" #include "qemu/timer.h" #include "sysemu/kvm.h" From patchwork Fri Jul 26 12:05:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 11060899 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D4C2613A0 for ; Fri, 26 Jul 2019 12:08:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C355D28812 for ; Fri, 26 Jul 2019 12:08:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B79DF28AA8; Fri, 26 Jul 2019 12:08:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 33A0328812 for ; Fri, 26 Jul 2019 12:08:40 +0000 (UTC) Received: from localhost ([::1]:39296 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqz1b-0008He-79 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 26 Jul 2019 08:08:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58636) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqyyy-0005Vz-4T for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:06:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqyys-00087H-Qm for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36304) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqyys-0007sQ-6d for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:50 -0400 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 3F0F9307D88D for ; Fri, 26 Jul 2019 12:05:47 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DA8B960606 for ; Fri, 26 Jul 2019 12:05:46 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id B270811329C9; Fri, 26 Jul 2019 14:05:42 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 26 Jul 2019 14:05:27 +0200 Message-Id: <20190726120542.9894-14-armbru@redhat.com> In-Reply-To: <20190726120542.9894-1-armbru@redhat.com> References: <20190726120542.9894-1-armbru@redhat.com> MIME-Version: 1.0 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.48]); Fri, 26 Jul 2019 12:05:47 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 13/28] Clean up inclusion of exec/cpu-common.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP migration/qemu-file.h neglects to include it even though it needs ram_addr_t. Fix that. Drop a few superfluous inclusions elsewhere. Signed-off-by: Markus Armbruster --- accel/stubs/tcg-stub.c | 1 - balloon.c | 1 - hw/smbios/smbios.c | 1 - include/hw/hw.h | 1 - include/hw/ppc/ppc4xx.h | 1 - include/migration/misc.h | 1 - include/sysemu/kvm_int.h | 1 - include/sysemu/memory_mapping.h | 1 - migration/migration.h | 1 - migration/qemu-file-channel.c | 1 - migration/qemu-file.h | 1 + migration/vmstate-types.c | 1 - qom/cpu.c | 1 - tcg/optimize.c | 1 - tcg/tcg-common.c | 1 - tcg/tcg.c | 1 - 16 files changed, 1 insertion(+), 15 deletions(-) diff --git a/accel/stubs/tcg-stub.c b/accel/stubs/tcg-stub.c index 76ae461749..e2d23edafe 100644 --- a/accel/stubs/tcg-stub.c +++ b/accel/stubs/tcg-stub.c @@ -14,7 +14,6 @@ #include "qemu-common.h" #include "cpu.h" #include "tcg/tcg.h" -#include "exec/cpu-common.h" #include "exec/exec-all.h" void tb_flush(CPUState *cpu) diff --git a/balloon.c b/balloon.c index 914b3662db..f104b42961 100644 --- a/balloon.c +++ b/balloon.c @@ -26,7 +26,6 @@ #include "qemu/osdep.h" #include "qemu/atomic.h" -#include "exec/cpu-common.h" #include "sysemu/kvm.h" #include "sysemu/balloon.h" #include "trace-root.h" diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c index 7bcd67b098..11d476c4a2 100644 --- a/hw/smbios/smbios.c +++ b/hw/smbios/smbios.c @@ -28,7 +28,6 @@ #include "hw/firmware/smbios.h" #include "hw/loader.h" #include "hw/boards.h" -#include "exec/cpu-common.h" #include "smbios_build.h" /* legacy structures and constants for <= 2.0 machines */ diff --git a/include/hw/hw.h b/include/hw/hw.h index 38d2fb1f40..86ff26b712 100644 --- a/include/hw/hw.h +++ b/include/hw/hw.h @@ -6,7 +6,6 @@ #error Cannot include hw/hw.h from user emulation #endif -#include "exec/cpu-common.h" #include "qom/object.h" #include "exec/memory.h" #include "migration/vmstate.h" diff --git a/include/hw/ppc/ppc4xx.h b/include/hw/ppc/ppc4xx.h index 90f8866138..7d82259051 100644 --- a/include/hw/ppc/ppc4xx.h +++ b/include/hw/ppc/ppc4xx.h @@ -26,7 +26,6 @@ #define PPC4XX_H #include "hw/ppc/ppc.h" -#include "exec/cpu-common.h" #include "exec/memory.h" /* PowerPC 4xx core initialization */ diff --git a/include/migration/misc.h b/include/migration/misc.h index 5cdbabd094..b9d8e787af 100644 --- a/include/migration/misc.h +++ b/include/migration/misc.h @@ -14,7 +14,6 @@ #ifndef MIGRATION_MISC_H #define MIGRATION_MISC_H -#include "exec/cpu-common.h" #include "qemu/notify.h" #include "qapi/qapi-types-net.h" diff --git a/include/sysemu/kvm_int.h b/include/sysemu/kvm_int.h index 787dbc7770..5d341cc29b 100644 --- a/include/sysemu/kvm_int.h +++ b/include/sysemu/kvm_int.h @@ -9,7 +9,6 @@ #ifndef QEMU_KVM_INT_H #define QEMU_KVM_INT_H -#include "exec/cpu-common.h" #include "exec/memory.h" #include "sysemu/sysemu.h" #include "sysemu/accel.h" diff --git a/include/sysemu/memory_mapping.h b/include/sysemu/memory_mapping.h index 1b440df486..4b20f1a639 100644 --- a/include/sysemu/memory_mapping.h +++ b/include/sysemu/memory_mapping.h @@ -15,7 +15,6 @@ #define MEMORY_MAPPING_H #include "qemu/queue.h" -#include "exec/cpu-common.h" #include "exec/cpu-defs.h" #include "exec/memory.h" diff --git a/migration/migration.h b/migration/migration.h index 1fdd7b21fd..26f01d00f6 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -16,7 +16,6 @@ #include "qapi/qapi-types-migration.h" #include "qemu/thread.h" -#include "exec/cpu-common.h" #include "qemu/coroutine_int.h" #include "hw/qdev.h" #include "io/channel.h" diff --git a/migration/qemu-file-channel.c b/migration/qemu-file-channel.c index 8e639eb496..78ef248820 100644 --- a/migration/qemu-file-channel.c +++ b/migration/qemu-file-channel.c @@ -24,7 +24,6 @@ #include "qemu/osdep.h" #include "qemu-file-channel.h" -#include "exec/cpu-common.h" #include "qemu-file.h" #include "io/channel-socket.h" #include "qemu/iov.h" diff --git a/migration/qemu-file.h b/migration/qemu-file.h index 13baf896bd..21f3ae4be2 100644 --- a/migration/qemu-file.h +++ b/migration/qemu-file.h @@ -26,6 +26,7 @@ #define MIGRATION_QEMU_FILE_H #include +#include "exec/cpu-common.h" /* Read a chunk of data from a file at the given position. The pos argument * can be ignored if the file is only be used for streaming. The number of diff --git a/migration/vmstate-types.c b/migration/vmstate-types.c index 845f4649ee..bee658a1b2 100644 --- a/migration/vmstate-types.c +++ b/migration/vmstate-types.c @@ -11,7 +11,6 @@ */ #include "qemu/osdep.h" -#include "exec/cpu-common.h" #include "qemu-file.h" #include "migration.h" #include "migration/vmstate.h" diff --git a/qom/cpu.c b/qom/cpu.c index f376f782d8..fdc1af8f40 100644 --- a/qom/cpu.c +++ b/qom/cpu.c @@ -25,7 +25,6 @@ #include "qemu/notify.h" #include "qemu/log.h" #include "exec/log.h" -#include "exec/cpu-common.h" #include "qemu/error-report.h" #include "qemu/qemu-print.h" #include "sysemu/sysemu.h" diff --git a/tcg/optimize.c b/tcg/optimize.c index d2424de4af..cee2a36a60 100644 --- a/tcg/optimize.c +++ b/tcg/optimize.c @@ -24,7 +24,6 @@ */ #include "qemu/osdep.h" -#include "exec/cpu-common.h" #include "tcg-op.h" #define CASE_OP_32_64(x) \ diff --git a/tcg/tcg-common.c b/tcg/tcg-common.c index 907d58d0f0..97305a3efc 100644 --- a/tcg/tcg-common.c +++ b/tcg/tcg-common.c @@ -23,7 +23,6 @@ */ #include "qemu/osdep.h" -#include "exec/cpu-common.h" #include "tcg/tcg.h" #if defined(CONFIG_TCG_INTERPRETER) diff --git a/tcg/tcg.c b/tcg/tcg.c index be2c33c400..2db83ce2e8 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -42,7 +42,6 @@ #define NO_CPU_IO_DEFS #include "cpu.h" -#include "exec/cpu-common.h" #include "exec/exec-all.h" #if !defined(CONFIG_USER_ONLY) From patchwork Fri Jul 26 12:05:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 11060915 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6713D13A0 for ; Fri, 26 Jul 2019 12:09:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5635028AA5 for ; Fri, 26 Jul 2019 12:09:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4A89828AAB; Fri, 26 Jul 2019 12:09:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6373428AA5 for ; Fri, 26 Jul 2019 12:09:42 +0000 (UTC) Received: from localhost ([::1]:39332 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqz2b-0004In-Jd for patchwork-qemu-devel@patchwork.kernel.org; Fri, 26 Jul 2019 08:09:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58616) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqyyw-0005Vs-NK for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:06:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqyyr-00081X-PN for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33532) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqyyr-0007sS-4J for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:49 -0400 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 438B73082D6C for ; Fri, 26 Jul 2019 12:05:47 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DF8A660A35 for ; Fri, 26 Jul 2019 12:05:46 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id BBEFB1132922; Fri, 26 Jul 2019 14:05:42 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 26 Jul 2019 14:05:28 +0200 Message-Id: <20190726120542.9894-15-armbru@redhat.com> In-Reply-To: <20190726120542.9894-1-armbru@redhat.com> References: <20190726120542.9894-1-armbru@redhat.com> MIME-Version: 1.0 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.46]); Fri, 26 Jul 2019 12:05:47 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 14/28] migration: Move the VMStateDescription typedef to typedefs.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP We declare incomplete struct VMStateDescription in a couple of places so we don't have to include migration/vmstate.h for the typedef. That's fine with me. However, the next commit will drop migration/vmstate.h from a massive number of compiles. Move the typedef to qemu/typedefs.h now, so I don't have to insert struct in front of VMStateDescription all over the place then. Signed-off-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daudé --- include/hw/qdev-core.h | 6 ++---- include/migration/vmstate.h | 1 - include/qemu/typedefs.h | 1 + include/qom/cpu.h | 4 ++-- target/alpha/cpu.h | 2 +- target/arm/cpu.h | 2 +- target/cris/cpu.h | 2 +- target/hppa/cpu.h | 2 +- target/i386/cpu.h | 2 +- target/lm32/cpu.h | 2 +- target/mips/internal.h | 2 +- target/openrisc/cpu.h | 2 +- target/ppc/cpu-qom.h | 2 +- target/ppc/cpu.h | 2 +- target/s390x/cpu.h | 2 +- target/sparc/cpu.h | 2 +- 16 files changed, 17 insertions(+), 19 deletions(-) diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index b0c1d0e410..80fdb38d94 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -35,8 +35,6 @@ typedef void (*DeviceReset)(DeviceState *dev); typedef void (*BusRealize)(BusState *bus, Error **errp); typedef void (*BusUnrealize)(BusState *bus, Error **errp); -struct VMStateDescription; - /** * DeviceClass: * @props: Properties accessing state fields. @@ -112,7 +110,7 @@ typedef struct DeviceClass { DeviceUnrealize unrealize; /* device state */ - const struct VMStateDescription *vmsd; + const VMStateDescription *vmsd; /* Private to qdev / bus. */ const char *bus_type; @@ -422,7 +420,7 @@ void device_class_set_parent_unrealize(DeviceClass *dc, DeviceUnrealize dev_unrealize, DeviceUnrealize *parent_unrealize); -const struct VMStateDescription *qdev_get_vmsd(DeviceState *dev); +const VMStateDescription *qdev_get_vmsd(DeviceState *dev); const char *qdev_fw_name(DeviceState *dev); diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index ca68584eba..a547517dc7 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -28,7 +28,6 @@ #define QEMU_VMSTATE_H typedef struct VMStateInfo VMStateInfo; -typedef struct VMStateDescription VMStateDescription; typedef struct VMStateField VMStateField; /* VMStateInfo allows customized migration of objects that don't fit in diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index c32efb5b18..9e1283aacf 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -101,6 +101,7 @@ typedef struct SHPCDevice SHPCDevice; typedef struct SSIBus SSIBus; typedef struct VirtIODevice VirtIODevice; typedef struct Visitor Visitor; +typedef struct VMStateDescription VMStateDescription; /* * Pointer types diff --git a/include/qom/cpu.h b/include/qom/cpu.h index 5ee0046b62..ddb91bbaff 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -215,7 +215,7 @@ typedef struct CPUClass { int (*write_elf32_qemunote)(WriteCoreDumpFunction f, CPUState *cpu, void *opaque); - const struct VMStateDescription *vmsd; + const VMStateDescription *vmsd; const char *gdb_core_xml_file; gchar * (*gdb_arch_name)(CPUState *cpu); const char * (*gdb_get_dynamic_xml)(CPUState *cpu, const char *xmlname); @@ -1108,7 +1108,7 @@ bool target_words_bigendian(void); #ifdef NEED_CPU_H #ifdef CONFIG_SOFTMMU -extern const struct VMStateDescription vmstate_cpu_common; +extern const VMStateDescription vmstate_cpu_common; #else #define vmstate_cpu_common vmstate_dummy #endif diff --git a/target/alpha/cpu.h b/target/alpha/cpu.h index b3e8a823e1..4619530660 100644 --- a/target/alpha/cpu.h +++ b/target/alpha/cpu.h @@ -277,7 +277,7 @@ struct AlphaCPU { #ifndef CONFIG_USER_ONLY -extern const struct VMStateDescription vmstate_alpha_cpu; +extern const VMStateDescription vmstate_alpha_cpu; #endif void alpha_cpu_do_interrupt(CPUState *cpu); diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 94c990cddb..2cdde6c4bc 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -922,7 +922,7 @@ void arm_cpu_post_init(Object *obj); uint64_t arm_cpu_mp_affinity(int idx, uint8_t clustersz); #ifndef CONFIG_USER_ONLY -extern const struct VMStateDescription vmstate_arm_cpu; +extern const VMStateDescription vmstate_arm_cpu; #endif void arm_cpu_do_interrupt(CPUState *cpu); diff --git a/target/cris/cpu.h b/target/cris/cpu.h index fb14ad51f1..aba0a66474 100644 --- a/target/cris/cpu.h +++ b/target/cris/cpu.h @@ -183,7 +183,7 @@ struct CRISCPU { #ifndef CONFIG_USER_ONLY -extern const struct VMStateDescription vmstate_cris_cpu; +extern const VMStateDescription vmstate_cris_cpu; #endif void cris_cpu_do_interrupt(CPUState *cpu); diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h index e9fba96be9..4b816cc13a 100644 --- a/target/hppa/cpu.h +++ b/target/hppa/cpu.h @@ -334,7 +334,7 @@ bool hppa_cpu_tlb_fill(CPUState *cs, vaddr address, int size, int hppa_get_physical_address(CPUHPPAState *env, vaddr addr, int mmu_idx, int type, hwaddr *pphys, int *pprot); extern const MemoryRegionOps hppa_io_eir_ops; -extern const struct VMStateDescription vmstate_hppa_cpu; +extern const VMStateDescription vmstate_hppa_cpu; void hppa_cpu_alarm_timer(void *); int hppa_artype_for_page(CPUHPPAState *env, target_ulong vaddr); #endif diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 05393cf9d1..fdf25df25c 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1516,7 +1516,7 @@ struct X86CPU { #ifndef CONFIG_USER_ONLY -extern struct VMStateDescription vmstate_x86_cpu; +extern VMStateDescription vmstate_x86_cpu; #endif /** diff --git a/target/lm32/cpu.h b/target/lm32/cpu.h index c2bbfa2780..064c6b1267 100644 --- a/target/lm32/cpu.h +++ b/target/lm32/cpu.h @@ -195,7 +195,7 @@ struct LM32CPU { #ifndef CONFIG_USER_ONLY -extern const struct VMStateDescription vmstate_lm32_cpu; +extern const VMStateDescription vmstate_lm32_cpu; #endif void lm32_cpu_do_interrupt(CPUState *cpu); diff --git a/target/mips/internal.h b/target/mips/internal.h index b2b41a51ab..d5aa5490d3 100644 --- a/target/mips/internal.h +++ b/target/mips/internal.h @@ -148,7 +148,7 @@ hwaddr cpu_mips_translate_address(CPUMIPSState *env, target_ulong address, #define cpu_signal_handler cpu_mips_signal_handler #ifndef CONFIG_USER_ONLY -extern const struct VMStateDescription vmstate_mips_cpu; +extern const VMStateDescription vmstate_mips_cpu; #endif static inline bool cpu_mips_hw_interrupts_enabled(CPUMIPSState *env) diff --git a/target/openrisc/cpu.h b/target/openrisc/cpu.h index f23b25262d..61ade1d4f0 100644 --- a/target/openrisc/cpu.h +++ b/target/openrisc/cpu.h @@ -333,7 +333,7 @@ int print_insn_or1k(bfd_vma addr, disassemble_info *info); #define cpu_signal_handler cpu_openrisc_signal_handler #ifndef CONFIG_USER_ONLY -extern const struct VMStateDescription vmstate_openrisc_cpu; +extern const VMStateDescription vmstate_openrisc_cpu; /* hw/openrisc_pic.c */ void cpu_openrisc_pic_init(OpenRISCCPU *cpu); diff --git a/target/ppc/cpu-qom.h b/target/ppc/cpu-qom.h index be9b4c30c3..a2f202f021 100644 --- a/target/ppc/cpu-qom.h +++ b/target/ppc/cpu-qom.h @@ -203,7 +203,7 @@ typedef struct PPCTimebase { int64_t time_of_the_day_ns; } PPCTimebase; -extern const struct VMStateDescription vmstate_ppc_timebase; +extern const VMStateDescription vmstate_ppc_timebase; #define VMSTATE_PPC_TIMEBASE_V(_field, _state, _version) { \ .name = (stringify(_field)), \ diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index c9beba2a5c..4ea33cf696 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -1255,7 +1255,7 @@ int ppc32_cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cs, int cpuid, void *opaque); #ifndef CONFIG_USER_ONLY void ppc_cpu_do_system_reset(CPUState *cs); -extern const struct VMStateDescription vmstate_ppc_cpu; +extern const VMStateDescription vmstate_ppc_cpu; #endif /*****************************************************************************/ diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index a606547b4d..3d9de25f7c 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -163,7 +163,7 @@ struct S390CPU { #ifndef CONFIG_USER_ONLY -extern const struct VMStateDescription vmstate_s390_cpu; +extern const VMStateDescription vmstate_s390_cpu; #endif /* distinguish between 24 bit and 31 bit addressing */ diff --git a/target/sparc/cpu.h b/target/sparc/cpu.h index 8ed2250cd0..0d5b01efe5 100644 --- a/target/sparc/cpu.h +++ b/target/sparc/cpu.h @@ -532,7 +532,7 @@ struct SPARCCPU { #ifndef CONFIG_USER_ONLY -extern const struct VMStateDescription vmstate_sparc_cpu; +extern const VMStateDescription vmstate_sparc_cpu; #endif void sparc_cpu_do_interrupt(CPUState *cpu); From patchwork Fri Jul 26 12:05:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 11060935 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C468B746 for ; Fri, 26 Jul 2019 12:11:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A3C8828AA5 for ; Fri, 26 Jul 2019 12:11:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 975B728AAB; Fri, 26 Jul 2019 12:11:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 00A6F28AA8 for ; Fri, 26 Jul 2019 12:11:39 +0000 (UTC) Received: from localhost ([::1]:39392 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqz4T-0003SD-V1 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 26 Jul 2019 08:11:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59064) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqyz5-0005yT-I0 for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:06:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqyyt-00089R-9A for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:06:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36308) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqyys-0007wp-BN for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:50 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6E23C307D848 for ; Fri, 26 Jul 2019 12:05:48 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 39F78600C7 for ; Fri, 26 Jul 2019 12:05:47 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id CB25A11327AF; Fri, 26 Jul 2019 14:05:42 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 26 Jul 2019 14:05:29 +0200 Message-Id: <20190726120542.9894-16-armbru@redhat.com> In-Reply-To: <20190726120542.9894-1-armbru@redhat.com> References: <20190726120542.9894-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Fri, 26 Jul 2019 12:05:48 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 15/28] Include migration/vmstate.h less X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP In my "build everything" tree, changing migration/vmstate.h triggers a recompile of some 2700 out of 6600 objects (not counting tests and objects that don't depend on qemu/osdep.h). hw/hw.h supposedly includes it for convenience. Several other headers include it just to get VMStateDescription. The previous commit made that unnecessary. Include migration/vmstate.h only where it's still needed. Touching it now recompiles only some 1600 objects. Signed-off-by: Markus Armbruster Reviewed-by: Alistair Francis --- audio/audio.c | 1 + cpus.c | 1 + hw/acpi/cpu.c | 1 + hw/acpi/ich9.c | 1 + hw/acpi/memory_hotplug.c | 1 + hw/acpi/pcihp.c | 1 + hw/acpi/piix4.c | 1 + hw/acpi/tco.c | 2 ++ hw/acpi/vmgenid.c | 1 + hw/adc/stm32f2xx_adc.c | 1 + hw/arm/armsse.c | 1 + hw/arm/highbank.c | 1 + hw/arm/integratorcp.c | 1 + hw/arm/musicpal.c | 1 + hw/arm/pxa2xx.c | 1 + hw/arm/pxa2xx_gpio.c | 1 + hw/arm/pxa2xx_pic.c | 1 + hw/arm/smmuv3.c | 1 + hw/arm/spitz.c | 1 + hw/arm/stellaris.c | 1 + hw/arm/strongarm.c | 1 + hw/arm/versatilepb.c | 1 + hw/arm/virt-acpi-build.c | 1 + hw/arm/z2.c | 1 + hw/audio/ac97.c | 1 + hw/audio/cs4231.c | 1 + hw/audio/cs4231a.c | 1 + hw/audio/es1370.c | 1 + hw/audio/gus.c | 1 + hw/audio/hda-codec.c | 1 + hw/audio/intel-hda.c | 1 + hw/audio/lm4549.c | 1 + hw/audio/marvell_88w8618.c | 1 + hw/audio/milkymist-ac97.c | 1 + hw/audio/pcspk.c | 1 + hw/audio/pl041.c | 1 + hw/audio/sb16.c | 1 + hw/audio/wm8750.c | 1 + hw/block/ecc.c | 1 + hw/block/fdc.c | 1 + hw/block/m25p80.c | 1 + hw/block/nand.c | 1 + hw/block/nvme.c | 1 + hw/block/onenand.c | 1 + hw/block/pflash_cfi01.c | 1 + hw/block/pflash_cfi02.c | 1 + hw/char/bcm2835_aux.c | 1 + hw/char/cadence_uart.c | 1 + hw/char/cmsdk-apb-uart.c | 1 + hw/char/digic-uart.c | 1 + hw/char/escc.c | 1 + hw/char/exynos4210_uart.c | 1 + hw/char/imx_serial.c | 1 + hw/char/ipoctal232.c | 1 + hw/char/lm32_juart.c | 1 + hw/char/lm32_uart.c | 1 + hw/char/milkymist-uart.c | 1 + hw/char/nrf51_uart.c | 1 + hw/char/parallel.c | 1 + hw/char/pl011.c | 1 + hw/char/sclpconsole-lm.c | 1 + hw/char/sclpconsole.c | 1 + hw/char/serial-isa.c | 1 + hw/char/serial-pci-multi.c | 1 + hw/char/serial-pci.c | 1 + hw/char/serial.c | 1 + hw/char/spapr_vty.c | 1 + hw/core/loader.c | 1 + hw/core/numa.c | 1 + hw/core/or-irq.c | 1 + hw/core/ptimer.c | 2 ++ hw/core/qdev.c | 1 + hw/display/ads7846.c | 1 + hw/display/bcm2835_fb.c | 1 + hw/display/bochs-display.c | 1 + hw/display/cg3.c | 1 + hw/display/cirrus_vga.c | 1 + hw/display/dpcd.c | 1 + hw/display/exynos4210_fimd.c | 1 + hw/display/g364fb.c | 1 + hw/display/i2c-ddc.c | 1 + hw/display/jazz_led.c | 1 + hw/display/milkymist-tmu2.c | 1 + hw/display/milkymist-vgafb.c | 1 + hw/display/pl110.c | 1 + hw/display/pxa2xx_lcd.c | 1 + hw/display/qxl.c | 1 + hw/display/sii9022.c | 1 + hw/display/sm501.c | 1 + hw/display/ssd0303.c | 1 + hw/display/ssd0323.c | 1 + hw/display/tcx.c | 1 + hw/display/vga-isa-mm.c | 2 ++ hw/display/vga-pci.c | 1 + hw/display/vga.c | 1 + hw/display/vmware_vga.c | 1 + hw/display/xlnx_dp.c | 1 + hw/dma/bcm2835_dma.c | 1 + hw/dma/i82374.c | 1 + hw/dma/i8257.c | 1 + hw/dma/pl080.c | 1 + hw/dma/pl330.c | 1 + hw/dma/pxa2xx_dma.c | 1 + hw/dma/rc4030.c | 1 + hw/dma/sparc32_dma.c | 1 + hw/dma/xlnx-zdma.c | 1 + hw/dma/xlnx-zynq-devcfg.c | 1 + hw/dma/xlnx_dpdma.c | 1 + hw/gpio/bcm2835_gpio.c | 1 + hw/gpio/gpio_key.c | 1 + hw/gpio/imx_gpio.c | 1 + hw/gpio/max7310.c | 1 + hw/gpio/mpc8xxx.c | 1 + hw/gpio/nrf51_gpio.c | 1 + hw/gpio/pl061.c | 1 + hw/gpio/zaurus.c | 1 + hw/hppa/dino.c | 1 + hw/i2c/aspeed_i2c.c | 1 + hw/i2c/core.c | 1 + hw/i2c/exynos4210_i2c.c | 1 + hw/i2c/imx_i2c.c | 1 + hw/i2c/microbit_i2c.c | 1 + hw/i2c/mpc_i2c.c | 1 + hw/i2c/pm_smbus.c | 2 ++ hw/i2c/smbus_eeprom.c | 1 + hw/i2c/smbus_ich9.c | 1 + hw/i2c/smbus_slave.c | 1 + hw/i386/acpi-build.c | 1 + hw/i386/amd_iommu.c | 2 ++ hw/i386/intel_iommu.c | 1 + hw/i386/kvm/clock.c | 1 + hw/i386/kvmvapic.c | 1 + hw/i386/pc.c | 1 + hw/i386/vmmouse.c | 2 ++ hw/i386/xen/xen_platform.c | 1 + hw/i386/xen/xen_pvdevice.c | 1 + hw/ide/ahci-allwinner.c | 1 + hw/ide/ahci.c | 1 + hw/ide/cmd646.c | 1 + hw/ide/core.c | 1 + hw/ide/ich.c | 1 + hw/ide/isa.c | 1 + hw/ide/macio.c | 1 + hw/ide/microdrive.c | 1 + hw/ide/mmio.c | 1 + hw/ide/pci.c | 1 + hw/ide/piix.c | 1 + hw/ide/via.c | 1 + hw/input/adb-kbd.c | 1 + hw/input/adb-mouse.c | 1 + hw/input/adb.c | 1 + hw/input/hid.c | 2 ++ hw/input/lm832x.c | 1 + hw/input/milkymist-softusb.c | 1 + hw/input/pckbd.c | 1 + hw/input/pl050.c | 1 + hw/input/ps2.c | 1 + hw/input/pxa2xx_keypad.c | 1 + hw/input/stellaris_input.c | 1 + hw/input/tsc2005.c | 1 + hw/input/tsc210x.c | 1 + hw/intc/allwinner-a10-pic.c | 1 + hw/intc/apic_common.c | 1 + hw/intc/arm_gic_common.c | 1 + hw/intc/arm_gicv3_common.c | 1 + hw/intc/arm_gicv3_its_common.c | 1 + hw/intc/armv7m_nvic.c | 1 + hw/intc/aspeed_vic.c | 1 + hw/intc/bcm2835_ic.c | 1 + hw/intc/bcm2836_control.c | 1 + hw/intc/exynos4210_combiner.c | 1 + hw/intc/exynos4210_gic.c | 1 + hw/intc/heathrow_pic.c | 1 + hw/intc/i8259_common.c | 2 ++ hw/intc/imx_avic.c | 1 + hw/intc/imx_gpcv2.c | 1 + hw/intc/ioapic_common.c | 1 + hw/intc/lm32_pic.c | 1 + hw/intc/ompic.c | 1 + hw/intc/openpic.c | 1 + hw/intc/pl190.c | 1 + hw/intc/slavio_intctl.c | 1 + hw/intc/spapr_xive.c | 1 + hw/intc/xics.c | 1 + hw/intc/xive.c | 1 + hw/intc/xlnx-pmu-iomod-intc.c | 1 + hw/intc/xlnx-zynqmp-ipi.c | 1 + hw/ipack/ipack.c | 1 + hw/ipack/tpci200.c | 1 + hw/ipmi/ipmi_bmc_extern.c | 1 + hw/ipmi/ipmi_bmc_sim.c | 1 + hw/ipmi/isa_ipmi_bt.c | 1 + hw/ipmi/isa_ipmi_kcs.c | 1 + hw/isa/apm.c | 1 + hw/isa/i82378.c | 1 + hw/isa/lpc_ich9.c | 1 + hw/isa/pc87312.c | 1 + hw/isa/piix4.c | 1 + hw/isa/vt82c686.c | 1 + hw/mem/pc-dimm.c | 1 + hw/mips/gt64xxx_pci.c | 1 + hw/misc/a9scu.c | 1 + hw/misc/arm_l2x0.c | 1 + hw/misc/arm_sysctl.c | 1 + hw/misc/armsse-mhu.c | 1 + hw/misc/aspeed_scu.c | 1 + hw/misc/aspeed_sdmc.c | 1 + hw/misc/aspeed_xdma.c | 1 + hw/misc/bcm2835_mbox.c | 1 + hw/misc/bcm2835_property.c | 1 + hw/misc/bcm2835_rng.c | 1 + hw/misc/eccmemctl.c | 1 + hw/misc/exynos4210_clk.c | 1 + hw/misc/exynos4210_pmu.c | 1 + hw/misc/exynos4210_rng.c | 1 + hw/misc/imx25_ccm.c | 1 + hw/misc/imx31_ccm.c | 1 + hw/misc/imx6_ccm.c | 1 + hw/misc/imx6_src.c | 1 + hw/misc/imx6ul_ccm.c | 1 + hw/misc/imx7_ccm.c | 1 + hw/misc/iotkit-secctl.c | 1 + hw/misc/iotkit-sysctl.c | 1 + hw/misc/ivshmem.c | 1 + hw/misc/macio/cuda.c | 1 + hw/misc/macio/gpio.c | 1 + hw/misc/macio/mac_dbdma.c | 1 + hw/misc/macio/macio.c | 1 + hw/misc/macio/pmu.c | 1 + hw/misc/max111x.c | 1 + hw/misc/milkymist-hpdmc.c | 1 + hw/misc/milkymist-pfpu.c | 1 + hw/misc/mips_cmgcr.c | 1 + hw/misc/mips_cpc.c | 1 + hw/misc/mos6522.c | 1 + hw/misc/mps2-fpgaio.c | 1 + hw/misc/mps2-scc.c | 1 + hw/misc/msf2-sysreg.c | 1 + hw/misc/mst_fpga.c | 1 + hw/misc/nrf51_rng.c | 1 + hw/misc/pca9552.c | 1 + hw/misc/slavio_misc.c | 1 + hw/misc/tmp105.c | 1 + hw/misc/tmp421.c | 1 + hw/misc/tz-mpc.c | 1 + hw/misc/tz-msc.c | 1 + hw/misc/tz-ppc.c | 1 + hw/misc/vmcoreinfo.c | 1 + hw/misc/zynq-xadc.c | 1 + hw/misc/zynq_slcr.c | 1 + hw/net/allwinner_emac.c | 1 + hw/net/cadence_gem.c | 1 + hw/net/can/can_kvaser_pci.c | 1 + hw/net/can/can_mioe3680_pci.c | 1 + hw/net/can/can_pcm3680_pci.c | 1 + hw/net/can/can_sja1000.c | 1 + hw/net/dp8393x.c | 1 + hw/net/e1000.c | 1 + hw/net/e1000e.c | 1 + hw/net/eepro100.c | 1 + hw/net/ftgmac100.c | 1 + hw/net/imx_fec.c | 1 + hw/net/lan9118.c | 1 + hw/net/lance.c | 1 + hw/net/milkymist-minimac2.c | 1 + hw/net/mipsnet.c | 1 + hw/net/ne2000-isa.c | 1 + hw/net/ne2000-pci.c | 1 + hw/net/ne2000.c | 1 + hw/net/pcnet-pci.c | 1 + hw/net/pcnet.c | 1 + hw/net/rocker/rocker.c | 1 + hw/net/rtl8139.c | 1 + hw/net/smc91c111.c | 1 + hw/net/spapr_llan.c | 1 + hw/net/stellaris_enet.c | 1 + hw/net/sungem.c | 1 + hw/net/sunhme.c | 1 + hw/net/vmxnet3.c | 1 + hw/net/xgmac.c | 1 + hw/nvram/ds1225y.c | 1 + hw/nvram/eeprom93xx.c | 1 + hw/nvram/fw_cfg.c | 1 + hw/nvram/mac_nvram.c | 1 + hw/nvram/nrf51_nvm.c | 1 + hw/nvram/spapr_nvram.c | 1 + hw/openrisc/cputimer.c | 1 + hw/pci-bridge/gen_pcie_root_port.c | 1 + hw/pci-bridge/i82801b11.c | 1 + hw/pci-bridge/ioh3420.c | 1 + hw/pci-bridge/xio3130_downstream.c | 1 + hw/pci-bridge/xio3130_upstream.c | 1 + hw/pci-host/bonito.c | 1 + hw/pci-host/designware.c | 1 + hw/pci-host/gpex.c | 1 + hw/pci-host/piix.c | 1 + hw/pci-host/ppce500.c | 1 + hw/pci-host/prep.c | 1 + hw/pci-host/q35.c | 1 + hw/pci-host/versatile.c | 1 + hw/pci/msix.c | 1 + hw/pci/pci.c | 1 + hw/pci/pcie_aer.c | 1 + hw/ppc/ppc.c | 1 + hw/ppc/ppc4xx_pci.c | 1 + hw/ppc/prep_systemio.c | 1 + hw/ppc/rs6000_mc.c | 1 + hw/ppc/spapr_caps.c | 1 + hw/ppc/spapr_cpu_core.c | 1 + hw/ppc/spapr_drc.c | 1 + hw/ppc/spapr_iommu.c | 1 + hw/ppc/spapr_ovec.c | 1 + hw/ppc/spapr_pci.c | 1 + hw/ppc/spapr_rtc.c | 1 + hw/ppc/spapr_vio.c | 1 + hw/riscv/sifive_gpio.c | 1 + hw/s390x/event-facility.c | 1 + hw/s390x/sclpquiesce.c | 1 + hw/scsi/esp-pci.c | 1 + hw/scsi/esp.c | 1 + hw/scsi/lsi53c895a.c | 1 + hw/scsi/megasas.c | 1 + hw/scsi/mptsas.c | 1 + hw/scsi/scsi-bus.c | 1 + hw/scsi/scsi-disk.c | 1 + hw/scsi/spapr_vscsi.c | 1 + hw/scsi/vmw_pvscsi.c | 1 + hw/sd/bcm2835_sdhost.c | 1 + hw/sd/milkymist-memcard.c | 1 + hw/sd/pl181.c | 1 + hw/sd/pxa2xx_mmci.c | 1 + hw/sd/sd.c | 1 + hw/sd/sdhci.c | 1 + hw/sd/ssi-sd.c | 1 + hw/sparc/sun4m.c | 1 + hw/sparc/sun4m_iommu.c | 1 + hw/sparc64/sun4u.c | 2 ++ hw/ssi/aspeed_smc.c | 1 + hw/ssi/imx_spi.c | 1 + hw/ssi/mss-spi.c | 1 + hw/ssi/pl022.c | 1 + hw/ssi/ssi.c | 1 + hw/ssi/stm32f2xx_spi.c | 1 + hw/ssi/xilinx_spi.c | 1 + hw/ssi/xilinx_spips.c | 1 + hw/timer/a9gtimer.c | 1 + hw/timer/allwinner-a10-pit.c | 1 + hw/timer/arm_mptimer.c | 1 + hw/timer/arm_timer.c | 1 + hw/timer/armv7m_systick.c | 1 + hw/timer/aspeed_rtc.c | 1 + hw/timer/aspeed_timer.c | 1 + hw/timer/cadence_ttc.c | 1 + hw/timer/cmsdk-apb-dualtimer.c | 1 + hw/timer/cmsdk-apb-timer.c | 1 + hw/timer/digic-timer.c | 1 + hw/timer/ds1338.c | 1 + hw/timer/exynos4210_mct.c | 1 + hw/timer/exynos4210_pwm.c | 1 + hw/timer/exynos4210_rtc.c | 1 + hw/timer/hpet.c | 1 + hw/timer/i8254_common.c | 1 + hw/timer/imx_epit.c | 1 + hw/timer/imx_gpt.c | 1 + hw/timer/lm32_timer.c | 1 + hw/timer/m48t59.c | 1 + hw/timer/mc146818rtc.c | 1 + hw/timer/milkymist-sysctl.c | 1 + hw/timer/mss-timer.c | 1 + hw/timer/nrf51_timer.c | 1 + hw/timer/pl031.c | 1 + hw/timer/pxa2xx_timer.c | 1 + hw/timer/slavio_timer.c | 1 + hw/timer/stm32f2xx_timer.c | 1 + hw/timer/twl92230.c | 1 + hw/timer/xlnx-zynqmp-rtc.c | 1 + hw/tpm/tpm_emulator.c | 1 + hw/tpm/tpm_tis.c | 1 + hw/usb/bus.c | 1 + hw/usb/ccid-card-passthru.c | 1 + hw/usb/dev-audio.c | 1 + hw/usb/dev-bluetooth.c | 1 + hw/usb/dev-hid.c | 1 + hw/usb/dev-hub.c | 1 + hw/usb/dev-mtp.c | 1 + hw/usb/dev-network.c | 1 + hw/usb/dev-serial.c | 1 + hw/usb/dev-smartcard-reader.c | 1 + hw/usb/dev-storage.c | 1 + hw/usb/dev-uas.c | 1 + hw/usb/dev-wacom.c | 1 + hw/usb/hcd-ehci-pci.c | 1 + hw/usb/hcd-ehci-sysbus.c | 1 + hw/usb/hcd-ehci.c | 1 + hw/usb/hcd-ohci-pci.c | 1 + hw/usb/hcd-ohci.c | 1 + hw/usb/hcd-uhci.c | 1 + hw/usb/hcd-xhci.c | 1 + hw/usb/host-libusb.c | 1 + hw/usb/redirect.c | 1 + hw/vfio/amd-xgbe.c | 1 + hw/vfio/ap.c | 1 + hw/vfio/calxeda-xgmac.c | 1 + hw/vfio/pci.c | 1 + hw/vfio/platform.c | 1 + hw/watchdog/cmsdk-apb-watchdog.c | 1 + hw/watchdog/wdt_aspeed.c | 1 + hw/watchdog/wdt_diag288.c | 1 + hw/watchdog/wdt_i6300esb.c | 1 + hw/watchdog/wdt_ib700.c | 1 + hw/xtensa/xtfpga.c | 1 + include/hw/acpi/tco.h | 1 - include/hw/block/flash.h | 1 - include/hw/hw.h | 1 - include/hw/input/hid.h | 1 - include/hw/pci/shpc.h | 1 + include/hw/ppc/spapr_ovec.h | 1 - include/hw/ptimer.h | 1 - include/hw/virtio/virtio.h | 1 + include/net/net.h | 1 - include/qemu/fifo8.h | 1 - migration/savevm.c | 1 + target/alpha/machine.c | 1 + target/arm/machine.c | 1 + target/cris/machine.c | 1 + target/hppa/machine.c | 1 + target/i386/machine.c | 1 + target/lm32/machine.c | 1 + target/mips/machine.c | 1 + target/moxie/machine.c | 1 + target/openrisc/machine.c | 1 + target/ppc/machine.c | 1 + target/s390x/machine.c | 1 + target/sparc/machine.c | 1 + util/fifo8.c | 1 + 435 files changed, 436 insertions(+), 8 deletions(-) diff --git a/audio/audio.c b/audio/audio.c index 05adf7ffeb..cf65ae49f4 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "audio.h" +#include "migration/vmstate.h" #include "monitor/monitor.h" #include "qemu/timer.h" #include "qapi/error.h" diff --git a/cpus.c b/cpus.c index 927a00aa90..4ebdacdd44 100644 --- a/cpus.c +++ b/cpus.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/config-file.h" +#include "migration/vmstate.h" #include "monitor/monitor.h" #include "qapi/error.h" #include "qapi/qapi-commands-misc.h" diff --git a/hw/acpi/cpu.c b/hw/acpi/cpu.c index 7a90c8f82d..87f30a31d7 100644 --- a/hw/acpi/cpu.c +++ b/hw/acpi/cpu.c @@ -1,5 +1,6 @@ #include "qemu/osdep.h" #include "hw/boards.h" +#include "migration/vmstate.h" #include "hw/acpi/cpu.h" #include "qapi/error.h" #include "qapi/qapi-events-misc.h" diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c index b4d987c811..88eb7dbab1 100644 --- a/hw/acpi/ich9.c +++ b/hw/acpi/ich9.c @@ -30,6 +30,7 @@ #include "qapi/visitor.h" #include "hw/i386/pc.h" #include "hw/pci/pci.h" +#include "migration/vmstate.h" #include "qemu/timer.h" #include "sysemu/reset.h" #include "sysemu/sysemu.h" diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c index 297812d5f7..9483d66e86 100644 --- a/hw/acpi/memory_hotplug.c +++ b/hw/acpi/memory_hotplug.c @@ -4,6 +4,7 @@ #include "hw/mem/pc-dimm.h" #include "hw/boards.h" #include "hw/qdev-core.h" +#include "migration/vmstate.h" #include "trace.h" #include "qapi/error.h" #include "qapi/qapi-events-misc.h" diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c index 613406d09b..912ff6dd5c 100644 --- a/hw/acpi/pcihp.c +++ b/hw/acpi/pcihp.c @@ -35,6 +35,7 @@ #include "sysemu/sysemu.h" #include "exec/address-spaces.h" #include "hw/pci/pci_bus.h" +#include "migration/vmstate.h" #include "qapi/error.h" #include "qom/qom-qobject.h" #include "trace.h" diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 8f9a7ba2ab..1896dbbfb9 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -42,6 +42,7 @@ #include "hw/acpi/acpi_dev_interface.h" #include "hw/xen/xen.h" #include "migration/qemu-file-types.h" +#include "migration/vmstate.h" #include "qom/cpu.h" #include "trace.h" diff --git a/hw/acpi/tco.c b/hw/acpi/tco.c index acfb65e8f2..fb9052dbca 100644 --- a/hw/acpi/tco.c +++ b/hw/acpi/tco.c @@ -6,9 +6,11 @@ * This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. */ + #include "qemu/osdep.h" #include "sysemu/watchdog.h" #include "hw/i386/ich9.h" +#include "migration/vmstate.h" #include "hw/acpi/tco.h" #include "trace.h" diff --git a/hw/acpi/vmgenid.c b/hw/acpi/vmgenid.c index ed92ccc4b8..1e38e21cb7 100644 --- a/hw/acpi/vmgenid.c +++ b/hw/acpi/vmgenid.c @@ -18,6 +18,7 @@ #include "hw/acpi/aml-build.h" #include "hw/acpi/vmgenid.h" #include "hw/nvram/fw_cfg.h" +#include "migration/vmstate.h" #include "sysemu/reset.h" #include "sysemu/sysemu.h" diff --git a/hw/adc/stm32f2xx_adc.c b/hw/adc/stm32f2xx_adc.c index c93b60e22e..9684653e5e 100644 --- a/hw/adc/stm32f2xx_adc.c +++ b/hw/adc/stm32f2xx_adc.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/hw.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/arm/armsse.c b/hw/arm/armsse.c index 85cfa414eb..e5263aa33d 100644 --- a/hw/arm/armsse.c +++ b/hw/arm/armsse.c @@ -16,6 +16,7 @@ #include "qapi/error.h" #include "trace.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/registerfields.h" #include "hw/arm/armsse.h" #include "hw/arm/boot.h" diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c index def0f1ce6a..ca4c71f8a2 100644 --- a/hw/arm/highbank.c +++ b/hw/arm/highbank.c @@ -21,6 +21,7 @@ #include "qemu-common.h" #include "qapi/error.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/arm/boot.h" #include "hw/loader.h" #include "net/net.h" diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index d6025684f4..f8fbe402db 100644 --- a/hw/arm/integratorcp.c +++ b/hw/arm/integratorcp.c @@ -11,6 +11,7 @@ #include "qapi/error.h" #include "cpu.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/boards.h" #include "hw/arm/boot.h" #include "hw/misc/arm_integrator_debug.h" diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index 848e49f459..72e522a629 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -13,6 +13,7 @@ #include "qapi/error.h" #include "cpu.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/arm/boot.h" #include "net/net.h" #include "sysemu/sysemu.h" diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c index ab3fbd7b64..4e99c30e11 100644 --- a/hw/arm/pxa2xx.c +++ b/hw/arm/pxa2xx.c @@ -14,6 +14,7 @@ #include "qapi/error.h" #include "cpu.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/arm/pxa.h" #include "sysemu/sysemu.h" #include "hw/char/serial.h" diff --git a/hw/arm/pxa2xx_gpio.c b/hw/arm/pxa2xx_gpio.c index 1b1fc499dc..aa2c89dcf9 100644 --- a/hw/arm/pxa2xx_gpio.c +++ b/hw/arm/pxa2xx_gpio.c @@ -12,6 +12,7 @@ #include "hw/hw.h" #include "hw/irq.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/arm/pxa.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/arm/pxa2xx_pic.c b/hw/arm/pxa2xx_pic.c index 2f4b461562..c8bd497e99 100644 --- a/hw/arm/pxa2xx_pic.c +++ b/hw/arm/pxa2xx_pic.c @@ -14,6 +14,7 @@ #include "hw/hw.h" #include "hw/arm/pxa.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #define ICIP 0x00 /* Interrupt Controller IRQ Pending register */ #define ICMR 0x04 /* Interrupt Controller Mask register */ diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c index ccca60720e..0634a398d2 100644 --- a/hw/arm/smmuv3.c +++ b/hw/arm/smmuv3.c @@ -21,6 +21,7 @@ #include "hw/irq.h" #include "sysemu/sysemu.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/qdev-core.h" #include "hw/pci/pci.h" #include "exec/address-spaces.h" diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c index b90431ffea..003929b3e0 100644 --- a/hw/arm/spitz.c +++ b/hw/arm/spitz.c @@ -28,6 +28,7 @@ #include "audio/audio.h" #include "hw/boards.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "exec/address-spaces.h" #include "cpu.h" diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c index 088ae2dbd7..9feb403f1e 100644 --- a/hw/arm/stellaris.c +++ b/hw/arm/stellaris.c @@ -24,6 +24,7 @@ #include "hw/input/gamepad.h" #include "hw/irq.h" #include "hw/watchdog/cmsdk-apb-watchdog.h" +#include "migration/vmstate.h" #include "hw/misc/unimp.h" #include "cpu.h" diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c index 2e016f4b77..ca377df9e3 100644 --- a/hw/arm/strongarm.c +++ b/hw/arm/strongarm.c @@ -33,6 +33,7 @@ #include "hw/boards.h" #include "hw/irq.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "strongarm.h" #include "qemu/error-report.h" #include "hw/arm/boot.h" diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c index bc922345a6..e25561705f 100644 --- a/hw/arm/versatilepb.c +++ b/hw/arm/versatilepb.c @@ -11,6 +11,7 @@ #include "qapi/error.h" #include "cpu.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/arm/boot.h" #include "hw/net/smc91c111.h" #include "net/net.h" diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index ad54d65ea0..4f85eb575c 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -46,6 +46,7 @@ #include "sysemu/numa.h" #include "sysemu/reset.h" #include "kvm_arm.h" +#include "migration/vmstate.h" #define ARM_SPI_BASE 32 #define ACPI_POWER_BUTTON_DEVICE "PWRB" diff --git a/hw/arm/z2.c b/hw/arm/z2.c index 366d46ff5f..810922d74e 100644 --- a/hw/arm/z2.c +++ b/hw/arm/z2.c @@ -18,6 +18,7 @@ #include "hw/i2c/i2c.h" #include "hw/irq.h" #include "hw/ssi/ssi.h" +#include "migration/vmstate.h" #include "hw/boards.h" #include "sysemu/sysemu.h" #include "hw/block/flash.h" diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c index fb98da2678..26ac84b388 100644 --- a/hw/audio/ac97.c +++ b/hw/audio/ac97.c @@ -22,6 +22,7 @@ #include "hw/audio/soundhw.h" #include "audio/audio.h" #include "hw/pci/pci.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "sysemu/dma.h" diff --git a/hw/audio/cs4231.c b/hw/audio/cs4231.c index 8372299ebb..b5d3e895ce 100644 --- a/hw/audio/cs4231.c +++ b/hw/audio/cs4231.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "trace.h" diff --git a/hw/audio/cs4231a.c b/hw/audio/cs4231a.c index 9eeab137c7..f7a39c0af4 100644 --- a/hw/audio/cs4231a.c +++ b/hw/audio/cs4231a.c @@ -29,6 +29,7 @@ #include "hw/irq.h" #include "hw/isa/isa.h" #include "hw/qdev.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "qemu/timer.h" #include "qapi/error.h" diff --git a/hw/audio/es1370.c b/hw/audio/es1370.c index 260c142b70..0289f771c1 100644 --- a/hw/audio/es1370.c +++ b/hw/audio/es1370.c @@ -31,6 +31,7 @@ #include "hw/audio/soundhw.h" #include "audio/audio.h" #include "hw/pci/pci.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "sysemu/dma.h" diff --git a/hw/audio/gus.c b/hw/audio/gus.c index 61230147ce..1a78cc47cd 100644 --- a/hw/audio/gus.c +++ b/hw/audio/gus.c @@ -30,6 +30,7 @@ #include "audio/audio.h" #include "hw/irq.h" #include "hw/isa/isa.h" +#include "migration/vmstate.h" #include "gusemu.h" #include "gustate.h" diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c index 84639b5424..4f6fbb8b13 100644 --- a/hw/audio/hda-codec.c +++ b/hw/audio/hda-codec.c @@ -21,6 +21,7 @@ #include "hw/hw.h" #include "hw/pci/pci.h" #include "intel-hda.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "intel-hda-defs.h" #include "audio/audio.h" diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c index b78baac295..e6f150bb0d 100644 --- a/hw/audio/intel-hda.c +++ b/hw/audio/intel-hda.c @@ -27,6 +27,7 @@ #include "qemu/module.h" #include "hw/audio/soundhw.h" #include "intel-hda.h" +#include "migration/vmstate.h" #include "intel-hda-defs.h" #include "sysemu/dma.h" #include "qapi/error.h" diff --git a/hw/audio/lm4549.c b/hw/audio/lm4549.c index af8b22b541..32b1481b56 100644 --- a/hw/audio/lm4549.c +++ b/hw/audio/lm4549.c @@ -17,6 +17,7 @@ #include "hw/hw.h" #include "audio/audio.h" #include "lm4549.h" +#include "migration/vmstate.h" #if 0 #define LM4549_DEBUG 1 diff --git a/hw/audio/marvell_88w8618.c b/hw/audio/marvell_88w8618.c index 167b478ec6..6345bc1d5c 100644 --- a/hw/audio/marvell_88w8618.c +++ b/hw/audio/marvell_88w8618.c @@ -12,6 +12,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/hw.h" #include "hw/irq.h" #include "hw/audio/wm8750.h" diff --git a/hw/audio/milkymist-ac97.c b/hw/audio/milkymist-ac97.c index 3ba382ee4d..890a5fe89e 100644 --- a/hw/audio/milkymist-ac97.c +++ b/hw/audio/milkymist-ac97.c @@ -25,6 +25,7 @@ #include "hw/hw.h" #include "hw/irq.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "trace.h" #include "audio/audio.h" #include "qemu/error-report.h" diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c index a7b3ab0c2b..9039c9786d 100644 --- a/hw/audio/pcspk.c +++ b/hw/audio/pcspk.c @@ -30,6 +30,7 @@ #include "qemu/module.h" #include "qemu/timer.h" #include "hw/timer/i8254.h" +#include "migration/vmstate.h" #include "hw/audio/pcspk.h" #include "qapi/error.h" diff --git a/hw/audio/pl041.c b/hw/audio/pl041.c index 47f0dfff18..3c371397de 100644 --- a/hw/audio/pl041.c +++ b/hw/audio/pl041.c @@ -28,6 +28,7 @@ #include "pl041.h" #include "lm4549.h" +#include "migration/vmstate.h" #if 0 #define PL041_DEBUG_LEVEL 1 diff --git a/hw/audio/sb16.c b/hw/audio/sb16.c index ba5a5dd022..599194779d 100644 --- a/hw/audio/sb16.c +++ b/hw/audio/sb16.c @@ -29,6 +29,7 @@ #include "hw/irq.h" #include "hw/isa/isa.h" #include "hw/qdev.h" +#include "migration/vmstate.h" #include "qemu/timer.h" #include "qemu/host-utils.h" #include "qemu/log.h" diff --git a/hw/audio/wm8750.c b/hw/audio/wm8750.c index 81f83eea88..9f6df5d59c 100644 --- a/hw/audio/wm8750.c +++ b/hw/audio/wm8750.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "hw/i2c/i2c.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "hw/audio/wm8750.h" #include "audio/audio.h" diff --git a/hw/block/ecc.c b/hw/block/ecc.c index 48311d2609..f846ab3e01 100644 --- a/hw/block/ecc.c +++ b/hw/block/ecc.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" +#include "migration/vmstate.h" #include "hw/block/flash.h" /* diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 982b0e4aee..d39314b79e 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -36,6 +36,7 @@ #include "hw/irq.h" #include "hw/isa/isa.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/block/block.h" #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index dd87affcf5..9d395169b2 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -26,6 +26,7 @@ #include "hw/hw.h" #include "sysemu/block-backend.h" #include "hw/ssi/ssi.h" +#include "migration/vmstate.h" #include "qemu/bitops.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/block/nand.c b/hw/block/nand.c index 0a2736b50e..4a0d4677c3 100644 --- a/hw/block/nand.c +++ b/hw/block/nand.c @@ -23,6 +23,7 @@ #include "hw/block/flash.h" #include "sysemu/block-backend.h" #include "hw/qdev.h" +#include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/module.h" diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 36d6a8bb3a..079a8ffe80 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -31,6 +31,7 @@ #include "hw/hw.h" #include "hw/pci/msix.h" #include "hw/pci/pci.h" +#include "migration/vmstate.h" #include "sysemu/sysemu.h" #include "qapi/error.h" #include "qapi/visitor.h" diff --git a/hw/block/onenand.c b/hw/block/onenand.c index b3644f7e89..18123f0499 100644 --- a/hw/block/onenand.c +++ b/hw/block/onenand.c @@ -26,6 +26,7 @@ #include "sysemu/block-backend.h" #include "exec/memory.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "qemu/error-report.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index 435be1e35c..c8a46d1a3b 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -50,6 +50,7 @@ #include "qemu/module.h" #include "qemu/option.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "sysemu/blockdev.h" #include "sysemu/sysemu.h" #include "trace.h" diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index f68837a449..9af1b18e19 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -43,6 +43,7 @@ #include "qemu/host-utils.h" #include "qemu/module.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "trace.h" #define PFLASH_DEBUG false diff --git a/hw/char/bcm2835_aux.c b/hw/char/bcm2835_aux.c index 8395c79520..45fc34d92d 100644 --- a/hw/char/bcm2835_aux.c +++ b/hw/char/bcm2835_aux.c @@ -23,6 +23,7 @@ #include "qemu/osdep.h" #include "hw/char/bcm2835_aux.h" #include "hw/irq.h" +#include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/char/cadence_uart.c b/hw/char/cadence_uart.c index 6b9eb140c7..0e315b2376 100644 --- a/hw/char/cadence_uart.c +++ b/hw/char/cadence_uart.c @@ -23,6 +23,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "chardev/char-fe.h" #include "chardev/char-serial.h" #include "qemu/timer.h" diff --git a/hw/char/cmsdk-apb-uart.c b/hw/char/cmsdk-apb-uart.c index dd96a3302e..9e1aa43bd3 100644 --- a/hw/char/cmsdk-apb-uart.c +++ b/hw/char/cmsdk-apb-uart.c @@ -21,6 +21,7 @@ #include "qapi/error.h" #include "trace.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/registerfields.h" #include "chardev/char-fe.h" #include "chardev/char-serial.h" diff --git a/hw/char/digic-uart.c b/hw/char/digic-uart.c index e4ac8435c8..79ea92249c 100644 --- a/hw/char/digic-uart.c +++ b/hw/char/digic-uart.c @@ -29,6 +29,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "chardev/char-fe.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/char/escc.c b/hw/char/escc.c index 678d494d39..404002b899 100644 --- a/hw/char/escc.c +++ b/hw/char/escc.c @@ -26,6 +26,7 @@ #include "hw/hw.h" #include "hw/irq.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "hw/char/escc.h" #include "ui/console.h" diff --git a/hw/char/exynos4210_uart.c b/hw/char/exynos4210_uart.c index dabcd07415..9bd826b33d 100644 --- a/hw/char/exynos4210_uart.c +++ b/hw/char/exynos4210_uart.c @@ -21,6 +21,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "qemu/error-report.h" #include "qemu/module.h" #include "sysemu/sysemu.h" diff --git a/hw/char/imx_serial.c b/hw/char/imx_serial.c index f79e47d4ee..bf3f07d760 100644 --- a/hw/char/imx_serial.c +++ b/hw/char/imx_serial.c @@ -21,6 +21,7 @@ #include "qemu/osdep.h" #include "hw/char/imx_serial.h" #include "hw/irq.h" +#include "migration/vmstate.h" #include "sysemu/sysemu.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/char/ipoctal232.c b/hw/char/ipoctal232.c index 7674e2d7b6..1171dc20cf 100644 --- a/hw/char/ipoctal232.c +++ b/hw/char/ipoctal232.c @@ -11,6 +11,7 @@ #include "qemu/osdep.h" #include "hw/ipack/ipack.h" #include "hw/irq.h" +#include "migration/vmstate.h" #include "qemu/bitops.h" #include "qemu/module.h" #include "chardev/char-fe.h" diff --git a/hw/char/lm32_juart.c b/hw/char/lm32_juart.c index 41a3ec81e3..f4488fa736 100644 --- a/hw/char/lm32_juart.c +++ b/hw/char/lm32_juart.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "trace.h" #include "chardev/char-fe.h" diff --git a/hw/char/lm32_uart.c b/hw/char/lm32_uart.c index 377032567a..4b3215fe96 100644 --- a/hw/char/lm32_uart.c +++ b/hw/char/lm32_uart.c @@ -26,6 +26,7 @@ #include "hw/hw.h" #include "hw/irq.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "trace.h" #include "chardev/char-fe.h" #include "qemu/error-report.h" diff --git a/hw/char/milkymist-uart.c b/hw/char/milkymist-uart.c index d4641b5f44..53c1ca789d 100644 --- a/hw/char/milkymist-uart.c +++ b/hw/char/milkymist-uart.c @@ -25,6 +25,7 @@ #include "hw/hw.h" #include "hw/irq.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "trace.h" #include "chardev/char-fe.h" #include "qemu/error-report.h" diff --git a/hw/char/nrf51_uart.c b/hw/char/nrf51_uart.c index bbe766d3c6..bb886f12aa 100644 --- a/hw/char/nrf51_uart.c +++ b/hw/char/nrf51_uart.c @@ -17,6 +17,7 @@ #include "qemu/module.h" #include "hw/char/nrf51_uart.h" #include "hw/irq.h" +#include "migration/vmstate.h" #include "trace.h" static void nrf51_uart_update_irq(NRF51UARTState *s) diff --git a/hw/char/parallel.c b/hw/char/parallel.c index ea8ab35e59..1798fd0c44 100644 --- a/hw/char/parallel.c +++ b/hw/char/parallel.c @@ -31,6 +31,7 @@ #include "chardev/char-fe.h" #include "hw/irq.h" #include "hw/isa/isa.h" +#include "migration/vmstate.h" #include "hw/char/parallel.h" #include "sysemu/reset.h" #include "sysemu/sysemu.h" diff --git a/hw/char/pl011.c b/hw/char/pl011.c index a2da375528..84ad8ff9fb 100644 --- a/hw/char/pl011.c +++ b/hw/char/pl011.c @@ -22,6 +22,7 @@ #include "hw/char/pl011.h" #include "hw/irq.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "chardev/char-fe.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/char/sclpconsole-lm.c b/hw/char/sclpconsole-lm.c index 691dc870ed..d904265cda 100644 --- a/hw/char/sclpconsole-lm.c +++ b/hw/char/sclpconsole-lm.c @@ -21,6 +21,7 @@ #include "chardev/char-fe.h" #include "hw/s390x/sclp.h" +#include "migration/vmstate.h" #include "hw/s390x/event-facility.h" #include "hw/s390x/ebcdic.h" diff --git a/hw/char/sclpconsole.c b/hw/char/sclpconsole.c index 09b1d45d7a..f3669766bf 100644 --- a/hw/char/sclpconsole.c +++ b/hw/char/sclpconsole.c @@ -19,6 +19,7 @@ #include "qemu/module.h" #include "hw/s390x/sclp.h" +#include "migration/vmstate.h" #include "hw/s390x/event-facility.h" #include "chardev/char-fe.h" diff --git a/hw/char/serial-isa.c b/hw/char/serial-isa.c index 610426111a..d3080b76e4 100644 --- a/hw/char/serial-isa.c +++ b/hw/char/serial-isa.c @@ -28,6 +28,7 @@ #include "qemu/module.h" #include "hw/char/serial.h" #include "hw/isa/isa.h" +#include "migration/vmstate.h" #define ISA_SERIAL(obj) OBJECT_CHECK(ISASerialState, (obj), TYPE_ISA_SERIAL) diff --git a/hw/char/serial-pci-multi.c b/hw/char/serial-pci-multi.c index 65dbfbd205..867e7840b4 100644 --- a/hw/char/serial-pci-multi.c +++ b/hw/char/serial-pci-multi.c @@ -32,6 +32,7 @@ #include "hw/char/serial.h" #include "hw/irq.h" #include "hw/pci/pci.h" +#include "migration/vmstate.h" #define PCI_SERIAL_MAX_PORTS 4 diff --git a/hw/char/serial-pci.c b/hw/char/serial-pci.c index 808d32b508..ee537890c2 100644 --- a/hw/char/serial-pci.c +++ b/hw/char/serial-pci.c @@ -31,6 +31,7 @@ #include "hw/char/serial.h" #include "hw/irq.h" #include "hw/pci/pci.h" +#include "migration/vmstate.h" typedef struct PCISerialState { PCIDevice dev; diff --git a/hw/char/serial.c b/hw/char/serial.c index 1d977287ea..4d54163a62 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -26,6 +26,7 @@ #include "qemu/osdep.h" #include "hw/char/serial.h" #include "hw/irq.h" +#include "migration/vmstate.h" #include "chardev/char-serial.h" #include "qapi/error.h" #include "qemu/timer.h" diff --git a/hw/char/spapr_vty.c b/hw/char/spapr_vty.c index f360ab3612..b3995a9e0c 100644 --- a/hw/char/spapr_vty.c +++ b/hw/char/spapr_vty.c @@ -4,6 +4,7 @@ #include "qapi/error.h" #include "cpu.h" #include "hw/qdev.h" +#include "migration/vmstate.h" #include "chardev/char-fe.h" #include "hw/irq.h" #include "hw/ppc/spapr.h" diff --git a/hw/core/loader.c b/hw/core/loader.c index 830845dd73..84e4f3efac 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -47,6 +47,7 @@ #include "qapi/error.h" #include "hw/hw.h" #include "disas/disas.h" +#include "migration/vmstate.h" #include "monitor/monitor.h" #include "sysemu/reset.h" #include "sysemu/sysemu.h" diff --git a/hw/core/numa.c b/hw/core/numa.c index a11431483c..67548064ee 100644 --- a/hw/core/numa.c +++ b/hw/core/numa.c @@ -33,6 +33,7 @@ #include "qapi/qapi-visit-machine.h" #include "sysemu/qtest.h" #include "hw/mem/pc-dimm.h" +#include "migration/vmstate.h" #include "hw/mem/memory-device.h" #include "qemu/option.h" #include "qemu/config-file.h" diff --git a/hw/core/or-irq.c b/hw/core/or-irq.c index 6ed34d9238..02949dae1a 100644 --- a/hw/core/or-irq.c +++ b/hw/core/or-irq.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" #include "hw/or-irq.h" +#include "migration/vmstate.h" #include "qemu/module.h" static void or_irq_handler(void *opaque, int n, int level) diff --git a/hw/core/ptimer.c b/hw/core/ptimer.c index 170fd34d8b..49b60282cf 100644 --- a/hw/core/ptimer.c +++ b/hw/core/ptimer.c @@ -5,10 +5,12 @@ * * This code is licensed under the GNU LGPL. */ + #include "qemu/osdep.h" #include "hw/hw.h" #include "qemu/timer.h" #include "hw/ptimer.h" +#include "migration/vmstate.h" #include "qemu/host-utils.h" #include "sysemu/replay.h" #include "sysemu/qtest.h" diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 5c4b67a408..b1fe40d20d 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -38,6 +38,7 @@ #include "hw/irq.h" #include "hw/boards.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" bool qdev_hotplug = false; static bool qdev_hot_added = false; diff --git a/hw/display/ads7846.c b/hw/display/ads7846.c index 12d8272615..c12272ae72 100644 --- a/hw/display/ads7846.c +++ b/hw/display/ads7846.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" #include "hw/ssi/ssi.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "ui/console.h" diff --git a/hw/display/bcm2835_fb.c b/hw/display/bcm2835_fb.c index e446355f29..3d99d99e2b 100644 --- a/hw/display/bcm2835_fb.c +++ b/hw/display/bcm2835_fb.c @@ -30,6 +30,7 @@ #include "framebuffer.h" #include "ui/pixel_ops.h" #include "hw/misc/bcm2835_mbox_defs.h" +#include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/display/bochs-display.c b/hw/display/bochs-display.c index 582133dd71..ce40aea354 100644 --- a/hw/display/bochs-display.c +++ b/hw/display/bochs-display.c @@ -10,6 +10,7 @@ #include "qemu/units.h" #include "hw/hw.h" #include "hw/pci/pci.h" +#include "migration/vmstate.h" #include "hw/display/bochs-vbe.h" #include "hw/display/edid.h" diff --git a/hw/display/cg3.c b/hw/display/cg3.c index 7cf9ebd604..29a8735a38 100644 --- a/hw/display/cg3.c +++ b/hw/display/cg3.c @@ -29,6 +29,7 @@ #include "qemu/error-report.h" #include "ui/console.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/irq.h" #include "hw/loader.h" #include "qemu/log.h" diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c index 4ccf5b4f18..3120b3cfaf 100644 --- a/hw/display/cirrus_vga.c +++ b/hw/display/cirrus_vga.c @@ -40,6 +40,7 @@ #include "trace.h" #include "hw/hw.h" #include "hw/pci/pci.h" +#include "migration/vmstate.h" #include "ui/pixel_ops.h" #include "cirrus_vga_internal.h" diff --git a/hw/display/dpcd.c b/hw/display/dpcd.c index 88cde54821..170545c605 100644 --- a/hw/display/dpcd.c +++ b/hw/display/dpcd.c @@ -30,6 +30,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/misc/auxbus.h" +#include "migration/vmstate.h" #include "hw/display/dpcd.h" #ifndef DEBUG_DPCD diff --git a/hw/display/exynos4210_fimd.c b/hw/display/exynos4210_fimd.c index 889622eefa..8e1508a3e6 100644 --- a/hw/display/exynos4210_fimd.c +++ b/hw/display/exynos4210_fimd.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "ui/console.h" #include "ui/pixel_ops.h" #include "qemu/bswap.h" diff --git a/hw/display/g364fb.c b/hw/display/g364fb.c index 89248f87df..1757b777e2 100644 --- a/hw/display/g364fb.c +++ b/hw/display/g364fb.c @@ -27,6 +27,7 @@ #include "ui/pixel_ops.h" #include "trace.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" typedef struct G364State { /* hardware */ diff --git a/hw/display/i2c-ddc.c b/hw/display/i2c-ddc.c index 041fc4f408..3ac85216a5 100644 --- a/hw/display/i2c-ddc.c +++ b/hw/display/i2c-ddc.c @@ -20,6 +20,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/i2c/i2c.h" +#include "migration/vmstate.h" #include "hw/display/i2c-ddc.h" #ifndef DEBUG_I2CDDC diff --git a/hw/display/jazz_led.c b/hw/display/jazz_led.c index 783189ebcd..3e0112b1ca 100644 --- a/hw/display/jazz_led.c +++ b/hw/display/jazz_led.c @@ -28,6 +28,7 @@ #include "ui/pixel_ops.h" #include "trace.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" typedef enum { REDRAW_NONE = 0, REDRAW_SEGMENTS = 1, REDRAW_BACKGROUND = 2, diff --git a/hw/display/milkymist-tmu2.c b/hw/display/milkymist-tmu2.c index 3f92378410..7bfffa52da 100644 --- a/hw/display/milkymist-tmu2.c +++ b/hw/display/milkymist-tmu2.c @@ -28,6 +28,7 @@ #include "hw/hw.h" #include "hw/irq.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "trace.h" #include "qapi/error.h" #include "qemu/error-report.h" diff --git a/hw/display/milkymist-vgafb.c b/hw/display/milkymist-vgafb.c index dce1dd7ad6..9a9a481ebd 100644 --- a/hw/display/milkymist-vgafb.c +++ b/hw/display/milkymist-vgafb.c @@ -33,6 +33,7 @@ #include "qemu/module.h" #define BITS 8 +#include "migration/vmstate.h" #include "milkymist-vgafb_template.h" #define BITS 15 #include "milkymist-vgafb_template.h" diff --git a/hw/display/pl110.c b/hw/display/pl110.c index 8fb510ee73..c2991a28d2 100644 --- a/hw/display/pl110.c +++ b/hw/display/pl110.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "ui/console.h" #include "framebuffer.h" #include "ui/pixel_ops.h" diff --git a/hw/display/pxa2xx_lcd.c b/hw/display/pxa2xx_lcd.c index 7aca3912f5..05f5f84671 100644 --- a/hw/display/pxa2xx_lcd.c +++ b/hw/display/pxa2xx_lcd.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/irq.h" +#include "migration/vmstate.h" #include "ui/console.h" #include "hw/arm/pxa.h" #include "ui/pixel_ops.h" diff --git a/hw/display/qxl.c b/hw/display/qxl.c index 98c7410032..4a44712fde 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -29,6 +29,7 @@ #include "qemu/module.h" #include "sysemu/sysemu.h" #include "migration/blocker.h" +#include "migration/vmstate.h" #include "trace.h" #include "qxl.h" diff --git a/hw/display/sii9022.c b/hw/display/sii9022.c index 0bebb85a58..0710ce9de5 100644 --- a/hw/display/sii9022.c +++ b/hw/display/sii9022.c @@ -16,6 +16,7 @@ #include "qemu/osdep.h" #include "qemu/module.h" #include "hw/i2c/i2c.h" +#include "migration/vmstate.h" #include "hw/display/i2c-ddc.h" #include "trace.h" diff --git a/hw/display/sm501.c b/hw/display/sm501.c index 5918f59b2b..6f88aaaa08 100644 --- a/hw/display/sm501.c +++ b/hw/display/sm501.c @@ -33,6 +33,7 @@ #include "hw/char/serial.h" #include "ui/console.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/pci/pci.h" #include "hw/i2c/i2c.h" #include "hw/display/i2c-ddc.h" diff --git a/hw/display/ssd0303.c b/hw/display/ssd0303.c index f2a60c44c9..718378f6de 100644 --- a/hw/display/ssd0303.c +++ b/hw/display/ssd0303.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "hw/i2c/i2c.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "ui/console.h" diff --git a/hw/display/ssd0323.c b/hw/display/ssd0323.c index ac373f1e78..c3bdb18742 100644 --- a/hw/display/ssd0323.c +++ b/hw/display/ssd0323.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "hw/ssi/ssi.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "ui/console.h" diff --git a/hw/display/tcx.c b/hw/display/tcx.c index cdabcbc746..f9b1ae56ec 100644 --- a/hw/display/tcx.c +++ b/hw/display/tcx.c @@ -29,6 +29,7 @@ #include "ui/pixel_ops.h" #include "hw/loader.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "qemu/error-report.h" #include "qemu/module.h" diff --git a/hw/display/vga-isa-mm.c b/hw/display/vga-isa-mm.c index a790f69b6d..1c4f43b52b 100644 --- a/hw/display/vga-isa-mm.c +++ b/hw/display/vga-isa-mm.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/bitops.h" #include "qemu/units.h" #include "hw/hw.h" +#include "migration/vmstate.h" #include "hw/display/vga.h" #include "vga_int.h" #include "ui/pixel_ops.h" diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c index dedac5d128..cb956b4545 100644 --- a/hw/display/vga-pci.c +++ b/hw/display/vga-pci.c @@ -27,6 +27,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/pci/pci.h" +#include "migration/vmstate.h" #include "vga_int.h" #include "ui/pixel_ops.h" #include "qemu/module.h" diff --git a/hw/display/vga.c b/hw/display/vga.c index 4d3572891a..f8098f63e9 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -34,6 +34,7 @@ #include "ui/pixel_ops.h" #include "qemu/timer.h" #include "hw/xen/xen.h" +#include "migration/vmstate.h" #include "trace.h" //#define DEBUG_VGA_MEM diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c index 249a179bf6..ebfcc46a2d 100644 --- a/hw/display/vmware_vga.c +++ b/hw/display/vmware_vga.c @@ -31,6 +31,7 @@ #include "trace.h" #include "ui/vnc.h" #include "hw/pci/pci.h" +#include "migration/vmstate.h" #undef VERBOSE #define HW_RECT_ACCEL diff --git a/hw/display/xlnx_dp.c b/hw/display/xlnx_dp.c index 4daac38070..fde3b21ea5 100644 --- a/hw/display/xlnx_dp.c +++ b/hw/display/xlnx_dp.c @@ -28,6 +28,7 @@ #include "qemu/module.h" #include "hw/display/xlnx_dp.h" #include "hw/irq.h" +#include "migration/vmstate.h" #ifndef DEBUG_DP #define DEBUG_DP 0 diff --git a/hw/dma/bcm2835_dma.c b/hw/dma/bcm2835_dma.c index 090c73d951..192bd377a0 100644 --- a/hw/dma/bcm2835_dma.c +++ b/hw/dma/bcm2835_dma.c @@ -7,6 +7,7 @@ #include "qapi/error.h" #include "hw/dma/bcm2835_dma.h" #include "hw/irq.h" +#include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/dma/i82374.c b/hw/dma/i82374.c index 68fad2dd12..3f0db4a021 100644 --- a/hw/dma/i82374.c +++ b/hw/dma/i82374.c @@ -26,6 +26,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/isa/isa.h" +#include "migration/vmstate.h" #include "hw/dma/i8257.h" #define TYPE_I82374 "i82374" diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c index 30a3442437..b7404cff60 100644 --- a/hw/dma/i8257.c +++ b/hw/dma/i8257.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/isa/isa.h" +#include "migration/vmstate.h" #include "hw/dma/i8257.h" #include "qemu/main-loop.h" #include "qemu/module.h" diff --git a/hw/dma/pl080.c b/hw/dma/pl080.c index be7f9c71a8..59bc929363 100644 --- a/hw/dma/pl080.c +++ b/hw/dma/pl080.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "exec/address-spaces.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/dma/pl330.c b/hw/dma/pl330.c index 2e59120944..2ee440905f 100644 --- a/hw/dma/pl330.c +++ b/hw/dma/pl330.c @@ -18,6 +18,7 @@ #include "qemu-common.h" #include "hw/irq.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/timer.h" #include "sysemu/dma.h" diff --git a/hw/dma/pxa2xx_dma.c b/hw/dma/pxa2xx_dma.c index 1c273fb309..1124051730 100644 --- a/hw/dma/pxa2xx_dma.c +++ b/hw/dma/pxa2xx_dma.c @@ -13,6 +13,7 @@ #include "hw/irq.h" #include "hw/arm/pxa.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/dma/rc4030.c b/hw/dma/rc4030.c index f7650f617c..d35fb59eee 100644 --- a/hw/dma/rc4030.c +++ b/hw/dma/rc4030.c @@ -28,6 +28,7 @@ #include "hw/irq.h" #include "hw/mips/mips.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "qemu/timer.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/dma/sparc32_dma.c b/hw/dma/sparc32_dma.c index a05b6be95c..8955fe262e 100644 --- a/hw/dma/sparc32_dma.c +++ b/hw/dma/sparc32_dma.c @@ -31,6 +31,7 @@ #include "hw/sparc/sparc32_dma.h" #include "hw/sparc/sun4m_iommu.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "sysemu/dma.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/dma/xlnx-zdma.c b/hw/dma/xlnx-zdma.c index 5afd77a5b8..2dbdfc5739 100644 --- a/hw/dma/xlnx-zdma.c +++ b/hw/dma/xlnx-zdma.c @@ -29,6 +29,7 @@ #include "qemu/osdep.h" #include "hw/dma/xlnx-zdma.h" #include "hw/irq.h" +#include "migration/vmstate.h" #include "qemu/bitops.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/dma/xlnx-zynq-devcfg.c b/hw/dma/xlnx-zynq-devcfg.c index 855c784758..89200ff15d 100644 --- a/hw/dma/xlnx-zynq-devcfg.c +++ b/hw/dma/xlnx-zynq-devcfg.c @@ -27,6 +27,7 @@ #include "qemu/osdep.h" #include "hw/dma/xlnx-zynq-devcfg.h" #include "hw/irq.h" +#include "migration/vmstate.h" #include "qemu/bitops.h" #include "sysemu/sysemu.h" #include "sysemu/dma.h" diff --git a/hw/dma/xlnx_dpdma.c b/hw/dma/xlnx_dpdma.c index 1bba7f2159..b40c897de2 100644 --- a/hw/dma/xlnx_dpdma.c +++ b/hw/dma/xlnx_dpdma.c @@ -28,6 +28,7 @@ #include "qemu/module.h" #include "hw/dma/xlnx_dpdma.h" #include "hw/irq.h" +#include "migration/vmstate.h" #ifndef DEBUG_DPDMA #define DEBUG_DPDMA 0 diff --git a/hw/gpio/bcm2835_gpio.c b/hw/gpio/bcm2835_gpio.c index ea3f3f2bda..91ce3d10cc 100644 --- a/hw/gpio/bcm2835_gpio.c +++ b/hw/gpio/bcm2835_gpio.c @@ -17,6 +17,7 @@ #include "qemu/timer.h" #include "qapi/error.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/sd/sd.h" #include "hw/gpio/bcm2835_gpio.h" #include "hw/irq.h" diff --git a/hw/gpio/gpio_key.c b/hw/gpio/gpio_key.c index 66866fa87c..46bbd42772 100644 --- a/hw/gpio/gpio_key.c +++ b/hw/gpio/gpio_key.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "qemu/timer.h" diff --git a/hw/gpio/imx_gpio.c b/hw/gpio/imx_gpio.c index 3d3c9644db..8792fb5ad4 100644 --- a/hw/gpio/imx_gpio.c +++ b/hw/gpio/imx_gpio.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "hw/gpio/imx_gpio.h" #include "hw/irq.h" +#include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/gpio/max7310.c b/hw/gpio/max7310.c index b0925ab1a1..432f0b00fe 100644 --- a/hw/gpio/max7310.c +++ b/hw/gpio/max7310.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #include "hw/i2c/i2c.h" #include "hw/irq.h" +#include "migration/vmstate.h" #include "qemu/module.h" #define TYPE_MAX7310 "max7310" diff --git a/hw/gpio/mpc8xxx.c b/hw/gpio/mpc8xxx.c index f3b90b4b33..1d99667094 100644 --- a/hw/gpio/mpc8xxx.c +++ b/hw/gpio/mpc8xxx.c @@ -22,6 +22,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "qemu/module.h" #define TYPE_MPC8XXX_GPIO "mpc8xxx_gpio" diff --git a/hw/gpio/nrf51_gpio.c b/hw/gpio/nrf51_gpio.c index 24a890911a..b47fddf4ed 100644 --- a/hw/gpio/nrf51_gpio.c +++ b/hw/gpio/nrf51_gpio.c @@ -15,6 +15,7 @@ #include "qemu/module.h" #include "hw/gpio/nrf51_gpio.h" #include "hw/irq.h" +#include "migration/vmstate.h" #include "trace.h" /* diff --git a/hw/gpio/pl061.c b/hw/gpio/pl061.c index c605d91c93..2a828260bd 100644 --- a/hw/gpio/pl061.c +++ b/hw/gpio/pl061.c @@ -11,6 +11,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/gpio/zaurus.c b/hw/gpio/zaurus.c index 98aa416931..a1ba09c6f2 100644 --- a/hw/gpio/zaurus.c +++ b/hw/gpio/zaurus.c @@ -21,6 +21,7 @@ #include "hw/irq.h" #include "hw/arm/sharpsl.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "qemu/module.h" #undef REG_FMT diff --git a/hw/hppa/dino.c b/hw/hppa/dino.c index 90da6bcbb9..dfb9d7a742 100644 --- a/hw/hppa/dino.c +++ b/hw/hppa/dino.c @@ -20,6 +20,7 @@ #include "sysemu/sysemu.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bus.h" +#include "migration/vmstate.h" #include "hppa_sys.h" #include "exec/address-spaces.h" diff --git a/hw/i2c/aspeed_i2c.c b/hw/i2c/aspeed_i2c.c index bb7ef3cbf3..a956eb3849 100644 --- a/hw/i2c/aspeed_i2c.c +++ b/hw/i2c/aspeed_i2c.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" #include "hw/i2c/aspeed_i2c.h" diff --git a/hw/i2c/core.c b/hw/i2c/core.c index 20f36f1d55..25b792fdd0 100644 --- a/hw/i2c/core.c +++ b/hw/i2c/core.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "hw/i2c/i2c.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "trace.h" diff --git a/hw/i2c/exynos4210_i2c.c b/hw/i2c/exynos4210_i2c.c index 07d83d5a63..a600f65560 100644 --- a/hw/i2c/exynos4210_i2c.c +++ b/hw/i2c/exynos4210_i2c.c @@ -24,6 +24,7 @@ #include "qemu/module.h" #include "qemu/timer.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/i2c/i2c.h" #include "hw/irq.h" diff --git a/hw/i2c/imx_i2c.c b/hw/i2c/imx_i2c.c index 1d6b695615..30b9aea247 100644 --- a/hw/i2c/imx_i2c.c +++ b/hw/i2c/imx_i2c.c @@ -21,6 +21,7 @@ #include "qemu/osdep.h" #include "hw/i2c/imx_i2c.h" #include "hw/irq.h" +#include "migration/vmstate.h" #include "hw/i2c/i2c.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/i2c/microbit_i2c.c b/hw/i2c/microbit_i2c.c index 214be07c5a..4661f05253 100644 --- a/hw/i2c/microbit_i2c.c +++ b/hw/i2c/microbit_i2c.c @@ -21,6 +21,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/i2c/microbit_i2c.h" +#include "migration/vmstate.h" static const uint32_t twi_read_sequence[] = {0x5A, 0x5A, 0x40}; diff --git a/hw/i2c/mpc_i2c.c b/hw/i2c/mpc_i2c.c index 0aa4cacb65..0aa1be3ce7 100644 --- a/hw/i2c/mpc_i2c.c +++ b/hw/i2c/mpc_i2c.c @@ -23,6 +23,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" /* #define DEBUG_I2C */ diff --git a/hw/i2c/pm_smbus.c b/hw/i2c/pm_smbus.c index e48544f909..d9e3bad90d 100644 --- a/hw/i2c/pm_smbus.c +++ b/hw/i2c/pm_smbus.c @@ -17,11 +17,13 @@ * License along with this library; if not, see * . */ + #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/boards.h" #include "hw/i2c/pm_smbus.h" #include "hw/i2c/smbus_master.h" +#include "migration/vmstate.h" #define SMBHSTSTS 0x00 #define SMBHSTCNT 0x02 diff --git a/hw/i2c/smbus_eeprom.c b/hw/i2c/smbus_eeprom.c index 37167e7244..e05bc8c39c 100644 --- a/hw/i2c/smbus_eeprom.c +++ b/hw/i2c/smbus_eeprom.c @@ -29,6 +29,7 @@ #include "hw/boards.h" #include "hw/i2c/i2c.h" #include "hw/i2c/smbus_slave.h" +#include "migration/vmstate.h" #include "hw/i2c/smbus_eeprom.h" //#define DEBUG diff --git a/hw/i2c/smbus_ich9.c b/hw/i2c/smbus_ich9.c index 51a03046a6..f7e626e95a 100644 --- a/hw/i2c/smbus_ich9.c +++ b/hw/i2c/smbus_ich9.c @@ -24,6 +24,7 @@ #include "hw/hw.h" #include "hw/i2c/pm_smbus.h" #include "hw/pci/pci.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "sysemu/sysemu.h" diff --git a/hw/i2c/smbus_slave.c b/hw/i2c/smbus_slave.c index a9908c1a9b..7b145a384d 100644 --- a/hw/i2c/smbus_slave.c +++ b/hw/i2c/smbus_slave.c @@ -17,6 +17,7 @@ #include "hw/hw.h" #include "hw/i2c/i2c.h" #include "hw/i2c/smbus_slave.h" +#include "migration/vmstate.h" #include "qemu/module.h" //#define DEBUG_SMBUS 1 diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 53a41ace46..cefdb54604 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -46,6 +46,7 @@ #include "hw/boards.h" #include "sysemu/tpm_backend.h" #include "hw/timer/mc146818rtc_regs.h" +#include "migration/vmstate.h" #include "hw/mem/memory-device.h" #include "sysemu/numa.h" #include "sysemu/reset.h" diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c index 4a4e2c7fd4..08884523e2 100644 --- a/hw/i386/amd_iommu.c +++ b/hw/i386/amd_iommu.c @@ -19,10 +19,12 @@ * * Cache implementation inspired by hw/i386/intel_iommu.c */ + #include "qemu/osdep.h" #include "hw/i386/pc.h" #include "hw/pci/msi.h" #include "hw/pci/pci_bus.h" +#include "migration/vmstate.h" #include "amd_iommu.h" #include "qapi/error.h" #include "qemu/error-report.h" diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index de86f53b4e..000de6b9ce 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -35,6 +35,7 @@ #include "sysemu/kvm.h" #include "hw/i386/apic_internal.h" #include "kvm_i386.h" +#include "migration/vmstate.h" #include "trace.h" /* context entry operations */ diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c index a5cda15b85..d98cf9d5d1 100644 --- a/hw/i386/kvm/clock.c +++ b/hw/i386/kvm/clock.c @@ -21,6 +21,7 @@ #include "sysemu/kvm.h" #include "sysemu/hw_accel.h" #include "kvm_i386.h" +#include "migration/vmstate.h" #include "hw/sysbus.h" #include "hw/kvm/clock.h" #include "qapi/error.h" diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c index 9c2ab4aac5..44e40478c8 100644 --- a/hw/i386/kvmvapic.c +++ b/hw/i386/kvmvapic.c @@ -19,6 +19,7 @@ #include "hw/i386/apic_internal.h" #include "hw/sysbus.h" #include "hw/boards.h" +#include "migration/vmstate.h" #include "tcg/tcg.h" #define VAPIC_IO_PORT 0x7e diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 1453696975..1e8251d327 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -41,6 +41,7 @@ #include "hw/firmware/smbios.h" #include "hw/loader.h" #include "elf.h" +#include "migration/vmstate.h" #include "multiboot.h" #include "hw/timer/mc146818rtc.h" #include "hw/dma/i8257.h" diff --git a/hw/i386/vmmouse.c b/hw/i386/vmmouse.c index 5d2d278be4..a50f5d5dd4 100644 --- a/hw/i386/vmmouse.c +++ b/hw/i386/vmmouse.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 "hw/hw.h" #include "ui/console.h" #include "hw/i386/pc.h" #include "hw/input/i8042.h" #include "hw/qdev.h" +#include "migration/vmstate.h" /* debug only vmmouse */ //#define DEBUG_VMMOUSE diff --git a/hw/i386/xen/xen_platform.c b/hw/i386/xen/xen_platform.c index 7a972e46cf..800687a188 100644 --- a/hw/i386/xen/xen_platform.c +++ b/hw/i386/xen/xen_platform.c @@ -30,6 +30,7 @@ #include "hw/pci/pci.h" #include "hw/irq.h" #include "hw/xen/xen_common.h" +#include "migration/vmstate.h" #include "hw/xen/xen-legacy-backend.h" #include "trace.h" #include "exec/address-spaces.h" diff --git a/hw/i386/xen/xen_pvdevice.c b/hw/i386/xen/xen_pvdevice.c index 23748f36a2..700db81cbc 100644 --- a/hw/i386/xen/xen_pvdevice.c +++ b/hw/i386/xen/xen_pvdevice.c @@ -34,6 +34,7 @@ #include "qemu/module.h" #include "hw/hw.h" #include "hw/pci/pci.h" +#include "migration/vmstate.h" #include "trace.h" #define TYPE_XEN_PV_DEVICE "xen-pvdevice" diff --git a/hw/ide/ahci-allwinner.c b/hw/ide/ahci-allwinner.c index de08d87790..8777122c9c 100644 --- a/hw/ide/ahci-allwinner.c +++ b/hw/ide/ahci-allwinner.c @@ -21,6 +21,7 @@ #include "qemu/module.h" #include "sysemu/dma.h" #include "hw/ide/internal.h" +#include "migration/vmstate.h" #include "ahci_internal.h" #include "trace.h" diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 00ba422a48..e0b1a91fd9 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -25,6 +25,7 @@ #include "hw/hw.h" #include "hw/pci/msi.h" #include "hw/pci/pci.h" +#include "migration/vmstate.h" #include "qemu/error-report.h" #include "qemu/log.h" diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index e5542c9811..a3763a1d3a 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -26,6 +26,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/pci/pci.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "hw/isa/isa.h" #include "sysemu/sysemu.h" diff --git a/hw/ide/core.c b/hw/ide/core.c index 6afadf894f..0453a925f9 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -26,6 +26,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/isa/isa.h" +#include "migration/vmstate.h" #include "qemu/error-report.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" diff --git a/hw/ide/ich.c b/hw/ide/ich.c index c1ba927574..00fb43a127 100644 --- a/hw/ide/ich.c +++ b/hw/ide/ich.c @@ -64,6 +64,7 @@ #include "hw/hw.h" #include "hw/pci/msi.h" #include "hw/pci/pci.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "hw/isa/isa.h" #include "sysemu/dma.h" diff --git a/hw/ide/isa.c b/hw/ide/isa.c index 4b5784e3fd..fda912f3ed 100644 --- a/hw/ide/isa.c +++ b/hw/ide/isa.c @@ -26,6 +26,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/isa/isa.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "sysemu/dma.h" diff --git a/hw/ide/macio.c b/hw/ide/macio.c index 54571fed12..aa447cd2b5 100644 --- a/hw/ide/macio.c +++ b/hw/ide/macio.c @@ -27,6 +27,7 @@ #include "hw/hw.h" #include "hw/ppc/mac.h" #include "hw/ppc/mac_dbdma.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "hw/misc/macio/macio.h" #include "sysemu/block-backend.h" diff --git a/hw/ide/microdrive.c b/hw/ide/microdrive.c index 92ee6e0af8..be3cf8779a 100644 --- a/hw/ide/microdrive.c +++ b/hw/ide/microdrive.c @@ -26,6 +26,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/pcmcia.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "sysemu/dma.h" diff --git a/hw/ide/mmio.c b/hw/ide/mmio.c index 70a58016d0..f3de6db33e 100644 --- a/hw/ide/mmio.c +++ b/hw/ide/mmio.c @@ -26,6 +26,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "sysemu/dma.h" diff --git a/hw/ide/pci.c b/hw/ide/pci.c index 4c6fb9a68e..c5b081a028 100644 --- a/hw/ide/pci.c +++ b/hw/ide/pci.c @@ -26,6 +26,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/pci/pci.h" +#include "migration/vmstate.h" #include "sysemu/dma.h" #include "qemu/error-report.h" #include "qemu/module.h" diff --git a/hw/ide/piix.c b/hw/ide/piix.c index c4c6d4b760..407d3e3ce8 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -26,6 +26,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/pci/pci.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "sysemu/block-backend.h" #include "sysemu/sysemu.h" diff --git a/hw/ide/via.c b/hw/ide/via.c index 6d54ac55f0..8fa1972d92 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -27,6 +27,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/pci/pci.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "sysemu/sysemu.h" #include "sysemu/dma.h" diff --git a/hw/input/adb-kbd.c b/hw/input/adb-kbd.c index da361f56df..b3c4aeded1 100644 --- a/hw/input/adb-kbd.c +++ b/hw/input/adb-kbd.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "hw/input/adb.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "ui/input.h" #include "hw/input/adb-keys.h" diff --git a/hw/input/adb-mouse.c b/hw/input/adb-mouse.c index 52526fddb7..aeba41bddd 100644 --- a/hw/input/adb-mouse.c +++ b/hw/input/adb-mouse.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "ui/console.h" #include "hw/input/adb.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "adb-internal.h" #include "trace.h" diff --git a/hw/input/adb.c b/hw/input/adb.c index 1446f32521..80ba1259bf 100644 --- a/hw/input/adb.c +++ b/hw/input/adb.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "hw/input/adb.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "adb-internal.h" diff --git a/hw/input/hid.c b/hw/input/hid.c index aa4fb826fd..c570ca25b1 100644 --- a/hw/input/hid.c +++ b/hw/input/hid.c @@ -22,11 +22,13 @@ * 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 "ui/console.h" #include "qemu/timer.h" #include "hw/input/hid.h" +#include "migration/vmstate.h" #include "trace.h" #define HID_USAGE_ERROR_ROLLOVER 0x01 diff --git a/hw/input/lm832x.c b/hw/input/lm832x.c index 2ab6d3290b..de03913d7c 100644 --- a/hw/input/lm832x.c +++ b/hw/input/lm832x.c @@ -22,6 +22,7 @@ #include "hw/hw.h" #include "hw/i2c/i2c.h" #include "hw/irq.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "qemu/timer.h" #include "sysemu/reset.h" diff --git a/hw/input/milkymist-softusb.c b/hw/input/milkymist-softusb.c index 92e07fbd8c..e17666d56b 100644 --- a/hw/input/milkymist-softusb.c +++ b/hw/input/milkymist-softusb.c @@ -25,6 +25,7 @@ #include "qapi/error.h" #include "hw/hw.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "trace.h" #include "ui/console.h" #include "hw/input/hid.h" diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c index 7e76ee7ad3..cf1690332d 100644 --- a/hw/input/pckbd.c +++ b/hw/input/pckbd.c @@ -26,6 +26,7 @@ #include "qemu/log.h" #include "hw/hw.h" #include "hw/isa/isa.h" +#include "migration/vmstate.h" #include "hw/i386/pc.h" #include "hw/input/ps2.h" #include "hw/irq.h" diff --git a/hw/input/pl050.c b/hw/input/pl050.c index 2318dbfeac..1123037b38 100644 --- a/hw/input/pl050.c +++ b/hw/input/pl050.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/input/ps2.h" #include "hw/irq.h" #include "qemu/log.h" diff --git a/hw/input/ps2.c b/hw/input/ps2.c index 8d922b05c9..07d07ee6bd 100644 --- a/hw/input/ps2.c +++ b/hw/input/ps2.c @@ -26,6 +26,7 @@ #include "qemu/log.h" #include "hw/hw.h" #include "hw/input/ps2.h" +#include "migration/vmstate.h" #include "ui/console.h" #include "ui/input.h" #include "sysemu/reset.h" diff --git a/hw/input/pxa2xx_keypad.c b/hw/input/pxa2xx_keypad.c index 4788c96d19..31862a7d16 100644 --- a/hw/input/pxa2xx_keypad.c +++ b/hw/input/pxa2xx_keypad.c @@ -14,6 +14,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/irq.h" +#include "migration/vmstate.h" #include "hw/arm/pxa.h" #include "ui/console.h" diff --git a/hw/input/stellaris_input.c b/hw/input/stellaris_input.c index 55d6132bf5..766365683a 100644 --- a/hw/input/stellaris_input.c +++ b/hw/input/stellaris_input.c @@ -11,6 +11,7 @@ #include "hw/hw.h" #include "hw/input/gamepad.h" #include "hw/irq.h" +#include "migration/vmstate.h" #include "ui/console.h" typedef struct { diff --git a/hw/input/tsc2005.c b/hw/input/tsc2005.c index e21356c18d..b92a034496 100644 --- a/hw/input/tsc2005.c +++ b/hw/input/tsc2005.c @@ -26,6 +26,7 @@ #include "ui/console.h" #include "hw/input/tsc2xxx.h" #include "hw/irq.h" +#include "migration/vmstate.h" #include "trace.h" #define TSC_CUT_RESOLUTION(value, p) ((value) >> (16 - (p ? 12 : 10))) diff --git a/hw/input/tsc210x.c b/hw/input/tsc210x.c index be7d948168..182d3725fc 100644 --- a/hw/input/tsc210x.c +++ b/hw/input/tsc210x.c @@ -28,6 +28,7 @@ #include "hw/arm/omap.h" /* For I2SCodec */ #include "hw/input/tsc2xxx.h" #include "hw/irq.h" +#include "migration/vmstate.h" #define TSC_DATA_REGISTERS_PAGE 0x0 #define TSC_CONTROL_REGISTERS_PAGE 0x1 diff --git a/hw/intc/allwinner-a10-pic.c b/hw/intc/allwinner-a10-pic.c index 9df3e18539..79959a4d23 100644 --- a/hw/intc/allwinner-a10-pic.c +++ b/hw/intc/allwinner-a10-pic.c @@ -17,6 +17,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "sysemu/sysemu.h" #include "hw/intc/allwinner-a10-pic.h" #include "hw/irq.h" diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c index 7045761281..fbb6e25cf4 100644 --- a/hw/intc/apic_common.c +++ b/hw/intc/apic_common.c @@ -32,6 +32,7 @@ #include "hw/qdev.h" #include "hw/sysbus.h" #include "migration/qemu-file-types.h" +#include "migration/vmstate.h" static int apic_irq_delivered; bool apic_report_tpr_access; diff --git a/hw/intc/arm_gic_common.c b/hw/intc/arm_gic_common.c index ccc50d00b6..5d506bebb5 100644 --- a/hw/intc/arm_gic_common.c +++ b/hw/intc/arm_gic_common.c @@ -23,6 +23,7 @@ #include "qemu/module.h" #include "gic_internal.h" #include "hw/arm/linux-boot-if.h" +#include "migration/vmstate.h" static int gic_pre_save(void *opaque) { diff --git a/hw/intc/arm_gicv3_common.c b/hw/intc/arm_gicv3_common.c index 5edabb928f..12479f94a8 100644 --- a/hw/intc/arm_gicv3_common.c +++ b/hw/intc/arm_gicv3_common.c @@ -26,6 +26,7 @@ #include "qemu/module.h" #include "qom/cpu.h" #include "hw/intc/arm_gicv3_common.h" +#include "migration/vmstate.h" #include "gicv3_internal.h" #include "hw/arm/linux-boot-if.h" #include "sysemu/kvm.h" diff --git a/hw/intc/arm_gicv3_its_common.c b/hw/intc/arm_gicv3_its_common.c index efb3d51fb5..66c4c6a188 100644 --- a/hw/intc/arm_gicv3_its_common.c +++ b/hw/intc/arm_gicv3_its_common.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "hw/pci/msi.h" +#include "migration/vmstate.h" #include "hw/intc/arm_gicv3_its_common.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c index 69670a2d97..0c7fc7078b 100644 --- a/hw/intc/armv7m_nvic.c +++ b/hw/intc/armv7m_nvic.c @@ -14,6 +14,7 @@ #include "qapi/error.h" #include "cpu.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "qemu/timer.h" #include "hw/intc/armv7m_nvic.h" #include "hw/irq.h" diff --git a/hw/intc/aspeed_vic.c b/hw/intc/aspeed_vic.c index e17343cd73..5ba06c5262 100644 --- a/hw/intc/aspeed_vic.c +++ b/hw/intc/aspeed_vic.c @@ -30,6 +30,7 @@ #include "qemu/osdep.h" #include "hw/intc/aspeed_vic.h" #include "hw/irq.h" +#include "migration/vmstate.h" #include "qemu/bitops.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/intc/bcm2835_ic.c b/hw/intc/bcm2835_ic.c index 20db52bd8e..05bd28e4f9 100644 --- a/hw/intc/bcm2835_ic.c +++ b/hw/intc/bcm2835_ic.c @@ -15,6 +15,7 @@ #include "qemu/osdep.h" #include "hw/intc/bcm2835_ic.h" #include "hw/irq.h" +#include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/intc/bcm2836_control.c b/hw/intc/bcm2836_control.c index a983fe565f..04229b8a17 100644 --- a/hw/intc/bcm2836_control.c +++ b/hw/intc/bcm2836_control.c @@ -18,6 +18,7 @@ #include "qemu/osdep.h" #include "hw/intc/bcm2836_control.h" #include "hw/irq.h" +#include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/intc/exynos4210_combiner.c b/hw/intc/exynos4210_combiner.c index ed558115f6..3b49ce4d27 100644 --- a/hw/intc/exynos4210_combiner.c +++ b/hw/intc/exynos4210_combiner.c @@ -29,6 +29,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "hw/arm/exynos4210.h" diff --git a/hw/intc/exynos4210_gic.c b/hw/intc/exynos4210_gic.c index e37d457fcf..7fa4583b0f 100644 --- a/hw/intc/exynos4210_gic.c +++ b/hw/intc/exynos4210_gic.c @@ -22,6 +22,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "hw/irq.h" #include "hw/arm/exynos4210.h" diff --git a/hw/intc/heathrow_pic.c b/hw/intc/heathrow_pic.c index ac1f7c0c8f..572e9115aa 100644 --- a/hw/intc/heathrow_pic.c +++ b/hw/intc/heathrow_pic.c @@ -26,6 +26,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/ppc/mac.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "hw/intc/heathrow_pic.h" #include "hw/irq.h" diff --git a/hw/intc/i8259_common.c b/hw/intc/i8259_common.c index c75c880157..c7ff2b3274 100644 --- a/hw/intc/i8259_common.c +++ b/hw/intc/i8259_common.c @@ -22,9 +22,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "hw/i386/pc.h" #include "hw/isa/i8259_internal.h" +#include "migration/vmstate.h" #include "monitor/monitor.h" static int irq_level[16]; diff --git a/hw/intc/imx_avic.c b/hw/intc/imx_avic.c index 022ed05b6f..63fc602a1a 100644 --- a/hw/intc/imx_avic.c +++ b/hw/intc/imx_avic.c @@ -18,6 +18,7 @@ #include "qemu/osdep.h" #include "hw/intc/imx_avic.h" #include "hw/irq.h" +#include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/intc/imx_gpcv2.c b/hw/intc/imx_gpcv2.c index a83333bdea..17007a4078 100644 --- a/hw/intc/imx_gpcv2.c +++ b/hw/intc/imx_gpcv2.c @@ -11,6 +11,7 @@ #include "qemu/osdep.h" #include "hw/intc/imx_gpcv2.h" +#include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/intc/ioapic_common.c b/hw/intc/ioapic_common.c index fa50382d43..5538b5b86e 100644 --- a/hw/intc/ioapic_common.c +++ b/hw/intc/ioapic_common.c @@ -22,6 +22,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/module.h" +#include "migration/vmstate.h" #include "monitor/monitor.h" #include "hw/i386/ioapic.h" #include "hw/i386/ioapic_internal.h" diff --git a/hw/intc/lm32_pic.c b/hw/intc/lm32_pic.c index c133d30cf2..4df4eef7df 100644 --- a/hw/intc/lm32_pic.c +++ b/hw/intc/lm32_pic.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" +#include "migration/vmstate.h" #include "monitor/monitor.h" #include "qemu/module.h" #include "hw/sysbus.h" diff --git a/hw/intc/ompic.c b/hw/intc/ompic.c index 31004ac613..77591f827d 100644 --- a/hw/intc/ompic.c +++ b/hw/intc/ompic.c @@ -13,6 +13,7 @@ #include "hw/hw.h" #include "hw/irq.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "exec/memory.h" #define TYPE_OR1K_OMPIC "or1k-ompic" diff --git a/hw/intc/openpic.c b/hw/intc/openpic.c index 49d64bccfe..bb869ca221 100644 --- a/hw/intc/openpic.c +++ b/hw/intc/openpic.c @@ -42,6 +42,7 @@ #include "hw/ppc/openpic.h" #include "hw/ppc/ppc_e500.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/pci/msi.h" #include "qapi/error.h" #include "qemu/bitops.h" diff --git a/hw/intc/pl190.c b/hw/intc/pl190.c index 1a5e760f0f..e3bd3dd121 100644 --- a/hw/intc/pl190.c +++ b/hw/intc/pl190.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/intc/slavio_intctl.c b/hw/intc/slavio_intctl.c index e97afcadf6..c4cf9096eb 100644 --- a/hw/intc/slavio_intctl.c +++ b/hw/intc/slavio_intctl.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "migration/vmstate.h" #include "monitor/monitor.h" #include "qemu/module.h" #include "hw/sysbus.h" diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c index 2e39cc1e47..2fdd68035a 100644 --- a/hw/intc/spapr_xive.c +++ b/hw/intc/spapr_xive.c @@ -15,6 +15,7 @@ #include "target/ppc/cpu.h" #include "sysemu/cpus.h" #include "sysemu/reset.h" +#include "migration/vmstate.h" #include "monitor/monitor.h" #include "hw/ppc/fdt.h" #include "hw/ppc/spapr.h" diff --git a/hw/intc/xics.c b/hw/intc/xics.c index beb37b1a2b..41da9b3091 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -35,6 +35,7 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "qapi/visitor.h" +#include "migration/vmstate.h" #include "monitor/monitor.h" #include "hw/intc/intc.h" #include "hw/irq.h" diff --git a/hw/intc/xive.c b/hw/intc/xive.c index d977ed568f..b925ea9530 100644 --- a/hw/intc/xive.c +++ b/hw/intc/xive.c @@ -16,6 +16,7 @@ #include "sysemu/dma.h" #include "sysemu/reset.h" #include "hw/qdev-properties.h" +#include "migration/vmstate.h" #include "monitor/monitor.h" #include "hw/irq.h" #include "hw/ppc/xive.h" diff --git a/hw/intc/xlnx-pmu-iomod-intc.c b/hw/intc/xlnx-pmu-iomod-intc.c index 9fcd17c6fd..f2ba9b4ada 100644 --- a/hw/intc/xlnx-pmu-iomod-intc.c +++ b/hw/intc/xlnx-pmu-iomod-intc.c @@ -26,6 +26,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/register.h" #include "qemu/bitops.h" #include "qemu/log.h" diff --git a/hw/intc/xlnx-zynqmp-ipi.c b/hw/intc/xlnx-zynqmp-ipi.c index 43a1b789b5..adc1179014 100644 --- a/hw/intc/xlnx-zynqmp-ipi.c +++ b/hw/intc/xlnx-zynqmp-ipi.c @@ -27,6 +27,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/register.h" #include "qemu/bitops.h" #include "qemu/log.h" diff --git a/hw/ipack/ipack.c b/hw/ipack/ipack.c index b8ff979d72..9a520806d7 100644 --- a/hw/ipack/ipack.c +++ b/hw/ipack/ipack.c @@ -13,6 +13,7 @@ #include "qemu/module.h" #include "hw/ipack/ipack.h" #include "hw/irq.h" +#include "migration/vmstate.h" IPackDevice *ipack_device_find(IPackBus *bus, int32_t slot) { diff --git a/hw/ipack/tpci200.c b/hw/ipack/tpci200.c index 7ee9d01771..f931d4df62 100644 --- a/hw/ipack/tpci200.c +++ b/hw/ipack/tpci200.c @@ -13,6 +13,7 @@ #include "hw/ipack/ipack.h" #include "hw/irq.h" #include "hw/pci/pci.h" +#include "migration/vmstate.h" #include "qemu/bitops.h" #include "qemu/module.h" diff --git a/hw/ipmi/ipmi_bmc_extern.c b/hw/ipmi/ipmi_bmc_extern.c index c0a8dac346..eb2eba891c 100644 --- a/hw/ipmi/ipmi_bmc_extern.c +++ b/hw/ipmi/ipmi_bmc_extern.c @@ -35,6 +35,7 @@ #include "chardev/char-fe.h" #include "sysemu/sysemu.h" #include "hw/ipmi/ipmi.h" +#include "migration/vmstate.h" #define VM_MSG_CHAR 0xA0 /* Marks end of message */ #define VM_CMD_CHAR 0xA1 /* Marks end of a command */ diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c index 1980536517..91e1484103 100644 --- a/hw/ipmi/ipmi_bmc_sim.c +++ b/hw/ipmi/ipmi_bmc_sim.c @@ -29,6 +29,7 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "hw/loader.h" +#include "migration/vmstate.h" #define IPMI_NETFN_CHASSIS 0x00 diff --git a/hw/ipmi/isa_ipmi_bt.c b/hw/ipmi/isa_ipmi_bt.c index af07278c19..588dfbac34 100644 --- a/hw/ipmi/isa_ipmi_bt.c +++ b/hw/ipmi/isa_ipmi_bt.c @@ -30,6 +30,7 @@ #include "hw/ipmi/ipmi.h" #include "hw/irq.h" #include "hw/isa/isa.h" +#include "migration/vmstate.h" /* Control register */ #define IPMI_BT_CLR_WR_BIT 0 diff --git a/hw/ipmi/isa_ipmi_kcs.c b/hw/ipmi/isa_ipmi_kcs.c index 583497685a..e63753f03e 100644 --- a/hw/ipmi/isa_ipmi_kcs.c +++ b/hw/ipmi/isa_ipmi_kcs.c @@ -30,6 +30,7 @@ #include "hw/ipmi/ipmi.h" #include "hw/irq.h" #include "hw/isa/isa.h" +#include "migration/vmstate.h" #define IPMI_KCS_OBF_BIT 0 #define IPMI_KCS_IBF_BIT 1 diff --git a/hw/isa/apm.c b/hw/isa/apm.c index c3101ef52f..f22b2d78a4 100644 --- a/hw/isa/apm.c +++ b/hw/isa/apm.c @@ -24,6 +24,7 @@ #include "hw/isa/apm.h" #include "hw/hw.h" #include "hw/pci/pci.h" +#include "migration/vmstate.h" //#define DEBUG diff --git a/hw/isa/i82378.c b/hw/isa/i82378.c index 90ebba59b7..de276cdf10 100644 --- a/hw/isa/i82378.c +++ b/hw/isa/i82378.c @@ -22,6 +22,7 @@ #include "hw/i386/pc.h" #include "hw/irq.h" #include "hw/timer/i8254.h" +#include "migration/vmstate.h" #include "hw/audio/pcspk.h" #define TYPE_I82378 "i82378" diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c index 42a1232787..79d44c1b41 100644 --- a/hw/isa/lpc_ich9.c +++ b/hw/isa/lpc_ich9.c @@ -35,6 +35,7 @@ #include "qemu/range.h" #include "hw/isa/isa.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/i386/pc.h" #include "hw/irq.h" #include "hw/isa/apm.h" diff --git a/hw/isa/pc87312.c b/hw/isa/pc87312.c index 85dbc94439..60845f3ff0 100644 --- a/hw/isa/pc87312.c +++ b/hw/isa/pc87312.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/isa/pc87312.h" +#include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/module.h" diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c index 3677976ef7..8abd5daaae 100644 --- a/hw/isa/piix4.c +++ b/hw/isa/piix4.c @@ -28,6 +28,7 @@ #include "hw/pci/pci.h" #include "hw/isa/isa.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "sysemu/reset.h" PCIDevice *piix4_dev; diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 81bffb1fb9..d98b94ab05 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -18,6 +18,7 @@ #include "hw/isa/isa.h" #include "hw/isa/superio.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/mips/mips.h" #include "hw/isa/apm.h" #include "hw/acpi/acpi.h" diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index b1239fd0d3..178f4a0df3 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "hw/mem/pc-dimm.h" +#include "migration/vmstate.h" #include "hw/mem/nvdimm.h" #include "hw/mem/memory-device.h" #include "qapi/error.h" diff --git a/hw/mips/gt64xxx_pci.c b/hw/mips/gt64xxx_pci.c index 15d4adb3cd..b4412c6c24 100644 --- a/hw/mips/gt64xxx_pci.c +++ b/hw/mips/gt64xxx_pci.c @@ -29,6 +29,7 @@ #include "hw/mips/mips.h" #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" +#include "migration/vmstate.h" #include "hw/i386/pc.h" #include "hw/irq.h" #include "exec/address-spaces.h" diff --git a/hw/misc/a9scu.c b/hw/misc/a9scu.c index 4307f0082b..62bc60b2ae 100644 --- a/hw/misc/a9scu.c +++ b/hw/misc/a9scu.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #include "hw/misc/a9scu.h" +#include "migration/vmstate.h" #include "qemu/module.h" static uint64_t a9_scu_read(void *opaque, hwaddr offset, diff --git a/hw/misc/arm_l2x0.c b/hw/misc/arm_l2x0.c index b88f40ae7e..454a942ce0 100644 --- a/hw/misc/arm_l2x0.c +++ b/hw/misc/arm_l2x0.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/arm_sysctl.c b/hw/misc/arm_sysctl.c index be8c9c0a7f..47051436f4 100644 --- a/hw/misc/arm_sysctl.c +++ b/hw/misc/arm_sysctl.c @@ -13,6 +13,7 @@ #include "qemu/timer.h" #include "qemu/bitops.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/arm/primecell.h" #include "sysemu/sysemu.h" #include "qemu/log.h" diff --git a/hw/misc/armsse-mhu.c b/hw/misc/armsse-mhu.c index f8d4187bb8..34b6205f11 100644 --- a/hw/misc/armsse-mhu.c +++ b/hw/misc/armsse-mhu.c @@ -22,6 +22,7 @@ #include "qapi/error.h" #include "sysemu/sysemu.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/registerfields.h" #include "hw/irq.h" #include "hw/misc/armsse-mhu.h" diff --git a/hw/misc/aspeed_scu.c b/hw/misc/aspeed_scu.c index 71a0d4b7be..268cb24e56 100644 --- a/hw/misc/aspeed_scu.c +++ b/hw/misc/aspeed_scu.c @@ -12,6 +12,7 @@ #include "qemu/osdep.h" #include "hw/misc/aspeed_scu.h" #include "hw/qdev-properties.h" +#include "migration/vmstate.h" #include "qapi/error.h" #include "qapi/visitor.h" #include "qemu/bitops.h" diff --git a/hw/misc/aspeed_sdmc.c b/hw/misc/aspeed_sdmc.c index b84676d36d..cb13c63ec8 100644 --- a/hw/misc/aspeed_sdmc.c +++ b/hw/misc/aspeed_sdmc.c @@ -14,6 +14,7 @@ #include "hw/misc/aspeed_sdmc.h" #include "hw/misc/aspeed_scu.h" #include "hw/qdev-properties.h" +#include "migration/vmstate.h" #include "qapi/error.h" #include "trace.h" diff --git a/hw/misc/aspeed_xdma.c b/hw/misc/aspeed_xdma.c index 18a83bcc6c..dca5585a75 100644 --- a/hw/misc/aspeed_xdma.c +++ b/hw/misc/aspeed_xdma.c @@ -11,6 +11,7 @@ #include "qemu/error-report.h" #include "hw/irq.h" #include "hw/misc/aspeed_xdma.h" +#include "migration/vmstate.h" #include "qapi/error.h" #include "trace.h" diff --git a/hw/misc/bcm2835_mbox.c b/hw/misc/bcm2835_mbox.c index e484d25c29..79bad11631 100644 --- a/hw/misc/bcm2835_mbox.c +++ b/hw/misc/bcm2835_mbox.c @@ -12,6 +12,7 @@ #include "qapi/error.h" #include "hw/irq.h" #include "hw/misc/bcm2835_mbox.h" +#include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/bcm2835_property.c b/hw/misc/bcm2835_property.c index 51cd93fc8b..0d078f15f9 100644 --- a/hw/misc/bcm2835_property.c +++ b/hw/misc/bcm2835_property.c @@ -6,6 +6,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/misc/bcm2835_property.h" +#include "migration/vmstate.h" #include "hw/irq.h" #include "hw/misc/bcm2835_mbox_defs.h" #include "sysemu/dma.h" diff --git a/hw/misc/bcm2835_rng.c b/hw/misc/bcm2835_rng.c index e882c87568..d0c4e64e88 100644 --- a/hw/misc/bcm2835_rng.c +++ b/hw/misc/bcm2835_rng.c @@ -12,6 +12,7 @@ #include "qemu/guest-random.h" #include "qemu/module.h" #include "hw/misc/bcm2835_rng.h" +#include "migration/vmstate.h" static uint32_t get_random_bytes(void) { diff --git a/hw/misc/eccmemctl.c b/hw/misc/eccmemctl.c index c16d56c8c7..3300a46bb3 100644 --- a/hw/misc/eccmemctl.c +++ b/hw/misc/eccmemctl.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "trace.h" diff --git a/hw/misc/exynos4210_clk.c b/hw/misc/exynos4210_clk.c index 821d9eab3f..bc1463ff89 100644 --- a/hw/misc/exynos4210_clk.c +++ b/hw/misc/exynos4210_clk.c @@ -19,6 +19,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/exynos4210_pmu.c b/hw/misc/exynos4210_pmu.c index 8712774768..4817165121 100644 --- a/hw/misc/exynos4210_pmu.c +++ b/hw/misc/exynos4210_pmu.c @@ -26,6 +26,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "sysemu/sysemu.h" diff --git a/hw/misc/exynos4210_rng.c b/hw/misc/exynos4210_rng.c index b88fe3a26d..38cd61c7ea 100644 --- a/hw/misc/exynos4210_rng.c +++ b/hw/misc/exynos4210_rng.c @@ -19,6 +19,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/log.h" #include "qemu/guest-random.h" diff --git a/hw/misc/imx25_ccm.c b/hw/misc/imx25_ccm.c index 693ea81040..d3107e5ca2 100644 --- a/hw/misc/imx25_ccm.c +++ b/hw/misc/imx25_ccm.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "hw/misc/imx25_ccm.h" +#include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/imx31_ccm.c b/hw/misc/imx31_ccm.c index 38a19aa0d0..6e246827ab 100644 --- a/hw/misc/imx31_ccm.c +++ b/hw/misc/imx31_ccm.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "hw/misc/imx31_ccm.h" +#include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/imx6_ccm.c b/hw/misc/imx6_ccm.c index 9478007f41..7fec8f0a47 100644 --- a/hw/misc/imx6_ccm.c +++ b/hw/misc/imx6_ccm.c @@ -12,6 +12,7 @@ #include "qemu/osdep.h" #include "hw/misc/imx6_ccm.h" +#include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/imx6_src.c b/hw/misc/imx6_src.c index 878ffcdc71..0be683de06 100644 --- a/hw/misc/imx6_src.c +++ b/hw/misc/imx6_src.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #include "hw/misc/imx6_src.h" +#include "migration/vmstate.h" #include "sysemu/sysemu.h" #include "qemu/bitops.h" #include "qemu/log.h" diff --git a/hw/misc/imx6ul_ccm.c b/hw/misc/imx6ul_ccm.c index 37b472d125..a2fc1d0364 100644 --- a/hw/misc/imx6ul_ccm.c +++ b/hw/misc/imx6ul_ccm.c @@ -12,6 +12,7 @@ #include "qemu/osdep.h" #include "hw/registerfields.h" +#include "migration/vmstate.h" #include "hw/misc/imx6ul_ccm.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/imx7_ccm.c b/hw/misc/imx7_ccm.c index d9bdcf1027..02fc1ae8d0 100644 --- a/hw/misc/imx7_ccm.c +++ b/hw/misc/imx7_ccm.c @@ -14,6 +14,7 @@ #include "qemu/module.h" #include "hw/misc/imx7_ccm.h" +#include "migration/vmstate.h" static void imx7_analog_reset(DeviceState *dev) { diff --git a/hw/misc/iotkit-secctl.c b/hw/misc/iotkit-secctl.c index 963fd6efd3..609869821a 100644 --- a/hw/misc/iotkit-secctl.c +++ b/hw/misc/iotkit-secctl.c @@ -15,6 +15,7 @@ #include "qapi/error.h" #include "trace.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/registerfields.h" #include "hw/irq.h" #include "hw/misc/iotkit-secctl.h" diff --git a/hw/misc/iotkit-sysctl.c b/hw/misc/iotkit-sysctl.c index 00d4faa6db..31fe9a5997 100644 --- a/hw/misc/iotkit-sysctl.c +++ b/hw/misc/iotkit-sysctl.c @@ -24,6 +24,7 @@ #include "qapi/error.h" #include "sysemu/sysemu.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/registerfields.h" #include "hw/misc/iotkit-sysctl.h" #include "target/arm/arm-powerctl.h" diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index f9cc66aba8..d9b7ea145c 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -27,6 +27,7 @@ #include "hw/pci/msix.h" #include "sysemu/kvm.h" #include "migration/blocker.h" +#include "migration/vmstate.h" #include "qemu/error-report.h" #include "qemu/event_notifier.h" #include "qemu/module.h" diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c index 4f532efe34..feb80df0ff 100644 --- a/hw/misc/macio/cuda.c +++ b/hw/misc/macio/cuda.c @@ -27,6 +27,7 @@ #include "qemu-common.h" #include "hw/hw.h" #include "hw/ppc/mac.h" +#include "migration/vmstate.h" #include "hw/input/adb.h" #include "hw/misc/mos6522.h" #include "hw/misc/macio/cuda.h" diff --git a/hw/misc/macio/gpio.c b/hw/misc/macio/gpio.c index 31811ab513..6f90afefb7 100644 --- a/hw/misc/macio/gpio.c +++ b/hw/misc/macio/gpio.c @@ -26,6 +26,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/ppc/mac.h" +#include "migration/vmstate.h" #include "hw/misc/macio/macio.h" #include "hw/misc/macio/gpio.h" #include "hw/nmi.h" diff --git a/hw/misc/macio/mac_dbdma.c b/hw/misc/macio/mac_dbdma.c index 8a1de8c31d..beaf083578 100644 --- a/hw/misc/macio/mac_dbdma.c +++ b/hw/misc/macio/mac_dbdma.c @@ -41,6 +41,7 @@ #include "hw/hw.h" #include "hw/irq.h" #include "hw/ppc/mac_dbdma.h" +#include "migration/vmstate.h" #include "qemu/main-loop.h" #include "qemu/module.h" #include "qemu/log.h" diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c index 82492096f8..c797bbd698 100644 --- a/hw/misc/macio/macio.c +++ b/hw/misc/macio/macio.c @@ -31,6 +31,7 @@ #include "hw/misc/macio/cuda.h" #include "hw/pci/pci.h" #include "hw/ppc/mac_dbdma.h" +#include "migration/vmstate.h" #include "hw/char/escc.h" #include "hw/misc/macio/macio.h" #include "hw/intc/heathrow_pic.h" diff --git a/hw/misc/macio/pmu.c b/hw/misc/macio/pmu.c index 6280bcbc61..507f62ba64 100644 --- a/hw/misc/macio/pmu.c +++ b/hw/misc/macio/pmu.c @@ -32,6 +32,7 @@ #include "qemu-common.h" #include "hw/hw.h" #include "hw/ppc/mac.h" +#include "migration/vmstate.h" #include "hw/input/adb.h" #include "hw/irq.h" #include "hw/misc/mos6522.h" diff --git a/hw/misc/max111x.c b/hw/misc/max111x.c index 6fd7210c67..a713149f16 100644 --- a/hw/misc/max111x.c +++ b/hw/misc/max111x.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" #include "hw/ssi/ssi.h" +#include "migration/vmstate.h" #include "qemu/module.h" typedef struct { diff --git a/hw/misc/milkymist-hpdmc.c b/hw/misc/milkymist-hpdmc.c index 701c79e81c..e9722d6c76 100644 --- a/hw/misc/milkymist-hpdmc.c +++ b/hw/misc/milkymist-hpdmc.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "trace.h" #include "qemu/error-report.h" #include "qemu/module.h" diff --git a/hw/misc/milkymist-pfpu.c b/hw/misc/milkymist-pfpu.c index fb21b898d1..8c6baf5406 100644 --- a/hw/misc/milkymist-pfpu.c +++ b/hw/misc/milkymist-pfpu.c @@ -26,6 +26,7 @@ #include "hw/hw.h" #include "hw/irq.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "trace.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/mips_cmgcr.c b/hw/misc/mips_cmgcr.c index edec164605..6dcdb4a225 100644 --- a/hw/misc/mips_cmgcr.c +++ b/hw/misc/mips_cmgcr.c @@ -14,6 +14,7 @@ #include "qemu/module.h" #include "hw/hw.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "sysemu/sysemu.h" #include "hw/misc/mips_cmgcr.h" #include "hw/misc/mips_cpc.h" diff --git a/hw/misc/mips_cpc.c b/hw/misc/mips_cpc.c index 446b1ad397..caa618f582 100644 --- a/hw/misc/mips_cpc.c +++ b/hw/misc/mips_cpc.c @@ -23,6 +23,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/misc/mips_cpc.h" diff --git a/hw/misc/mos6522.c b/hw/misc/mos6522.c index 84c677c131..7e6dead089 100644 --- a/hw/misc/mos6522.c +++ b/hw/misc/mos6522.c @@ -29,6 +29,7 @@ #include "hw/input/adb.h" #include "hw/irq.h" #include "hw/misc/mos6522.h" +#include "migration/vmstate.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" #include "qemu/cutils.h" diff --git a/hw/misc/mps2-fpgaio.c b/hw/misc/mps2-fpgaio.c index b97ad42d75..4824dc09b2 100644 --- a/hw/misc/mps2-fpgaio.c +++ b/hw/misc/mps2-fpgaio.c @@ -21,6 +21,7 @@ #include "qapi/error.h" #include "trace.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/registerfields.h" #include "hw/misc/mps2-fpgaio.h" #include "qemu/timer.h" diff --git a/hw/misc/mps2-scc.c b/hw/misc/mps2-scc.c index 1fdf5d22bd..042ce130ba 100644 --- a/hw/misc/mps2-scc.c +++ b/hw/misc/mps2-scc.c @@ -22,6 +22,7 @@ #include "qemu/module.h" #include "trace.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/registerfields.h" #include "hw/misc/mps2-scc.h" diff --git a/hw/misc/msf2-sysreg.c b/hw/misc/msf2-sysreg.c index 21a2863821..da0f7c26e1 100644 --- a/hw/misc/msf2-sysreg.c +++ b/hw/misc/msf2-sysreg.c @@ -17,6 +17,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/misc/msf2-sysreg.h" +#include "migration/vmstate.h" #include "qemu/error-report.h" #include "trace.h" diff --git a/hw/misc/mst_fpga.c b/hw/misc/mst_fpga.c index 256746ac15..d002870e56 100644 --- a/hw/misc/mst_fpga.c +++ b/hw/misc/mst_fpga.c @@ -15,6 +15,7 @@ #include "hw/hw.h" #include "hw/irq.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "qemu/module.h" /* Mainstone FPGA for extern irqs */ diff --git a/hw/misc/nrf51_rng.c b/hw/misc/nrf51_rng.c index cf1bec223e..8528c8880c 100644 --- a/hw/misc/nrf51_rng.c +++ b/hw/misc/nrf51_rng.c @@ -16,6 +16,7 @@ #include "hw/arm/nrf51.h" #include "hw/irq.h" #include "hw/misc/nrf51_rng.h" +#include "migration/vmstate.h" #include "qemu/guest-random.h" static void update_irq(NRF51RNGState *s) diff --git a/hw/misc/pca9552.c b/hw/misc/pca9552.c index 3422397f89..bb05811e1f 100644 --- a/hw/misc/pca9552.c +++ b/hw/misc/pca9552.c @@ -15,6 +15,7 @@ #include "hw/hw.h" #include "hw/misc/pca9552.h" #include "hw/misc/pca9552_regs.h" +#include "migration/vmstate.h" #define PCA9552_LED_ON 0x0 #define PCA9552_LED_OFF 0x1 diff --git a/hw/misc/slavio_misc.c b/hw/misc/slavio_misc.c index 5f351950db..7ef73506ae 100644 --- a/hw/misc/slavio_misc.c +++ b/hw/misc/slavio_misc.c @@ -26,6 +26,7 @@ #include "sysemu/sysemu.h" #include "hw/irq.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "trace.h" diff --git a/hw/misc/tmp105.c b/hw/misc/tmp105.c index 2e304218f4..28996473cb 100644 --- a/hw/misc/tmp105.c +++ b/hw/misc/tmp105.c @@ -22,6 +22,7 @@ #include "hw/hw.h" #include "hw/i2c/i2c.h" #include "hw/irq.h" +#include "migration/vmstate.h" #include "tmp105.h" #include "qapi/error.h" #include "qapi/visitor.h" diff --git a/hw/misc/tmp421.c b/hw/misc/tmp421.c index 69ee5db4b7..6728aa7e10 100644 --- a/hw/misc/tmp421.c +++ b/hw/misc/tmp421.c @@ -27,6 +27,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/i2c/i2c.h" +#include "migration/vmstate.h" #include "qapi/error.h" #include "qapi/visitor.h" #include "qemu/module.h" diff --git a/hw/misc/tz-mpc.c b/hw/misc/tz-mpc.c index 802aeb7377..deb7796ec2 100644 --- a/hw/misc/tz-mpc.c +++ b/hw/misc/tz-mpc.c @@ -15,6 +15,7 @@ #include "qapi/error.h" #include "trace.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/registerfields.h" #include "hw/irq.h" #include "hw/misc/tz-mpc.h" diff --git a/hw/misc/tz-msc.c b/hw/misc/tz-msc.c index 7d1a536ce4..5b664d760f 100644 --- a/hw/misc/tz-msc.c +++ b/hw/misc/tz-msc.c @@ -15,6 +15,7 @@ #include "qapi/error.h" #include "trace.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/registerfields.h" #include "hw/irq.h" #include "hw/misc/tz-msc.h" diff --git a/hw/misc/tz-ppc.c b/hw/misc/tz-ppc.c index 54db7fc152..ccc4468c11 100644 --- a/hw/misc/tz-ppc.c +++ b/hw/misc/tz-ppc.c @@ -15,6 +15,7 @@ #include "qapi/error.h" #include "trace.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/registerfields.h" #include "hw/irq.h" #include "hw/misc/tz-ppc.h" diff --git a/hw/misc/vmcoreinfo.c b/hw/misc/vmcoreinfo.c index 49e87d462b..326a3ce8f4 100644 --- a/hw/misc/vmcoreinfo.c +++ b/hw/misc/vmcoreinfo.c @@ -15,6 +15,7 @@ #include "qemu/module.h" #include "sysemu/reset.h" #include "hw/nvram/fw_cfg.h" +#include "migration/vmstate.h" #include "hw/misc/vmcoreinfo.h" static void fw_cfg_vmci_write(void *dev, off_t offset, size_t len) diff --git a/hw/misc/zynq-xadc.c b/hw/misc/zynq-xadc.c index c5cff5a8a9..edfe76ba20 100644 --- a/hw/misc/zynq-xadc.c +++ b/hw/misc/zynq-xadc.c @@ -17,6 +17,7 @@ #include "hw/hw.h" #include "hw/irq.h" #include "hw/misc/zynq-xadc.h" +#include "migration/vmstate.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" #include "qemu/log.h" diff --git a/hw/misc/zynq_slcr.c b/hw/misc/zynq_slcr.c index 6b51ae5ff1..82430a146a 100644 --- a/hw/misc/zynq_slcr.c +++ b/hw/misc/zynq_slcr.c @@ -18,6 +18,7 @@ #include "hw/hw.h" #include "qemu/timer.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "sysemu/sysemu.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/net/allwinner_emac.c b/hw/net/allwinner_emac.c index dad25bd4e9..f4b8c4fa67 100644 --- a/hw/net/allwinner_emac.c +++ b/hw/net/allwinner_emac.c @@ -19,6 +19,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "net/net.h" #include "qemu/fifo8.h" #include "hw/irq.h" diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c index f4e4a4dd87..ab6f7e8262 100644 --- a/hw/net/cadence_gem.c +++ b/hw/net/cadence_gem.c @@ -27,6 +27,7 @@ #include "hw/irq.h" #include "hw/net/cadence_gem.h" +#include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/net/can/can_kvaser_pci.c b/hw/net/can/can_kvaser_pci.c index 3b8e38eb83..10963ef58c 100644 --- a/hw/net/can/can_kvaser_pci.c +++ b/hw/net/can/can_kvaser_pci.c @@ -39,6 +39,7 @@ #include "hw/hw.h" #include "hw/irq.h" #include "hw/pci/pci.h" +#include "migration/vmstate.h" #include "net/can_emu.h" #include "can_sja1000.h" diff --git a/hw/net/can/can_mioe3680_pci.c b/hw/net/can/can_mioe3680_pci.c index c09ae69261..9e060dff01 100644 --- a/hw/net/can/can_mioe3680_pci.c +++ b/hw/net/can/can_mioe3680_pci.c @@ -35,6 +35,7 @@ #include "hw/hw.h" #include "hw/irq.h" #include "hw/pci/pci.h" +#include "migration/vmstate.h" #include "net/can_emu.h" #include "can_sja1000.h" diff --git a/hw/net/can/can_pcm3680_pci.c b/hw/net/can/can_pcm3680_pci.c index 843a76cf37..5d12f0c552 100644 --- a/hw/net/can/can_pcm3680_pci.c +++ b/hw/net/can/can_pcm3680_pci.c @@ -35,6 +35,7 @@ #include "hw/hw.h" #include "hw/irq.h" #include "hw/pci/pci.h" +#include "migration/vmstate.h" #include "net/can_emu.h" #include "can_sja1000.h" diff --git a/hw/net/can/can_sja1000.c b/hw/net/can/can_sja1000.c index ee079d355f..6c84be6d29 100644 --- a/hw/net/can/can_sja1000.c +++ b/hw/net/can/can_sja1000.c @@ -30,6 +30,7 @@ #include "chardev/char.h" #include "hw/hw.h" #include "hw/irq.h" +#include "migration/vmstate.h" #include "net/can_emu.h" #include "can_sja1000.h" diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c index 70a78ad337..8d0cafc6ba 100644 --- a/hw/net/dp8393x.c +++ b/hw/net/dp8393x.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "net/net.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/net/e1000.c b/hw/net/e1000.c index 1dc1466332..81193231ea 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -28,6 +28,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/pci/pci.h" +#include "migration/vmstate.h" #include "net/net.h" #include "net/checksum.h" #include "sysemu/sysemu.h" diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c index 581f7d03d5..22e3132581 100644 --- a/hw/net/e1000e.c +++ b/hw/net/e1000e.c @@ -42,6 +42,7 @@ #include "sysemu/sysemu.h" #include "hw/pci/msi.h" #include "hw/pci/msix.h" +#include "migration/vmstate.h" #include "e1000_regs.h" diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c index e0cf0c46d7..3c1c534cbf 100644 --- a/hw/net/eepro100.c +++ b/hw/net/eepro100.c @@ -44,6 +44,7 @@ #include "qemu/units.h" #include "hw/hw.h" #include "hw/pci/pci.h" +#include "migration/vmstate.h" #include "net/net.h" #include "net/eth.h" #include "hw/nvram/eeprom93xx.h" diff --git a/hw/net/ftgmac100.c b/hw/net/ftgmac100.c index 2848bff3e5..4d0f56c123 100644 --- a/hw/net/ftgmac100.c +++ b/hw/net/ftgmac100.c @@ -20,6 +20,7 @@ #include "net/checksum.h" #include "net/eth.h" #include "hw/net/mii.h" +#include "migration/vmstate.h" /* For crc32 */ #include diff --git a/hw/net/imx_fec.c b/hw/net/imx_fec.c index fe9d9028fa..5a22542aaf 100644 --- a/hw/net/imx_fec.c +++ b/hw/net/imx_fec.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" #include "hw/net/imx_fec.h" +#include "migration/vmstate.h" #include "sysemu/dma.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c index e2da54cbd8..937d5603e2 100644 --- a/hw/net/lan9118.c +++ b/hw/net/lan9118.c @@ -12,6 +12,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "net/net.h" #include "net/eth.h" #include "hw/irq.h" diff --git a/hw/net/lance.c b/hw/net/lance.c index 2978c01d58..0d094327cb 100644 --- a/hw/net/lance.c +++ b/hw/net/lance.c @@ -39,6 +39,7 @@ #include "qemu/module.h" #include "qemu/timer.h" #include "hw/sparc/sparc32_dma.h" +#include "migration/vmstate.h" #include "hw/net/lance.h" #include "trace.h" #include "sysemu/sysemu.h" diff --git a/hw/net/milkymist-minimac2.c b/hw/net/milkymist-minimac2.c index bad1066781..a7d879f0ab 100644 --- a/hw/net/milkymist-minimac2.c +++ b/hw/net/milkymist-minimac2.c @@ -28,6 +28,7 @@ #include "hw/hw.h" #include "hw/irq.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "trace.h" #include "net/net.h" #include "qemu/log.h" diff --git a/hw/net/mipsnet.c b/hw/net/mipsnet.c index 007c94aa30..3910beb9a6 100644 --- a/hw/net/mipsnet.c +++ b/hw/net/mipsnet.c @@ -5,6 +5,7 @@ #include "qemu/module.h" #include "trace.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" /* MIPSnet register offsets */ diff --git a/hw/net/ne2000-isa.c b/hw/net/ne2000-isa.c index 3490e54c5a..5195c107d0 100644 --- a/hw/net/ne2000-isa.c +++ b/hw/net/ne2000-isa.c @@ -26,6 +26,7 @@ #include "hw/isa/isa.h" #include "hw/net/ne2000-isa.h" #include "hw/qdev.h" +#include "migration/vmstate.h" #include "ne2000.h" #include "sysemu/sysemu.h" #include "qapi/error.h" diff --git a/hw/net/ne2000-pci.c b/hw/net/ne2000-pci.c index 4f28e31baa..084d92f955 100644 --- a/hw/net/ne2000-pci.c +++ b/hw/net/ne2000-pci.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" #include "hw/pci/pci.h" +#include "migration/vmstate.h" #include "ne2000.h" #include "sysemu/sysemu.h" diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c index 4b9231c495..7731b5acd1 100644 --- a/hw/net/ne2000.c +++ b/hw/net/ne2000.c @@ -26,6 +26,7 @@ #include "net/eth.h" #include "qemu/module.h" #include "hw/irq.h" +#include "migration/vmstate.h" #include "ne2000.h" #include "sysemu/sysemu.h" #include "trace.h" diff --git a/hw/net/pcnet-pci.c b/hw/net/pcnet-pci.c index df8cb6621f..a77d2c9368 100644 --- a/hw/net/pcnet-pci.c +++ b/hw/net/pcnet-pci.c @@ -30,6 +30,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" #include "hw/pci/pci.h" +#include "migration/vmstate.h" #include "net/net.h" #include "qemu/module.h" #include "qemu/timer.h" diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c index f73e3422f4..bfcfcf5be3 100644 --- a/hw/net/pcnet.c +++ b/hw/net/pcnet.c @@ -39,6 +39,7 @@ #include "qemu/log.h" #include "hw/irq.h" #include "hw/qdev.h" +#include "migration/vmstate.h" #include "net/net.h" #include "net/eth.h" #include "qemu/timer.h" diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c index bd54612f2a..4ce8f62a2a 100644 --- a/hw/net/rocker/rocker.c +++ b/hw/net/rocker/rocker.c @@ -18,6 +18,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/pci/pci.h" +#include "migration/vmstate.h" #include "hw/pci/msix.h" #include "net/net.h" #include "net/eth.h" diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c index 09273171e5..9975af44dd 100644 --- a/hw/net/rtl8139.c +++ b/hw/net/rtl8139.c @@ -55,6 +55,7 @@ #include "hw/hw.h" #include "hw/pci/pci.h" +#include "migration/vmstate.h" #include "sysemu/dma.h" #include "qemu/module.h" #include "qemu/timer.h" diff --git a/hw/net/smc91c111.c b/hw/net/smc91c111.c index f5149124e6..67e3f2408e 100644 --- a/hw/net/smc91c111.c +++ b/hw/net/smc91c111.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "net/net.h" #include "hw/irq.h" #include "hw/net/smc91c111.h" diff --git a/hw/net/spapr_llan.c b/hw/net/spapr_llan.c index 1867c355e3..0ce5e37a28 100644 --- a/hw/net/spapr_llan.c +++ b/hw/net/spapr_llan.c @@ -33,6 +33,7 @@ #include "qemu/module.h" #include "net/net.h" #include "hw/qdev.h" +#include "migration/vmstate.h" #include "hw/ppc/spapr.h" #include "hw/ppc/spapr_vio.h" #include "sysemu/sysemu.h" diff --git a/hw/net/stellaris_enet.c b/hw/net/stellaris_enet.c index 756ac5600b..154214ca1d 100644 --- a/hw/net/stellaris_enet.c +++ b/hw/net/stellaris_enet.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "net/net.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/net/sungem.c b/hw/net/sungem.c index 89bcf749d1..f5e30725be 100644 --- a/hw/net/sungem.c +++ b/hw/net/sungem.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "hw/pci/pci.h" +#include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" #include "net/net.h" diff --git a/hw/net/sunhme.c b/hw/net/sunhme.c index 8b8603e696..9d8fd70f51 100644 --- a/hw/net/sunhme.c +++ b/hw/net/sunhme.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/pci/pci.h" +#include "migration/vmstate.h" #include "hw/net/mii.h" #include "net/net.h" #include "qemu/module.h" diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c index 10d01d0058..88a7c13a96 100644 --- a/hw/net/vmxnet3.c +++ b/hw/net/vmxnet3.c @@ -26,6 +26,7 @@ #include "hw/pci/msix.h" #include "hw/pci/msi.h" #include "migration/register.h" +#include "migration/vmstate.h" #include "vmxnet3.h" #include "vmxnet3_defs.h" diff --git a/hw/net/xgmac.c b/hw/net/xgmac.c index c2efc77452..ded8b9cf9d 100644 --- a/hw/net/xgmac.c +++ b/hw/net/xgmac.c @@ -27,6 +27,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" #include "net/net.h" diff --git a/hw/nvram/ds1225y.c b/hw/nvram/ds1225y.c index fd49283f41..9cddb37925 100644 --- a/hw/nvram/ds1225y.c +++ b/hw/nvram/ds1225y.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "trace.h" #include "qemu/error-report.h" #include "qemu/module.h" diff --git a/hw/nvram/eeprom93xx.c b/hw/nvram/eeprom93xx.c index 5fc23df1d4..c2b012d583 100644 --- a/hw/nvram/eeprom93xx.c +++ b/hw/nvram/eeprom93xx.c @@ -39,6 +39,7 @@ #include "hw/hw.h" #include "hw/nvram/eeprom93xx.h" #include "migration/qemu-file-types.h" +#include "migration/vmstate.h" /* Debug EEPROM emulation. */ //~ #define DEBUG_EEPROM diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 8db0297d59..a5e614016a 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -32,6 +32,7 @@ #include "hw/nvram/fw_cfg.h" #include "hw/sysbus.h" #include "migration/qemu-file-types.h" +#include "migration/vmstate.h" #include "trace.h" #include "qemu/error-report.h" #include "qemu/option.h" diff --git a/hw/nvram/mac_nvram.c b/hw/nvram/mac_nvram.c index a60426c469..4f0d2f6bd4 100644 --- a/hw/nvram/mac_nvram.c +++ b/hw/nvram/mac_nvram.c @@ -27,6 +27,7 @@ #include "hw/hw.h" #include "hw/nvram/chrp_nvram.h" #include "hw/ppc/mac.h" +#include "migration/vmstate.h" #include "qemu/cutils.h" #include "qemu/module.h" #include diff --git a/hw/nvram/nrf51_nvm.c b/hw/nvram/nrf51_nvm.c index eca0cb35b5..e13ff4b2fe 100644 --- a/hw/nvram/nrf51_nvm.c +++ b/hw/nvram/nrf51_nvm.c @@ -24,6 +24,7 @@ #include "exec/address-spaces.h" #include "hw/arm/nrf51.h" #include "hw/nvram/nrf51_nvm.h" +#include "migration/vmstate.h" /* * FICR Registers Assignments diff --git a/hw/nvram/spapr_nvram.c b/hw/nvram/spapr_nvram.c index 09efd886bf..ef22962767 100644 --- a/hw/nvram/spapr_nvram.c +++ b/hw/nvram/spapr_nvram.c @@ -32,6 +32,7 @@ #include "sysemu/block-backend.h" #include "sysemu/device_tree.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/nvram/chrp_nvram.h" #include "hw/ppc/spapr.h" #include "hw/ppc/spapr_vio.h" diff --git a/hw/openrisc/cputimer.c b/hw/openrisc/cputimer.c index fe95efc41c..e9f89333dc 100644 --- a/hw/openrisc/cputimer.c +++ b/hw/openrisc/cputimer.c @@ -21,6 +21,7 @@ #include "qemu/osdep.h" #include "cpu.h" #include "hw/hw.h" +#include "migration/vmstate.h" #include "qemu/timer.h" #define TIMER_PERIOD 50 /* 50 ns period for 20 MHz timer */ diff --git a/hw/pci-bridge/gen_pcie_root_port.c b/hw/pci-bridge/gen_pcie_root_port.c index 44acda7cb9..fb78cf1905 100644 --- a/hw/pci-bridge/gen_pcie_root_port.c +++ b/hw/pci-bridge/gen_pcie_root_port.c @@ -15,6 +15,7 @@ #include "qemu/module.h" #include "hw/pci/msix.h" #include "hw/pci/pcie_port.h" +#include "migration/vmstate.h" #define TYPE_GEN_PCIE_ROOT_PORT "pcie-root-port" #define GEN_PCIE_ROOT_PORT(obj) \ diff --git a/hw/pci-bridge/i82801b11.c b/hw/pci-bridge/i82801b11.c index db77a3541b..2b3907655b 100644 --- a/hw/pci-bridge/i82801b11.c +++ b/hw/pci-bridge/i82801b11.c @@ -43,6 +43,7 @@ #include "qemu/osdep.h" #include "hw/pci/pci.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "hw/i386/ich9.h" diff --git a/hw/pci-bridge/ioh3420.c b/hw/pci-bridge/ioh3420.c index 310af04af9..f1e16135a3 100644 --- a/hw/pci-bridge/ioh3420.c +++ b/hw/pci-bridge/ioh3420.c @@ -25,6 +25,7 @@ #include "hw/pci/msi.h" #include "hw/pci/pcie.h" #include "hw/pci/pcie_port.h" +#include "migration/vmstate.h" #include "qemu/module.h" #define PCI_DEVICE_ID_IOH_EPORT 0x3420 /* D0:F0 express mode */ diff --git a/hw/pci-bridge/xio3130_downstream.c b/hw/pci-bridge/xio3130_downstream.c index 182e164f74..1d62e31272 100644 --- a/hw/pci-bridge/xio3130_downstream.c +++ b/hw/pci-bridge/xio3130_downstream.c @@ -24,6 +24,7 @@ #include "hw/pci/msi.h" #include "hw/pci/pcie.h" #include "hw/pci/pcie_port.h" +#include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/pci-bridge/xio3130_upstream.c b/hw/pci-bridge/xio3130_upstream.c index b8cb31355f..5cd3af4fbc 100644 --- a/hw/pci-bridge/xio3130_upstream.c +++ b/hw/pci-bridge/xio3130_upstream.c @@ -24,6 +24,7 @@ #include "hw/pci/msi.h" #include "hw/pci/pcie.h" #include "hw/pci/pcie_port.h" +#include "migration/vmstate.h" #include "qemu/module.h" #define PCI_DEVICE_ID_TI_XIO3130U 0x8232 /* upstream port */ diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index ca526bd71b..58870e0d87 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -45,6 +45,7 @@ #include "hw/irq.h" #include "hw/mips/mips.h" #include "hw/pci/pci_host.h" +#include "migration/vmstate.h" #include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "exec/address-spaces.h" diff --git a/hw/pci-host/designware.c b/hw/pci-host/designware.c index de4300d554..083f5bb1a6 100644 --- a/hw/pci-host/designware.c +++ b/hw/pci-host/designware.c @@ -25,6 +25,7 @@ #include "hw/pci/pci_bridge.h" #include "hw/pci/pci_host.h" #include "hw/pci/pcie_port.h" +#include "migration/vmstate.h" #include "hw/irq.h" #include "hw/pci-host/designware.h" diff --git a/hw/pci-host/gpex.c b/hw/pci-host/gpex.c index 72c58a054b..1a45c30505 100644 --- a/hw/pci-host/gpex.c +++ b/hw/pci-host/gpex.c @@ -34,6 +34,7 @@ #include "hw/hw.h" #include "hw/irq.h" #include "hw/pci-host/gpex.h" +#include "migration/vmstate.h" #include "qemu/module.h" /**************************************************************************** diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index ecf634a04d..9e8c8542d3 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -34,6 +34,7 @@ #include "qemu/range.h" #include "hw/xen/xen.h" #include "migration/qemu-file-types.h" +#include "migration/vmstate.h" #include "hw/pci-host/pam.h" #include "sysemu/reset.h" #include "sysemu/sysemu.h" diff --git a/hw/pci-host/ppce500.c b/hw/pci-host/ppce500.c index 406ebf0438..840869f19c 100644 --- a/hw/pci-host/ppce500.c +++ b/hw/pci-host/ppce500.c @@ -18,6 +18,7 @@ #include "hw/hw.h" #include "hw/irq.h" #include "hw/ppc/e500-ccsr.h" +#include "migration/vmstate.h" #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" #include "qemu/bswap.h" diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c index 2b68af9811..34a36812ea 100644 --- a/hw/pci-host/prep.c +++ b/hw/pci-host/prep.c @@ -31,6 +31,7 @@ #include "hw/pci/pci.h" #include "hw/pci/pci_bus.h" #include "hw/pci/pci_host.h" +#include "migration/vmstate.h" #include "hw/i386/pc.h" #include "hw/irq.h" #include "hw/loader.h" diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index 0a010be4cf..25335a8b71 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -31,6 +31,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/pci-host/q35.h" +#include "migration/vmstate.h" #include "qapi/error.h" #include "qapi/visitor.h" #include "qemu/module.h" diff --git a/hw/pci-host/versatile.c b/hw/pci-host/versatile.c index 221cc40134..1cd832a393 100644 --- a/hw/pci-host/versatile.c +++ b/hw/pci-host/versatile.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/irq.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bus.h" diff --git a/hw/pci/msix.c b/hw/pci/msix.c index ebe804b473..81a23accf3 100644 --- a/hw/pci/msix.c +++ b/hw/pci/msix.c @@ -21,6 +21,7 @@ #include "hw/pci/pci.h" #include "hw/xen/xen.h" #include "migration/qemu-file-types.h" +#include "migration/vmstate.h" #include "qemu/range.h" #include "qapi/error.h" #include "trace.h" diff --git a/hw/pci/pci.c b/hw/pci/pci.c index bc7ce92dcb..de3691eee4 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -31,6 +31,7 @@ #include "hw/pci/pci_bus.h" #include "hw/pci/pci_host.h" #include "migration/qemu-file-types.h" +#include "migration/vmstate.h" #include "monitor/monitor.h" #include "net/net.h" #include "sysemu/sysemu.h" diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c index 939da0b778..27f9cc56af 100644 --- a/hw/pci/pcie_aer.c +++ b/hw/pci/pcie_aer.c @@ -21,6 +21,7 @@ #include "qemu/osdep.h" #include "sysemu/sysemu.h" #include "qapi/qmp/qdict.h" +#include "migration/vmstate.h" #include "monitor/monitor.h" #include "hw/pci/pci_bridge.h" #include "hw/pci/pcie.h" diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c index 163a34ee4c..5cc321828e 100644 --- a/hw/ppc/ppc.c +++ b/hw/ppc/ppc.c @@ -35,6 +35,7 @@ #include "qemu/error-report.h" #include "sysemu/kvm.h" #include "kvm_ppc.h" +#include "migration/vmstate.h" #include "trace.h" //#define PPC_DEBUG_IRQ diff --git a/hw/ppc/ppc4xx_pci.c b/hw/ppc/ppc4xx_pci.c index 27f25f4e58..7334d75890 100644 --- a/hw/ppc/ppc4xx_pci.c +++ b/hw/ppc/ppc4xx_pci.c @@ -24,6 +24,7 @@ #include "hw/irq.h" #include "hw/ppc/ppc.h" #include "hw/ppc/ppc4xx.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "sysemu/reset.h" #include "hw/pci/pci.h" diff --git a/hw/ppc/prep_systemio.c b/hw/ppc/prep_systemio.c index 898ab1533f..d46792d366 100644 --- a/hw/ppc/prep_systemio.c +++ b/hw/ppc/prep_systemio.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" #include "hw/isa/isa.h" +#include "migration/vmstate.h" #include "exec/address-spaces.h" #include "qemu/error-report.h" /* for error_report() */ #include "qemu/module.h" diff --git a/hw/ppc/rs6000_mc.c b/hw/ppc/rs6000_mc.c index 45cb95e08a..daea13cdea 100644 --- a/hw/ppc/rs6000_mc.c +++ b/hw/ppc/rs6000_mc.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "hw/isa/isa.h" +#include "migration/vmstate.h" #include "exec/address-spaces.h" #include "hw/boards.h" #include "qapi/error.h" diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c index bbb001f84a..7830d66d77 100644 --- a/hw/ppc/spapr_caps.c +++ b/hw/ppc/spapr_caps.c @@ -32,6 +32,7 @@ #include "target/ppc/mmu-hash64.h" #include "cpu-models.h" #include "kvm_ppc.h" +#include "migration/vmstate.h" #include "sysemu/qtest.h" #include "sysemu/tcg.h" diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c index ccc8970c7c..f86f773d42 100644 --- a/hw/ppc/spapr_cpu_core.c +++ b/hw/ppc/spapr_cpu_core.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #include "hw/cpu/core.h" #include "hw/ppc/spapr_cpu_core.h" +#include "migration/vmstate.h" #include "target/ppc/cpu.h" #include "hw/ppc/spapr.h" #include "hw/boards.h" diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c index 678493a9c5..c09bbcc22d 100644 --- a/hw/ppc/spapr_drc.c +++ b/hw/ppc/spapr_drc.c @@ -18,6 +18,7 @@ #include "hw/ppc/spapr_drc.h" #include "qom/object.h" #include "hw/qdev.h" +#include "migration/vmstate.h" #include "qapi/visitor.h" #include "qemu/error-report.h" #include "hw/ppc/spapr.h" /* for RTAS return codes */ diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c index bd3d0256a6..57834e6a39 100644 --- a/hw/ppc/spapr_iommu.c +++ b/hw/ppc/spapr_iommu.c @@ -25,6 +25,7 @@ #include "sysemu/kvm.h" #include "hw/qdev.h" #include "kvm_ppc.h" +#include "migration/vmstate.h" #include "sysemu/dma.h" #include "exec/address-spaces.h" #include "trace.h" diff --git a/hw/ppc/spapr_ovec.c b/hw/ppc/spapr_ovec.c index a65b7c7da9..811fadf143 100644 --- a/hw/ppc/spapr_ovec.c +++ b/hw/ppc/spapr_ovec.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "hw/ppc/spapr_ovec.h" +#include "migration/vmstate.h" #include "qemu/bitmap.h" #include "exec/address-spaces.h" #include "qemu/error-report.h" diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index 54d0a32c17..e5f592322f 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -29,6 +29,7 @@ #include "hw/hw.h" #include "hw/irq.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/pci/pci.h" #include "hw/pci/msi.h" #include "hw/pci/msix.h" diff --git a/hw/ppc/spapr_rtc.c b/hw/ppc/spapr_rtc.c index 6cf0113b34..42ff72c269 100644 --- a/hw/ppc/spapr_rtc.c +++ b/hw/ppc/spapr_rtc.c @@ -31,6 +31,7 @@ #include "qemu/timer.h" #include "sysemu/sysemu.h" #include "hw/ppc/spapr.h" +#include "migration/vmstate.h" #include "qapi/error.h" #include "qapi/qapi-events-misc-target.h" #include "qemu/cutils.h" diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c index 0f4f4bedd3..1095aa5f00 100644 --- a/hw/ppc/spapr_vio.c +++ b/hw/ppc/spapr_vio.c @@ -34,6 +34,7 @@ #include "sysemu/kvm.h" #include "sysemu/device_tree.h" #include "kvm_ppc.h" +#include "migration/vmstate.h" #include "sysemu/qtest.h" #include "hw/ppc/spapr.h" diff --git a/hw/riscv/sifive_gpio.c b/hw/riscv/sifive_gpio.c index da19daa880..5c7c596e6b 100644 --- a/hw/riscv/sifive_gpio.c +++ b/hw/riscv/sifive_gpio.c @@ -15,6 +15,7 @@ #include "qemu/log.h" #include "hw/irq.h" #include "hw/riscv/sifive_gpio.h" +#include "migration/vmstate.h" #include "trace.h" static void update_output_irq(SIFIVEGPIOState *s) diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c index 61f3b74714..056f0711fa 100644 --- a/hw/s390x/event-facility.c +++ b/hw/s390x/event-facility.c @@ -21,6 +21,7 @@ #include "sysemu/sysemu.h" #include "hw/s390x/sclp.h" +#include "migration/vmstate.h" #include "hw/s390x/event-facility.h" typedef struct SCLPEventsBus { diff --git a/hw/s390x/sclpquiesce.c b/hw/s390x/sclpquiesce.c index 4f73471537..6dfb087568 100644 --- a/hw/s390x/sclpquiesce.c +++ b/hw/s390x/sclpquiesce.c @@ -16,6 +16,7 @@ #include "hw/qdev.h" #include "sysemu/sysemu.h" #include "hw/s390x/sclp.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "hw/s390x/event-facility.h" diff --git a/hw/scsi/esp-pci.c b/hw/scsi/esp-pci.c index f945502f3a..d5a1f9e017 100644 --- a/hw/scsi/esp-pci.c +++ b/hw/scsi/esp-pci.c @@ -28,6 +28,7 @@ #include "hw/irq.h" #include "hw/nvram/eeprom93xx.h" #include "hw/scsi/esp.h" +#include "migration/vmstate.h" #include "trace.h" #include "qapi/error.h" #include "qemu/log.h" diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index 3b717e9526..841d79b60e 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/irq.h" #include "hw/scsi/esp.h" #include "trace.h" diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c index 1a042aa00b..175eb79260 100644 --- a/hw/scsi/lsi53c895a.c +++ b/hw/scsi/lsi53c895a.c @@ -19,6 +19,7 @@ #include "hw/irq.h" #include "hw/pci/pci.h" #include "hw/scsi/scsi.h" +#include "migration/vmstate.h" #include "sysemu/dma.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index 0c4399930a..970b10048f 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -33,6 +33,7 @@ #include "trace.h" #include "qapi/error.h" #include "mfi.h" +#include "migration/vmstate.h" #define MEGASAS_VERSION_GEN1 "1.70" #define MEGASAS_VERSION_GEN2 "1.80" diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c index 6d2c15a2bc..79501777d4 100644 --- a/hw/scsi/mptsas.c +++ b/hw/scsi/mptsas.c @@ -35,6 +35,7 @@ #include "qapi/error.h" #include "mptsas.h" #include "migration/qemu-file-types.h" +#include "migration/vmstate.h" #include "mpi.h" #define NAA_LOCALLY_ASSIGNED_ID 0x3ULL diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index 81fe7c3301..42928a6aec 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -6,6 +6,7 @@ #include "qemu/option.h" #include "hw/scsi/scsi.h" #include "migration/qemu-file-types.h" +#include "migration/vmstate.h" #include "scsi/constants.h" #include "hw/qdev.h" #include "sysemu/block-backend.h" diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index b5af00e1a4..8f4f69374b 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -26,6 +26,7 @@ #include "qemu/module.h" #include "hw/scsi/scsi.h" #include "migration/qemu-file-types.h" +#include "migration/vmstate.h" #include "hw/scsi/emulation.h" #include "scsi/constants.h" #include "sysemu/sysemu.h" diff --git a/hw/scsi/spapr_vscsi.c b/hw/scsi/spapr_vscsi.c index 0e491c911d..5290f7569a 100644 --- a/hw/scsi/spapr_vscsi.c +++ b/hw/scsi/spapr_vscsi.c @@ -37,6 +37,7 @@ #include "cpu.h" #include "hw/hw.h" #include "hw/scsi/scsi.h" +#include "migration/vmstate.h" #include "scsi/constants.h" #include "srp.h" #include "hw/qdev.h" diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c index 14641df1c8..85af638bc7 100644 --- a/hw/scsi/vmw_pvscsi.c +++ b/hw/scsi/vmw_pvscsi.c @@ -29,6 +29,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/scsi/scsi.h" +#include "migration/vmstate.h" #include "scsi/constants.h" #include "hw/pci/msi.h" #include "vmw_pvscsi.h" diff --git a/hw/sd/bcm2835_sdhost.c b/hw/sd/bcm2835_sdhost.c index 4609cc031c..4a80fbcc86 100644 --- a/hw/sd/bcm2835_sdhost.c +++ b/hw/sd/bcm2835_sdhost.c @@ -17,6 +17,7 @@ #include "sysemu/blockdev.h" #include "hw/irq.h" #include "hw/sd/bcm2835_sdhost.h" +#include "migration/vmstate.h" #include "trace.h" #define TYPE_BCM2835_SDHOST_BUS "bcm2835-sdhost-bus" diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c index b8d2347d46..dcb7169166 100644 --- a/hw/sd/milkymist-memcard.c +++ b/hw/sd/milkymist-memcard.c @@ -26,6 +26,7 @@ #include "qemu/module.h" #include "hw/hw.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "sysemu/sysemu.h" #include "trace.h" #include "qapi/error.h" diff --git a/hw/sd/pl181.c b/hw/sd/pl181.c index 3c615f2b8f..8033fe455d 100644 --- a/hw/sd/pl181.c +++ b/hw/sd/pl181.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #include "sysemu/blockdev.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/irq.h" #include "hw/sd/sd.h" #include "qemu/log.h" diff --git a/hw/sd/pxa2xx_mmci.c b/hw/sd/pxa2xx_mmci.c index 1eb1248cad..020cd5464c 100644 --- a/hw/sd/pxa2xx_mmci.c +++ b/hw/sd/pxa2xx_mmci.c @@ -15,6 +15,7 @@ #include "hw/hw.h" #include "hw/irq.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/arm/pxa.h" #include "hw/sd/sd.h" #include "hw/qdev.h" diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 21adf2be16..02924329bf 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -38,6 +38,7 @@ #include "hw/registerfields.h" #include "sysemu/block-backend.h" #include "hw/sd/sd.h" +#include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/bitmap.h" #include "hw/qdev-properties.h" diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 46c7fbd677..f9db39c834 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -32,6 +32,7 @@ #include "qemu/timer.h" #include "qemu/bitops.h" #include "hw/sd/sdhci.h" +#include "migration/vmstate.h" #include "sdhci-internal.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/sd/ssi-sd.c b/hw/sd/ssi-sd.c index 9bd6511ec8..571aabea5c 100644 --- a/hw/sd/ssi-sd.c +++ b/hw/sd/ssi-sd.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "sysemu/blockdev.h" #include "hw/ssi/ssi.h" +#include "migration/vmstate.h" #include "hw/sd/sd.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 0f9cda19f3..99b8693a0c 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -32,6 +32,7 @@ #include "qemu/timer.h" #include "hw/sparc/sun4m_iommu.h" #include "hw/timer/m48t59.h" +#include "migration/vmstate.h" #include "hw/sparc/sparc32_dma.h" #include "hw/block/fdc.h" #include "sysemu/reset.h" diff --git a/hw/sparc/sun4m_iommu.c b/hw/sparc/sun4m_iommu.c index 36b5c0c133..a5681ded6a 100644 --- a/hw/sparc/sun4m_iommu.c +++ b/hw/sparc/sun4m_iommu.c @@ -26,6 +26,7 @@ #include "hw/irq.h" #include "hw/sparc/sun4m_iommu.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "exec/address-spaces.h" #include "trace.h" diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index 5d87be811d..c95ed94d2e 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.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/units.h" #include "qemu/error-report.h" @@ -36,6 +37,7 @@ #include "hw/char/serial.h" #include "hw/char/parallel.h" #include "hw/timer/m48t59.h" +#include "migration/vmstate.h" #include "hw/input/i8042.h" #include "hw/block/fdc.h" #include "net/net.h" diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c index eb6eee6586..7ace5780a3 100644 --- a/hw/ssi/aspeed_smc.c +++ b/hw/ssi/aspeed_smc.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "sysemu/sysemu.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/ssi/imx_spi.c b/hw/ssi/imx_spi.c index 79c8a6dae7..c918e8cac8 100644 --- a/hw/ssi/imx_spi.c +++ b/hw/ssi/imx_spi.c @@ -11,6 +11,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" #include "hw/ssi/imx_spi.h" +#include "migration/vmstate.h" #include "sysemu/sysemu.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/ssi/mss-spi.c b/hw/ssi/mss-spi.c index d000c91341..3050fabb69 100644 --- a/hw/ssi/mss-spi.c +++ b/hw/ssi/mss-spi.c @@ -26,6 +26,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" #include "hw/ssi/mss-spi.h" +#include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/ssi/pl022.c b/hw/ssi/pl022.c index 286b08438d..cade2e92a8 100644 --- a/hw/ssi/pl022.c +++ b/hw/ssi/pl022.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/irq.h" #include "hw/ssi/pl022.h" #include "hw/ssi/ssi.h" diff --git a/hw/ssi/ssi.c b/hw/ssi/ssi.c index cda7c96a64..c6415eb6e3 100644 --- a/hw/ssi/ssi.c +++ b/hw/ssi/ssi.c @@ -14,6 +14,7 @@ #include "qemu/osdep.h" #include "hw/ssi/ssi.h" +#include "migration/vmstate.h" #include "qemu/module.h" struct SSIBus { diff --git a/hw/ssi/stm32f2xx_spi.c b/hw/ssi/stm32f2xx_spi.c index 4249101386..cd6e8443db 100644 --- a/hw/ssi/stm32f2xx_spi.c +++ b/hw/ssi/stm32f2xx_spi.c @@ -26,6 +26,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/ssi/stm32f2xx_spi.h" +#include "migration/vmstate.h" #ifndef STM_SPI_ERR_DEBUG #define STM_SPI_ERR_DEBUG 0 diff --git a/hw/ssi/xilinx_spi.c b/hw/ssi/xilinx_spi.c index 5495d3e3cb..081433c2f0 100644 --- a/hw/ssi/xilinx_spi.c +++ b/hw/ssi/xilinx_spi.c @@ -26,6 +26,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "sysemu/sysemu.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/ssi/xilinx_spips.c b/hw/ssi/xilinx_spips.c index 451d5a0783..a28cd8f8f0 100644 --- a/hw/ssi/xilinx_spips.c +++ b/hw/ssi/xilinx_spips.c @@ -35,6 +35,7 @@ #include "hw/register.h" #include "sysemu/dma.h" #include "migration/blocker.h" +#include "migration/vmstate.h" #ifndef XILINX_SPIPS_ERR_DEBUG #define XILINX_SPIPS_ERR_DEBUG 0 diff --git a/hw/timer/a9gtimer.c b/hw/timer/a9gtimer.c index 0d18497322..b310dfb1b3 100644 --- a/hw/timer/a9gtimer.c +++ b/hw/timer/a9gtimer.c @@ -23,6 +23,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" #include "hw/timer/a9gtimer.h" +#include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/timer.h" #include "qemu/bitops.h" diff --git a/hw/timer/allwinner-a10-pit.c b/hw/timer/allwinner-a10-pit.c index 490e584604..b9d057df5d 100644 --- a/hw/timer/allwinner-a10-pit.c +++ b/hw/timer/allwinner-a10-pit.c @@ -20,6 +20,7 @@ #include "hw/sysbus.h" #include "sysemu/sysemu.h" #include "hw/timer/allwinner-a10-pit.h" +#include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c index 3092b85d91..a13255d308 100644 --- a/hw/timer/arm_mptimer.c +++ b/hw/timer/arm_mptimer.c @@ -23,6 +23,7 @@ #include "hw/irq.h" #include "hw/ptimer.h" #include "hw/timer/arm_mptimer.h" +#include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/main-loop.h" #include "qemu/module.h" diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c index 30ad2245da..0b121252fd 100644 --- a/hw/timer/arm_timer.c +++ b/hw/timer/arm_timer.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "qemu/timer.h" #include "hw/qdev.h" #include "hw/irq.h" diff --git a/hw/timer/armv7m_systick.c b/hw/timer/armv7m_systick.c index 8a91ba345b..85d122dbcb 100644 --- a/hw/timer/armv7m_systick.c +++ b/hw/timer/armv7m_systick.c @@ -11,6 +11,7 @@ #include "qemu/osdep.h" #include "hw/timer/armv7m_systick.h" +#include "migration/vmstate.h" #include "hw/irq.h" #include "hw/sysbus.h" #include "qemu/timer.h" diff --git a/hw/timer/aspeed_rtc.c b/hw/timer/aspeed_rtc.c index 19f061c846..5313017353 100644 --- a/hw/timer/aspeed_rtc.c +++ b/hw/timer/aspeed_rtc.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "hw/timer/aspeed_rtc.h" +#include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/timer.h" diff --git a/hw/timer/aspeed_timer.c b/hw/timer/aspeed_timer.c index c8e4892989..ed81d5c44c 100644 --- a/hw/timer/aspeed_timer.c +++ b/hw/timer/aspeed_timer.c @@ -14,6 +14,7 @@ #include "hw/irq.h" #include "hw/sysbus.h" #include "hw/timer/aspeed_timer.h" +#include "migration/vmstate.h" #include "qemu/bitops.h" #include "qemu/timer.h" #include "qemu/log.h" diff --git a/hw/timer/cadence_ttc.c b/hw/timer/cadence_ttc.c index 810c08a0ae..5e3128c1e3 100644 --- a/hw/timer/cadence_ttc.c +++ b/hw/timer/cadence_ttc.c @@ -19,6 +19,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "qemu/timer.h" diff --git a/hw/timer/cmsdk-apb-dualtimer.c b/hw/timer/cmsdk-apb-dualtimer.c index 7328abb40b..6a084a91dd 100644 --- a/hw/timer/cmsdk-apb-dualtimer.c +++ b/hw/timer/cmsdk-apb-dualtimer.c @@ -26,6 +26,7 @@ #include "hw/irq.h" #include "hw/registerfields.h" #include "hw/timer/cmsdk-apb-dualtimer.h" +#include "migration/vmstate.h" REG32(TIMER1LOAD, 0x0) REG32(TIMER1VALUE, 0x4) diff --git a/hw/timer/cmsdk-apb-timer.c b/hw/timer/cmsdk-apb-timer.c index 07f82e5fa1..c83e26566a 100644 --- a/hw/timer/cmsdk-apb-timer.c +++ b/hw/timer/cmsdk-apb-timer.c @@ -37,6 +37,7 @@ #include "hw/irq.h" #include "hw/registerfields.h" #include "hw/timer/cmsdk-apb-timer.h" +#include "migration/vmstate.h" REG32(CTRL, 0) FIELD(CTRL, EN, 0, 1) diff --git a/hw/timer/digic-timer.c b/hw/timer/digic-timer.c index c818ed1d98..021c4ef714 100644 --- a/hw/timer/digic-timer.c +++ b/hw/timer/digic-timer.c @@ -34,6 +34,7 @@ #include "qemu/log.h" #include "hw/timer/digic-timer.h" +#include "migration/vmstate.h" static const VMStateDescription vmstate_digic_timer = { .name = "digic.timer", diff --git a/hw/timer/ds1338.c b/hw/timer/ds1338.c index 30d2d21408..588a9ba9be 100644 --- a/hw/timer/ds1338.c +++ b/hw/timer/ds1338.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "hw/i2c/i2c.h" +#include "migration/vmstate.h" #include "qemu/bcd.h" #include "qemu/module.h" diff --git a/hw/timer/exynos4210_mct.c b/hw/timer/exynos4210_mct.c index 25e2125af8..7f2af5287c 100644 --- a/hw/timer/exynos4210_mct.c +++ b/hw/timer/exynos4210_mct.c @@ -55,6 +55,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "qemu/timer.h" #include "qemu/main-loop.h" #include "qemu/module.h" diff --git a/hw/timer/exynos4210_pwm.c b/hw/timer/exynos4210_pwm.c index 2af7b374cc..b7fad2ad44 100644 --- a/hw/timer/exynos4210_pwm.c +++ b/hw/timer/exynos4210_pwm.c @@ -23,6 +23,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "qemu/timer.h" #include "qemu/main-loop.h" #include "qemu/module.h" diff --git a/hw/timer/exynos4210_rtc.c b/hw/timer/exynos4210_rtc.c index b9dfaf51f7..561451059e 100644 --- a/hw/timer/exynos4210_rtc.c +++ b/hw/timer/exynos4210_rtc.c @@ -30,6 +30,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "qemu/timer.h" #include "qemu/bcd.h" #include "hw/ptimer.h" diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c index 17838df783..305704a339 100644 --- a/hw/timer/hpet.c +++ b/hw/timer/hpet.c @@ -35,6 +35,7 @@ #include "hw/timer/hpet.h" #include "hw/sysbus.h" #include "hw/timer/mc146818rtc.h" +#include "migration/vmstate.h" #include "hw/timer/i8254.h" //#define HPET_DEBUG diff --git a/hw/timer/i8254_common.c b/hw/timer/i8254_common.c index 3e980f2dee..062e8690c4 100644 --- a/hw/timer/i8254_common.c +++ b/hw/timer/i8254_common.c @@ -31,6 +31,7 @@ #include "hw/timer/i8254.h" #include "hw/timer/i8254_internal.h" #include "migration/qemu-file-types.h" +#include "migration/vmstate.h" /* val must be 0 or 1 */ void pit_set_gate(ISADevice *dev, int channel, int val) diff --git a/hw/timer/imx_epit.c b/hw/timer/imx_epit.c index afeb74339a..f54e059910 100644 --- a/hw/timer/imx_epit.c +++ b/hw/timer/imx_epit.c @@ -14,6 +14,7 @@ #include "qemu/osdep.h" #include "hw/timer/imx_epit.h" +#include "migration/vmstate.h" #include "hw/irq.h" #include "hw/misc/imx_ccm.h" #include "qemu/main-loop.h" diff --git a/hw/timer/imx_gpt.c b/hw/timer/imx_gpt.c index b4cfc52019..49a441f451 100644 --- a/hw/timer/imx_gpt.c +++ b/hw/timer/imx_gpt.c @@ -15,6 +15,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" #include "hw/timer/imx_gpt.h" +#include "migration/vmstate.h" #include "qemu/main-loop.h" #include "qemu/module.h" #include "qemu/log.h" diff --git a/hw/timer/lm32_timer.c b/hw/timer/lm32_timer.c index 4beffc1396..bfa9de76ba 100644 --- a/hw/timer/lm32_timer.c +++ b/hw/timer/lm32_timer.c @@ -25,6 +25,7 @@ #include "hw/hw.h" #include "hw/irq.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "trace.h" #include "qemu/timer.h" #include "hw/ptimer.h" diff --git a/hw/timer/m48t59.c b/hw/timer/m48t59.c index e2479c504a..1240315206 100644 --- a/hw/timer/m48t59.c +++ b/hw/timer/m48t59.c @@ -36,6 +36,7 @@ #include "qemu/module.h" #include "m48t59-internal.h" +#include "migration/vmstate.h" #define TYPE_M48TXX_SYS_BUS "sysbus-m48txx" #define M48TXX_SYS_BUS_GET_CLASS(obj) \ diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index 0410cccafa..b432662bc4 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -34,6 +34,7 @@ #include "sysemu/replay.h" #include "sysemu/reset.h" #include "hw/timer/mc146818rtc.h" +#include "migration/vmstate.h" #include "qapi/error.h" #include "qapi/qapi-commands-misc-target.h" #include "qapi/qapi-events-misc-target.h" diff --git a/hw/timer/milkymist-sysctl.c b/hw/timer/milkymist-sysctl.c index 0f9c39715d..7c56224710 100644 --- a/hw/timer/milkymist-sysctl.c +++ b/hw/timer/milkymist-sysctl.c @@ -25,6 +25,7 @@ #include "hw/hw.h" #include "hw/irq.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "sysemu/sysemu.h" #include "trace.h" #include "qemu/timer.h" diff --git a/hw/timer/mss-timer.c b/hw/timer/mss-timer.c index 1be9baf9c0..084e02199d 100644 --- a/hw/timer/mss-timer.c +++ b/hw/timer/mss-timer.c @@ -29,6 +29,7 @@ #include "qemu/log.h" #include "hw/irq.h" #include "hw/timer/mss-timer.h" +#include "migration/vmstate.h" #ifndef MSS_TIMER_ERR_DEBUG #define MSS_TIMER_ERR_DEBUG 0 diff --git a/hw/timer/nrf51_timer.c b/hw/timer/nrf51_timer.c index 297403c4fd..e04046eb15 100644 --- a/hw/timer/nrf51_timer.c +++ b/hw/timer/nrf51_timer.c @@ -17,6 +17,7 @@ #include "hw/arm/nrf51.h" #include "hw/irq.h" #include "hw/timer/nrf51_timer.h" +#include "migration/vmstate.h" #include "trace.h" #define TIMER_CLK_FREQ 16000000UL diff --git a/hw/timer/pl031.c b/hw/timer/pl031.c index 435c4a6c7e..39abd08643 100644 --- a/hw/timer/pl031.c +++ b/hw/timer/pl031.c @@ -14,6 +14,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "hw/timer/pl031.h" +#include "migration/vmstate.h" #include "hw/irq.h" #include "hw/sysbus.h" #include "qemu/timer.h" diff --git a/hw/timer/pxa2xx_timer.c b/hw/timer/pxa2xx_timer.c index 9c3b2b80ab..f61053b3c6 100644 --- a/hw/timer/pxa2xx_timer.c +++ b/hw/timer/pxa2xx_timer.c @@ -14,6 +14,7 @@ #include "sysemu/sysemu.h" #include "hw/arm/pxa.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/timer/slavio_timer.c b/hw/timer/slavio_timer.c index 310a0a126a..931ffd483f 100644 --- a/hw/timer/slavio_timer.c +++ b/hw/timer/slavio_timer.c @@ -27,6 +27,7 @@ #include "hw/irq.h" #include "hw/ptimer.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "trace.h" #include "qemu/main-loop.h" #include "qemu/module.h" diff --git a/hw/timer/stm32f2xx_timer.c b/hw/timer/stm32f2xx_timer.c index d7af928667..b41822f047 100644 --- a/hw/timer/stm32f2xx_timer.c +++ b/hw/timer/stm32f2xx_timer.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" #include "hw/timer/stm32f2xx_timer.h" +#include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/timer/twl92230.c b/hw/timer/twl92230.c index 795f894a39..6b2a25b9c9 100644 --- a/hw/timer/twl92230.c +++ b/hw/timer/twl92230.c @@ -26,6 +26,7 @@ #include "hw/i2c/i2c.h" #include "hw/irq.h" #include "migration/qemu-file-types.h" +#include "migration/vmstate.h" #include "sysemu/sysemu.h" #include "ui/console.h" #include "qemu/bcd.h" diff --git a/hw/timer/xlnx-zynqmp-rtc.c b/hw/timer/xlnx-zynqmp-rtc.c index 48c3fba677..5692db98c2 100644 --- a/hw/timer/xlnx-zynqmp-rtc.c +++ b/hw/timer/xlnx-zynqmp-rtc.c @@ -37,6 +37,7 @@ #include "sysemu/sysemu.h" #include "trace.h" #include "hw/timer/xlnx-zynqmp-rtc.h" +#include "migration/vmstate.h" #ifndef XLNX_ZYNQMP_RTC_ERR_DEBUG #define XLNX_ZYNQMP_RTC_ERR_DEBUG 0 diff --git a/hw/tpm/tpm_emulator.c b/hw/tpm/tpm_emulator.c index 1288cbcb8d..8648644008 100644 --- a/hw/tpm/tpm_emulator.c +++ b/hw/tpm/tpm_emulator.c @@ -37,6 +37,7 @@ #include "tpm_util.h" #include "tpm_ioctl.h" #include "migration/blocker.h" +#include "migration/vmstate.h" #include "qapi/error.h" #include "qapi/clone-visitor.h" #include "qapi/qapi-visit-tpm.h" diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c index 5cfe1e3050..3370d667ab 100644 --- a/hw/tpm/tpm_tis.c +++ b/hw/tpm/tpm_tis.c @@ -30,6 +30,7 @@ #include "hw/acpi/tpm.h" #include "hw/pci/pci_ids.h" +#include "migration/vmstate.h" #include "sysemu/tpm_backend.h" #include "tpm_int.h" #include "tpm_util.h" diff --git a/hw/usb/bus.c b/hw/usb/bus.c index a28e9e3b33..6aff15e504 100644 --- a/hw/usb/bus.c +++ b/hw/usb/bus.c @@ -6,6 +6,7 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "sysemu/sysemu.h" +#include "migration/vmstate.h" #include "monitor/monitor.h" #include "trace.h" #include "qemu/cutils.h" diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c index d1dac6e012..9e42547fc8 100644 --- a/hw/usb/ccid-card-passthru.c +++ b/hw/usb/ccid-card-passthru.c @@ -13,6 +13,7 @@ #include "qemu/units.h" #include #include "chardev/char-fe.h" +#include "migration/vmstate.h" #include "qemu/error-report.h" #include "qemu/module.h" #include "qemu/sockets.h" diff --git a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c index 718ab53cbb..d4074edfc3 100644 --- a/hw/usb/dev-audio.c +++ b/hw/usb/dev-audio.c @@ -32,6 +32,7 @@ #include "qemu/osdep.h" #include "qemu/module.h" #include "hw/usb.h" +#include "migration/vmstate.h" #include "desc.h" #include "hw/hw.h" #include "audio/audio.h" diff --git a/hw/usb/dev-bluetooth.c b/hw/usb/dev-bluetooth.c index 670ba32290..f6944fa74f 100644 --- a/hw/usb/dev-bluetooth.c +++ b/hw/usb/dev-bluetooth.c @@ -22,6 +22,7 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "hw/usb.h" +#include "migration/vmstate.h" #include "desc.h" #include "sysemu/bt.h" #include "hw/bt.h" diff --git a/hw/usb/dev-hid.c b/hw/usb/dev-hid.c index 62793eaf26..c7c65a8782 100644 --- a/hw/usb/dev-hid.c +++ b/hw/usb/dev-hid.c @@ -27,6 +27,7 @@ #include "hw/hw.h" #include "ui/console.h" #include "hw/usb.h" +#include "migration/vmstate.h" #include "desc.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/usb/dev-hub.c b/hw/usb/dev-hub.c index 89f55dd25c..886423bdec 100644 --- a/hw/usb/dev-hub.c +++ b/hw/usb/dev-hub.c @@ -27,6 +27,7 @@ #include "qemu/timer.h" #include "trace.h" #include "hw/usb.h" +#include "migration/vmstate.h" #include "desc.h" #include "qemu/error-report.h" #include "qemu/module.h" diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index fd1b3394a5..2e2a47ff7c 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -24,6 +24,7 @@ #include "qemu/filemonitor.h" #include "trace.h" #include "hw/usb.h" +#include "migration/vmstate.h" #include "desc.h" #include "qemu/units.h" diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c index 889069dd5a..db928d7cdf 100644 --- a/hw/usb/dev-network.c +++ b/hw/usb/dev-network.c @@ -26,6 +26,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/usb.h" +#include "migration/vmstate.h" #include "desc.h" #include "net/net.h" #include "qemu/error-report.h" diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c index b82f854103..039dc4889f 100644 --- a/hw/usb/dev-serial.c +++ b/hw/usb/dev-serial.c @@ -14,6 +14,7 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "hw/usb.h" +#include "migration/vmstate.h" #include "desc.h" #include "chardev/char-serial.h" #include "chardev/char-fe.h" diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c index 8d7e516fe7..57a0cbcae7 100644 --- a/hw/usb/dev-smartcard-reader.c +++ b/hw/usb/dev-smartcard-reader.c @@ -41,6 +41,7 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "hw/usb.h" +#include "migration/vmstate.h" #include "desc.h" #include "ccid.h" diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c index 9ffb88ea5b..8bc5d8728a 100644 --- a/hw/usb/dev-storage.c +++ b/hw/usb/dev-storage.c @@ -17,6 +17,7 @@ #include "desc.h" #include "hw/scsi/scsi.h" #include "ui/console.h" +#include "migration/vmstate.h" #include "monitor/monitor.h" #include "sysemu/sysemu.h" #include "sysemu/block-backend.h" diff --git a/hw/usb/dev-uas.c b/hw/usb/dev-uas.c index abd8070d0c..525bc1e590 100644 --- a/hw/usb/dev-uas.c +++ b/hw/usb/dev-uas.c @@ -17,6 +17,7 @@ #include "qemu/module.h" #include "hw/usb.h" +#include "migration/vmstate.h" #include "desc.h" #include "hw/scsi/scsi.h" #include "scsi/constants.h" diff --git a/hw/usb/dev-wacom.c b/hw/usb/dev-wacom.c index 8c43db9335..9a8a2d3081 100644 --- a/hw/usb/dev-wacom.c +++ b/hw/usb/dev-wacom.c @@ -30,6 +30,7 @@ #include "hw/hw.h" #include "ui/console.h" #include "hw/usb.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "desc.h" diff --git a/hw/usb/hcd-ehci-pci.c b/hw/usb/hcd-ehci-pci.c index 03d3a39067..7232dee882 100644 --- a/hw/usb/hcd-ehci-pci.c +++ b/hw/usb/hcd-ehci-pci.c @@ -17,6 +17,7 @@ #include "qemu/osdep.h" #include "hw/usb/hcd-ehci.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "qemu/range.h" diff --git a/hw/usb/hcd-ehci-sysbus.c b/hw/usb/hcd-ehci-sysbus.c index cd1f3c70a4..9a509f3b08 100644 --- a/hw/usb/hcd-ehci-sysbus.c +++ b/hw/usb/hcd-ehci-sysbus.c @@ -17,6 +17,7 @@ #include "qemu/osdep.h" #include "hw/usb/hcd-ehci.h" +#include "migration/vmstate.h" #include "qemu/module.h" static const VMStateDescription vmstate_ehci_sysbus = { diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c index d2189fc844..45ff4f4115 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -31,6 +31,7 @@ #include "hw/irq.h" #include "hw/usb/ehci-regs.h" #include "hw/usb/hcd-ehci.h" +#include "migration/vmstate.h" #include "trace.h" #include "qemu/error-report.h" diff --git a/hw/usb/hcd-ohci-pci.c b/hw/usb/hcd-ohci-pci.c index e8f372c6ad..67fcfc4d7c 100644 --- a/hw/usb/hcd-ohci-pci.c +++ b/hw/usb/hcd-ohci-pci.c @@ -23,6 +23,7 @@ #include "qapi/error.h" #include "qemu/timer.h" #include "hw/usb.h" +#include "migration/vmstate.h" #include "hw/pci/pci.h" #include "hw/sysbus.h" #include "hw/qdev-dma.h" diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c index 1ced5cd71a..438dfb4b83 100644 --- a/hw/usb/hcd-ohci.c +++ b/hw/usb/hcd-ohci.c @@ -32,6 +32,7 @@ #include "qemu/module.h" #include "qemu/timer.h" #include "hw/usb.h" +#include "migration/vmstate.h" #include "hw/sysbus.h" #include "hw/qdev-dma.h" #include "trace.h" diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c index 98bd5cf49d..887885efa0 100644 --- a/hw/usb/hcd-uhci.c +++ b/hw/usb/hcd-uhci.c @@ -30,6 +30,7 @@ #include "hw/hw.h" #include "hw/usb.h" #include "hw/usb/uhci-regs.h" +#include "migration/vmstate.h" #include "hw/pci/pci.h" #include "qapi/error.h" #include "qemu/timer.h" diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index 5894a18663..fc67476100 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -25,6 +25,7 @@ #include "qemu/module.h" #include "qemu/queue.h" #include "hw/usb.h" +#include "migration/vmstate.h" #include "hw/pci/pci.h" #include "hw/pci/msi.h" #include "hw/pci/msix.h" diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c index 83ebc51620..6f5338832a 100644 --- a/hw/usb/host-libusb.c +++ b/hw/usb/host-libusb.c @@ -40,6 +40,7 @@ #include #include "qapi/error.h" +#include "migration/vmstate.h" #include "monitor/monitor.h" #include "qemu/error-report.h" #include "qemu/module.h" diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index 846e60f3bb..84ec3d5219 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -42,6 +42,7 @@ #include "hw/usb.h" #include "migration/qemu-file-types.h" +#include "migration/vmstate.h" /* ERROR is defined below. Remove any previous definition. */ #undef ERROR diff --git a/hw/vfio/amd-xgbe.c b/hw/vfio/amd-xgbe.c index eedd48cfc1..96bd608b8d 100644 --- a/hw/vfio/amd-xgbe.c +++ b/hw/vfio/amd-xgbe.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "hw/vfio/vfio-amd-xgbe.h" +#include "migration/vmstate.h" #include "qemu/module.h" static void amd_xgbe_realize(DeviceState *dev, Error **errp) diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c index a995b86cd4..d1c86abb76 100644 --- a/hw/vfio/ap.c +++ b/hw/vfio/ap.c @@ -25,6 +25,7 @@ #include "qemu/config-file.h" #include "cpu.h" #include "kvm_s390x.h" +#include "migration/vmstate.h" #include "sysemu/sysemu.h" #include "hw/s390x/ap-bridge.h" #include "exec/address-spaces.h" diff --git a/hw/vfio/calxeda-xgmac.c b/hw/vfio/calxeda-xgmac.c index 59233e8d7e..87c382e736 100644 --- a/hw/vfio/calxeda-xgmac.c +++ b/hw/vfio/calxeda-xgmac.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "hw/vfio/vfio-calxeda-xgmac.h" +#include "migration/vmstate.h" #include "qemu/module.h" static void calxeda_xgmac_realize(DeviceState *dev, Error **errp) diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index d7a4e1875c..8a58ad670c 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -25,6 +25,7 @@ #include "hw/pci/msi.h" #include "hw/pci/msix.h" #include "hw/pci/pci_bridge.h" +#include "migration/vmstate.h" #include "qemu/error-report.h" #include "qemu/module.h" #include "qemu/option.h" diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c index 708df2ec0d..2ec9c9f49b 100644 --- a/hw/vfio/platform.c +++ b/hw/vfio/platform.c @@ -20,6 +20,7 @@ #include #include "hw/vfio/vfio-platform.h" +#include "migration/vmstate.h" #include "qemu/error-report.h" #include "qemu/module.h" #include "qemu/range.h" diff --git a/hw/watchdog/cmsdk-apb-watchdog.c b/hw/watchdog/cmsdk-apb-watchdog.c index a79da39dd5..3140e91959 100644 --- a/hw/watchdog/cmsdk-apb-watchdog.c +++ b/hw/watchdog/cmsdk-apb-watchdog.c @@ -31,6 +31,7 @@ #include "hw/irq.h" #include "hw/registerfields.h" #include "hw/watchdog/cmsdk-apb-watchdog.h" +#include "migration/vmstate.h" REG32(WDOGLOAD, 0x0) REG32(WDOGVALUE, 0x4) diff --git a/hw/watchdog/wdt_aspeed.c b/hw/watchdog/wdt_aspeed.c index 57fe24ae6b..49415f132d 100644 --- a/hw/watchdog/wdt_aspeed.c +++ b/hw/watchdog/wdt_aspeed.c @@ -17,6 +17,7 @@ #include "hw/misc/aspeed_scu.h" #include "hw/sysbus.h" #include "hw/watchdog/wdt_aspeed.h" +#include "migration/vmstate.h" #define WDT_STATUS (0x00 / 4) #define WDT_RELOAD_VALUE (0x04 / 4) diff --git a/hw/watchdog/wdt_diag288.c b/hw/watchdog/wdt_diag288.c index fec046ef09..5b6eb2b09f 100644 --- a/hw/watchdog/wdt_diag288.c +++ b/hw/watchdog/wdt_diag288.c @@ -17,6 +17,7 @@ #include "hw/sysbus.h" #include "qemu/timer.h" #include "hw/watchdog/wdt_diag288.h" +#include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/watchdog/wdt_i6300esb.c b/hw/watchdog/wdt_i6300esb.c index 6780f01add..288be8f73c 100644 --- a/hw/watchdog/wdt_i6300esb.c +++ b/hw/watchdog/wdt_i6300esb.c @@ -26,6 +26,7 @@ #include "sysemu/watchdog.h" #include "hw/hw.h" #include "hw/pci/pci.h" +#include "migration/vmstate.h" /*#define I6300ESB_DEBUG 1*/ diff --git a/hw/watchdog/wdt_ib700.c b/hw/watchdog/wdt_ib700.c index e0e5beb99d..e233945c2e 100644 --- a/hw/watchdog/wdt_ib700.c +++ b/hw/watchdog/wdt_ib700.c @@ -25,6 +25,7 @@ #include "sysemu/watchdog.h" #include "hw/hw.h" #include "hw/isa/isa.h" +#include "migration/vmstate.h" /*#define IB700_DEBUG 1*/ diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c index 0a2cce3c64..83103974ab 100644 --- a/hw/xtensa/xtfpga.c +++ b/hw/xtensa/xtfpga.c @@ -47,6 +47,7 @@ #include "bootparam.h" #include "xtensa_memory.h" #include "hw/xtensa/mx_pic.h" +#include "migration/vmstate.h" typedef struct XtfpgaFlashDesc { hwaddr base; diff --git a/include/hw/acpi/tco.h b/include/hw/acpi/tco.h index 8adb7a0d20..2e4c377246 100644 --- a/include/hw/acpi/tco.h +++ b/include/hw/acpi/tco.h @@ -10,7 +10,6 @@ #define HW_ACPI_TCO_H #include "exec/memory.h" -#include "migration/vmstate.h" /* As per ICH9 spec, the internal timer has an error of ~0.6s on every tick */ #define TCO_TICK_NSEC 600000000LL diff --git a/include/hw/block/flash.h b/include/hw/block/flash.h index 83a75f3170..1acaf7de80 100644 --- a/include/hw/block/flash.h +++ b/include/hw/block/flash.h @@ -4,7 +4,6 @@ /* NOR flash devices */ #include "exec/memory.h" -#include "migration/vmstate.h" /* pflash_cfi01.c */ diff --git a/include/hw/hw.h b/include/hw/hw.h index 86ff26b712..e547008b17 100644 --- a/include/hw/hw.h +++ b/include/hw/hw.h @@ -8,7 +8,6 @@ #include "qom/object.h" #include "exec/memory.h" -#include "migration/vmstate.h" void QEMU_NORETURN hw_error(const char *fmt, ...) GCC_FMT_ATTR(1, 2); diff --git a/include/hw/input/hid.h b/include/hw/input/hid.h index 2127c7ce45..6a9d7bf466 100644 --- a/include/hw/input/hid.h +++ b/include/hw/input/hid.h @@ -1,7 +1,6 @@ #ifndef QEMU_HID_H #define QEMU_HID_H -#include "migration/vmstate.h" #include "ui/input.h" #define HID_MOUSE 1 diff --git a/include/hw/pci/shpc.h b/include/hw/pci/shpc.h index bd8204f64e..d5683b7399 100644 --- a/include/hw/pci/shpc.h +++ b/include/hw/pci/shpc.h @@ -4,6 +4,7 @@ #include "exec/memory.h" #include "hw/hotplug.h" #include "hw/pci/pci.h" +#include "migration/vmstate.h" struct SHPCDevice { /* Capability offset in device's config space */ diff --git a/include/hw/ppc/spapr_ovec.h b/include/hw/ppc/spapr_ovec.h index 5de5ecf5de..7891e9caac 100644 --- a/include/hw/ppc/spapr_ovec.h +++ b/include/hw/ppc/spapr_ovec.h @@ -38,7 +38,6 @@ #define SPAPR_OVEC_H #include "cpu.h" -#include "migration/vmstate.h" typedef struct SpaprOptionVector SpaprOptionVector; diff --git a/include/hw/ptimer.h b/include/hw/ptimer.h index 2b866902aa..9c77055229 100644 --- a/include/hw/ptimer.h +++ b/include/hw/ptimer.h @@ -9,7 +9,6 @@ #define PTIMER_H #include "qemu/timer.h" -#include "migration/vmstate.h" /* The ptimer API implements a simple periodic countdown timer. * The countdown timer has a value (which can be read and written via diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h index b189788cb2..5da749e2b0 100644 --- a/include/hw/virtio/virtio.h +++ b/include/hw/virtio/virtio.h @@ -18,6 +18,7 @@ #include "net/net.h" #include "hw/qdev.h" #include "sysemu/sysemu.h" +#include "migration/vmstate.h" #include "qemu/event_notifier.h" #include "standard-headers/linux/virtio_config.h" #include "standard-headers/linux/virtio_ring.h" diff --git a/include/net/net.h b/include/net/net.h index acf0451fc4..e175ba9677 100644 --- a/include/net/net.h +++ b/include/net/net.h @@ -4,7 +4,6 @@ #include "qemu/queue.h" #include "qapi/qapi-types-net.h" #include "net/queue.h" -#include "migration/vmstate.h" #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/qemu/fifo8.h b/include/qemu/fifo8.h index 24b364462d..489c354291 100644 --- a/include/qemu/fifo8.h +++ b/include/qemu/fifo8.h @@ -1,7 +1,6 @@ #ifndef QEMU_FIFO8_H #define QEMU_FIFO8_H -#include "migration/vmstate.h" typedef struct { /* All fields are private */ diff --git a/migration/savevm.c b/migration/savevm.c index 79ed44d475..89e8f4c180 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -32,6 +32,7 @@ #include "net/net.h" #include "migration.h" #include "migration/snapshot.h" +#include "migration/vmstate.h" #include "migration/misc.h" #include "migration/register.h" #include "migration/global_state.h" diff --git a/target/alpha/machine.c b/target/alpha/machine.c index fdab596438..5688df6996 100644 --- a/target/alpha/machine.c +++ b/target/alpha/machine.c @@ -3,6 +3,7 @@ #include "hw/hw.h" #include "hw/boards.h" #include "migration/cpu.h" +#include "migration/vmstate.h" static int get_fpcr(QEMUFile *f, void *opaque, size_t size, const VMStateField *field) diff --git a/target/arm/machine.c b/target/arm/machine.c index 3fd319a309..fe1c7db783 100644 --- a/target/arm/machine.c +++ b/target/arm/machine.c @@ -7,6 +7,7 @@ #include "kvm_arm.h" #include "internals.h" #include "migration/cpu.h" +#include "migration/vmstate.h" static bool vfp_needed(void *opaque) { diff --git a/target/cris/machine.c b/target/cris/machine.c index ecec41c2c8..f9c764bf2e 100644 --- a/target/cris/machine.c +++ b/target/cris/machine.c @@ -22,6 +22,7 @@ #include "cpu.h" #include "hw/hw.h" #include "migration/cpu.h" +#include "migration/vmstate.h" static const VMStateDescription vmstate_tlbset = { .name = "cpu/tlbset", diff --git a/target/hppa/machine.c b/target/hppa/machine.c index 73e8121bde..140eaa95d8 100644 --- a/target/hppa/machine.c +++ b/target/hppa/machine.c @@ -22,6 +22,7 @@ #include "hw/hw.h" #include "hw/boards.h" #include "migration/cpu.h" +#include "migration/vmstate.h" #if TARGET_REGISTER_BITS == 64 #define qemu_put_betr qemu_put_be64 diff --git a/target/i386/machine.c b/target/i386/machine.c index 704ba6de46..d564eb55b0 100644 --- a/target/i386/machine.c +++ b/target/i386/machine.c @@ -6,6 +6,7 @@ #include "hw/i386/pc.h" #include "hw/isa/isa.h" #include "migration/cpu.h" +#include "migration/vmstate.h" #include "hyperv.h" #include "sysemu/kvm.h" diff --git a/target/lm32/machine.c b/target/lm32/machine.c index cc46f77324..4a72887f60 100644 --- a/target/lm32/machine.c +++ b/target/lm32/machine.c @@ -3,6 +3,7 @@ #include "hw/hw.h" #include "hw/boards.h" #include "migration/cpu.h" +#include "migration/vmstate.h" static const VMStateDescription vmstate_env = { .name = "env", diff --git a/target/mips/machine.c b/target/mips/machine.c index eb2d97001d..ff85542571 100644 --- a/target/mips/machine.c +++ b/target/mips/machine.c @@ -3,6 +3,7 @@ #include "internal.h" #include "hw/hw.h" #include "migration/cpu.h" +#include "migration/vmstate.h" static int cpu_post_load(void *opaque, int version_id) { diff --git a/target/moxie/machine.c b/target/moxie/machine.c index 322a724e6f..0d6012603e 100644 --- a/target/moxie/machine.c +++ b/target/moxie/machine.c @@ -4,6 +4,7 @@ #include "hw/boards.h" #include "machine.h" #include "migration/cpu.h" +#include "migration/vmstate.h" const VMStateDescription vmstate_moxie_cpu = { .name = "cpu", diff --git a/target/openrisc/machine.c b/target/openrisc/machine.c index 9fa285217d..1332a2c0ee 100644 --- a/target/openrisc/machine.c +++ b/target/openrisc/machine.c @@ -22,6 +22,7 @@ #include "hw/hw.h" #include "hw/boards.h" #include "migration/cpu.h" +#include "migration/vmstate.h" static const VMStateDescription vmstate_tlb_entry = { .name = "tlb_entry", diff --git a/target/ppc/machine.c b/target/ppc/machine.c index e82f5de9db..f1cd41aeb4 100644 --- a/target/ppc/machine.c +++ b/target/ppc/machine.c @@ -7,6 +7,7 @@ #include "helper_regs.h" #include "mmu-hash64.h" #include "migration/cpu.h" +#include "migration/vmstate.h" #include "qapi/error.h" #include "kvm_ppc.h" #include "exec/helper-proto.h" diff --git a/target/s390x/machine.c b/target/s390x/machine.c index 1e9526e937..12a2cd65b0 100644 --- a/target/s390x/machine.c +++ b/target/s390x/machine.c @@ -19,6 +19,7 @@ #include "cpu.h" #include "internal.h" #include "kvm_s390x.h" +#include "migration/vmstate.h" #include "tcg_s390x.h" #include "sysemu/kvm.h" #include "sysemu/tcg.h" diff --git a/target/sparc/machine.c b/target/sparc/machine.c index 32d453c008..f7dabea326 100644 --- a/target/sparc/machine.c +++ b/target/sparc/machine.c @@ -6,6 +6,7 @@ #include "qemu/timer.h" #include "migration/cpu.h" +#include "migration/vmstate.h" #ifdef TARGET_SPARC64 static const VMStateDescription vmstate_cpu_timer = { diff --git a/util/fifo8.c b/util/fifo8.c index a9aa20a9f7..a5dd789ce5 100644 --- a/util/fifo8.c +++ b/util/fifo8.c @@ -13,6 +13,7 @@ */ #include "qemu/osdep.h" +#include "migration/vmstate.h" #include "qemu/fifo8.h" void fifo8_create(Fifo8 *fifo, uint32_t capacity) From patchwork Fri Jul 26 12:05:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 11060883 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 442E9746 for ; Fri, 26 Jul 2019 12:07:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 32B0028812 for ; Fri, 26 Jul 2019 12:07:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2729E28AA8; Fri, 26 Jul 2019 12:07:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4DB0828812 for ; Fri, 26 Jul 2019 12:07:50 +0000 (UTC) Received: from localhost ([::1]:39266 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqz0l-0004Ro-51 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 26 Jul 2019 08:07:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58752) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqyz0-0005WN-GE for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:06:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqyyt-00086p-0t for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56022) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqyys-0007sv-7K for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:50 -0400 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 9EC1885550 for ; Fri, 26 Jul 2019 12:05:47 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3B6A836FB for ; Fri, 26 Jul 2019 12:05:47 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id D4477113274A; Fri, 26 Jul 2019 14:05:42 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 26 Jul 2019 14:05:30 +0200 Message-Id: <20190726120542.9894-17-armbru@redhat.com> In-Reply-To: <20190726120542.9894-1-armbru@redhat.com> References: <20190726120542.9894-1-armbru@redhat.com> MIME-Version: 1.0 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.28]); Fri, 26 Jul 2019 12:05:47 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 16/28] Include exec/memory.h slightly less X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Drop unnecessary inclusions from headers. Downgrade a few more to exec/hwaddr.h. Signed-off-by: Markus Armbruster --- hw/audio/lm4549.h | 1 + hw/display/edid-region.c | 1 + hw/display/tc6393xb.c | 1 + hw/net/can/can_sja1000.h | 1 + hw/net/ne2000.c | 1 + hw/xtensa/xtensa_memory.h | 1 - include/hw/arm/boot.h | 1 - include/hw/arm/fsl-imx7.h | 1 - include/hw/arm/soc_dma.h | 2 +- include/hw/block/flash.h | 2 +- include/hw/boards.h | 1 + include/hw/char/parallel.h | 1 - include/hw/display/milkymist_tmu2.h | 1 + include/hw/display/tc6393xb.h | 2 -- include/hw/display/vga.h | 2 +- include/hw/hw.h | 1 - include/hw/i2c/pm_smbus.h | 1 + include/hw/i2c/smbus_eeprom.h | 1 + include/hw/misc/auxbus.h | 1 + include/hw/ppc/xics.h | 1 + include/hw/usb.h | 1 + include/hw/virtio/virtio.h | 1 + migration/colo.c | 1 + migration/migration.h | 1 + migration/postcopy-ram.c | 1 + migration/rdma.c | 1 + 26 files changed, 20 insertions(+), 10 deletions(-) diff --git a/hw/audio/lm4549.h b/hw/audio/lm4549.h index 74c3ee8934..aba9bb5b07 100644 --- a/hw/audio/lm4549.h +++ b/hw/audio/lm4549.h @@ -13,6 +13,7 @@ #define HW_LM4549_H #include "audio/audio.h" +#include "exec/hwaddr.h" typedef void (*lm4549_callback)(void *opaque); diff --git a/hw/display/edid-region.c b/hw/display/edid-region.c index d0d31bad3d..675429dc18 100644 --- a/hw/display/edid-region.c +++ b/hw/display/edid-region.c @@ -1,4 +1,5 @@ #include "qemu/osdep.h" +#include "exec/memory.h" #include "hw/display/edid.h" static uint64_t edid_region_read(void *ptr, hwaddr addr, unsigned size) diff --git a/hw/display/tc6393xb.c b/hw/display/tc6393xb.c index 10e7f74c74..74a77eb43b 100644 --- a/hw/display/tc6393xb.c +++ b/hw/display/tc6393xb.c @@ -17,6 +17,7 @@ #include "hw/hw.h" #include "hw/irq.h" #include "hw/display/tc6393xb.h" +#include "exec/memory.h" #include "hw/block/flash.h" #include "ui/console.h" #include "ui/pixel_ops.h" diff --git a/hw/net/can/can_sja1000.h b/hw/net/can/can_sja1000.h index 4731cbbd2a..220a622087 100644 --- a/hw/net/can/can_sja1000.h +++ b/hw/net/can/can_sja1000.h @@ -27,6 +27,7 @@ #ifndef HW_CAN_SJA1000_H #define HW_CAN_SJA1000_H +#include "exec/hwaddr.h" #include "net/can_emu.h" #define CAN_SJA_MEM_SIZE 128 diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c index 7731b5acd1..a1a1046494 100644 --- a/hw/net/ne2000.c +++ b/hw/net/ne2000.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "net/eth.h" #include "qemu/module.h" +#include "exec/memory.h" #include "hw/irq.h" #include "migration/vmstate.h" #include "ne2000.h" diff --git a/hw/xtensa/xtensa_memory.h b/hw/xtensa/xtensa_memory.h index d50a3cccc0..af7e8025e3 100644 --- a/hw/xtensa/xtensa_memory.h +++ b/hw/xtensa/xtensa_memory.h @@ -29,7 +29,6 @@ #define XTENSA_MEMORY_H #include "cpu.h" -#include "exec/memory.h" void xtensa_create_memory_regions(const XtensaMemory *memory, const char *name, diff --git a/include/hw/arm/boot.h b/include/hw/arm/boot.h index 350d4b0498..5714dea1a2 100644 --- a/include/hw/arm/boot.h +++ b/include/hw/arm/boot.h @@ -11,7 +11,6 @@ #ifndef HW_ARM_BOOT_H #define HW_ARM_BOOT_H -#include "exec/memory.h" #include "target/arm/cpu-qom.h" #include "qemu/notify.h" diff --git a/include/hw/arm/fsl-imx7.h b/include/hw/arm/fsl-imx7.h index 8003d45d1e..706aef2e7e 100644 --- a/include/hw/arm/fsl-imx7.h +++ b/include/hw/arm/fsl-imx7.h @@ -38,7 +38,6 @@ #include "hw/net/imx_fec.h" #include "hw/pci-host/designware.h" #include "hw/usb/chipidea.h" -#include "exec/memory.h" #include "cpu.h" #define TYPE_FSL_IMX7 "fsl,imx7" diff --git a/include/hw/arm/soc_dma.h b/include/hw/arm/soc_dma.h index 7886291d54..e93a7499a8 100644 --- a/include/hw/arm/soc_dma.h +++ b/include/hw/arm/soc_dma.h @@ -21,7 +21,7 @@ #ifndef HW_SOC_DMA_H #define HW_SOC_DMA_H -#include "exec/memory.h" +#include "exec/hwaddr.h" struct soc_dma_s; struct soc_dma_ch_s; diff --git a/include/hw/block/flash.h b/include/hw/block/flash.h index 1acaf7de80..2136a2d5e4 100644 --- a/include/hw/block/flash.h +++ b/include/hw/block/flash.h @@ -3,7 +3,7 @@ /* NOR flash devices */ -#include "exec/memory.h" +#include "exec/hwaddr.h" /* pflash_cfi01.c */ diff --git a/include/hw/boards.h b/include/hw/boards.h index a71d1a53a5..3a0be3131a 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -3,6 +3,7 @@ #ifndef HW_BOARDS_H #define HW_BOARDS_H +#include "exec/memory.h" #include "sysemu/blockdev.h" #include "sysemu/accel.h" #include "hw/qdev.h" diff --git a/include/hw/char/parallel.h b/include/hw/char/parallel.h index d6dd62fb9f..0a23c0f57e 100644 --- a/include/hw/char/parallel.h +++ b/include/hw/char/parallel.h @@ -1,7 +1,6 @@ #ifndef HW_PARALLEL_H #define HW_PARALLEL_H -#include "exec/memory.h" #include "hw/isa/isa.h" #include "chardev/char.h" diff --git a/include/hw/display/milkymist_tmu2.h b/include/hw/display/milkymist_tmu2.h index 148a119a1d..1fd978dcc5 100644 --- a/include/hw/display/milkymist_tmu2.h +++ b/include/hw/display/milkymist_tmu2.h @@ -27,6 +27,7 @@ #ifndef HW_DISPLAY_MILKYMIST_TMU2_H #define HW_DISPLAY_MILKYMIST_TMU2_H +#include "exec/hwaddr.h" #include "hw/qdev.h" #if defined(CONFIG_X11) && defined(CONFIG_OPENGL) diff --git a/include/hw/display/tc6393xb.h b/include/hw/display/tc6393xb.h index c653ef717b..f9263bf98a 100644 --- a/include/hw/display/tc6393xb.h +++ b/include/hw/display/tc6393xb.h @@ -12,8 +12,6 @@ #ifndef HW_DISPLAY_TC6393XB_H #define HW_DISPLAY_TC6393XB_H -#include "exec/memory.h" - typedef struct TC6393xbState TC6393xbState; TC6393xbState *tc6393xb_init(struct MemoryRegion *sysmem, diff --git a/include/hw/display/vga.h b/include/hw/display/vga.h index 0401a3a292..ca0003dbfd 100644 --- a/include/hw/display/vga.h +++ b/include/hw/display/vga.h @@ -9,7 +9,7 @@ #ifndef QEMU_HW_DISPLAY_VGA_H #define QEMU_HW_DISPLAY_VGA_H -#include "exec/memory.h" +#include "exec/hwaddr.h" enum vga_retrace_method { VGA_RETRACE_DUMB, diff --git a/include/hw/hw.h b/include/hw/hw.h index e547008b17..8e18358e6a 100644 --- a/include/hw/hw.h +++ b/include/hw/hw.h @@ -7,7 +7,6 @@ #endif #include "qom/object.h" -#include "exec/memory.h" void QEMU_NORETURN hw_error(const char *fmt, ...) GCC_FMT_ATTR(1, 2); diff --git a/include/hw/i2c/pm_smbus.h b/include/hw/i2c/pm_smbus.h index fb55c44444..0d74207efb 100644 --- a/include/hw/i2c/pm_smbus.h +++ b/include/hw/i2c/pm_smbus.h @@ -1,6 +1,7 @@ #ifndef PM_SMBUS_H #define PM_SMBUS_H +#include "exec/memory.h" #include "hw/i2c/smbus_master.h" #define PM_SMBUS_MAX_MSG_SIZE 32 diff --git a/include/hw/i2c/smbus_eeprom.h b/include/hw/i2c/smbus_eeprom.h index 0f96836bab..15e2151b50 100644 --- a/include/hw/i2c/smbus_eeprom.h +++ b/include/hw/i2c/smbus_eeprom.h @@ -23,6 +23,7 @@ #ifndef HW_SMBUS_EEPROM_H #define HW_SMBUS_EEPROM_H +#include "exec/cpu-common.h" #include "hw/i2c/i2c.h" void smbus_eeprom_init_one(I2CBus *bus, uint8_t address, uint8_t *eeprom_buf); diff --git a/include/hw/misc/auxbus.h b/include/hw/misc/auxbus.h index c15b444748..ee0ca3dd51 100644 --- a/include/hw/misc/auxbus.h +++ b/include/hw/misc/auxbus.h @@ -25,6 +25,7 @@ #ifndef HW_MISC_AUXBUS_H #define HW_MISC_AUXBUS_H +#include "exec/memory.h" #include "hw/qdev.h" typedef struct AUXBus AUXBus; diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index 1eb7b5cd68..457aa98f81 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -28,6 +28,7 @@ #ifndef XICS_H #define XICS_H +#include "exec/memory.h" #include "hw/qdev.h" #define XICS_IPI 0x2 diff --git a/include/hw/usb.h b/include/hw/usb.h index c21f41c8a9..96971a4c26 100644 --- a/include/hw/usb.h +++ b/include/hw/usb.h @@ -25,6 +25,7 @@ * THE SOFTWARE. */ +#include "exec/memory.h" #include "hw/qdev.h" #include "qemu/iov.h" #include "qemu/queue.h" diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h index 5da749e2b0..e6a2a0a6e0 100644 --- a/include/hw/virtio/virtio.h +++ b/include/hw/virtio/virtio.h @@ -14,6 +14,7 @@ #ifndef QEMU_VIRTIO_H #define QEMU_VIRTIO_H +#include "exec/memory.h" #include "hw/hw.h" #include "net/net.h" #include "hw/qdev.h" diff --git a/migration/colo.c b/migration/colo.c index 9f84b1fa3c..0b5b620391 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -23,6 +23,7 @@ #include "io/channel-buffer.h" #include "trace.h" #include "qemu/error-report.h" +#include "qemu/rcu.h" #include "migration/failover.h" #ifdef CONFIG_REPLICATION #include "replication.h" diff --git a/migration/migration.h b/migration/migration.h index 26f01d00f6..a7882af67a 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -14,6 +14,7 @@ #ifndef QEMU_MIGRATION_H #define QEMU_MIGRATION_H +#include "exec/cpu-common.h" #include "qapi/qapi-types-migration.h" #include "qemu/thread.h" #include "qemu/coroutine_int.h" diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c index 9faacacc9e..56054d0a73 100644 --- a/migration/postcopy-ram.c +++ b/migration/postcopy-ram.c @@ -25,6 +25,7 @@ #include "ram.h" #include "qapi/error.h" #include "qemu/notify.h" +#include "qemu/rcu.h" #include "sysemu/sysemu.h" #include "sysemu/balloon.h" #include "qemu/error-report.h" diff --git a/migration/rdma.c b/migration/rdma.c index 3036221ee8..b0e27b6174 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -25,6 +25,7 @@ #include "qemu/error-report.h" #include "qemu/main-loop.h" #include "qemu/module.h" +#include "qemu/rcu.h" #include "qemu/sockets.h" #include "qemu/bitmap.h" #include "qemu/coroutine.h" From patchwork Fri Jul 26 12:05:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 11060881 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9C49C13A0 for ; Fri, 26 Jul 2019 12:07:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8B31F28812 for ; Fri, 26 Jul 2019 12:07:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7F4E528AA8; Fri, 26 Jul 2019 12:07:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 60B6628812 for ; Fri, 26 Jul 2019 12:07:36 +0000 (UTC) Received: from localhost ([::1]:39260 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqz0Z-0003rx-7C for patchwork-qemu-devel@patchwork.kernel.org; Fri, 26 Jul 2019 08:07:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58638) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqyyw-0005W0-5R for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqyyr-000831-SZ for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51780) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqyyr-0007sh-B1 for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:49 -0400 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 7C501300D1C9 for ; Fri, 26 Jul 2019 12:05:47 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 487C060C18 for ; Fri, 26 Jul 2019 12:05:47 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id DCAB911326EA; Fri, 26 Jul 2019 14:05:42 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 26 Jul 2019 14:05:31 +0200 Message-Id: <20190726120542.9894-18-armbru@redhat.com> In-Reply-To: <20190726120542.9894-1-armbru@redhat.com> References: <20190726120542.9894-1-armbru@redhat.com> MIME-Version: 1.0 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.40]); Fri, 26 Jul 2019 12:05:47 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 17/28] Include qom/object.h slightly less X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP hw/hw.h used to include headers hardware emulation "usually" needs. The previous commits removed all but one of them, to good effect. Only qom/object.h is left. Remove that one, too. Signed-off-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daudé --- include/hw/display/edid.h | 2 +- include/hw/hw.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/include/hw/display/edid.h b/include/hw/display/edid.h index 7948bd2c40..ff99dc0a05 100644 --- a/include/hw/display/edid.h +++ b/include/hw/display/edid.h @@ -1,7 +1,7 @@ #ifndef EDID_H #define EDID_H -#include "hw/hw.h" +#include "qom/object.h" typedef struct qemu_edid_info { const char *vendor; /* http://www.uefi.org/pnp_id_list */ diff --git a/include/hw/hw.h b/include/hw/hw.h index 8e18358e6a..8079b911fa 100644 --- a/include/hw/hw.h +++ b/include/hw/hw.h @@ -6,8 +6,6 @@ #error Cannot include hw/hw.h from user emulation #endif -#include "qom/object.h" - void QEMU_NORETURN hw_error(const char *fmt, ...) GCC_FMT_ATTR(1, 2); #endif From patchwork Fri Jul 26 12:05:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 11060917 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DF44C746 for ; Fri, 26 Jul 2019 12:09:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C123D28AA5 for ; Fri, 26 Jul 2019 12:09:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B0FC728AAA; Fri, 26 Jul 2019 12:09:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3CCA728AA5 for ; Fri, 26 Jul 2019 12:09:45 +0000 (UTC) Received: from localhost ([::1]:39334 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqz2e-0004WC-94 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 26 Jul 2019 08:09:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58982) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqyz3-0005q0-HR for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:06:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqyys-00084s-Bg for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:06:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52840) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqyyr-0007wG-FJ for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:50 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5800981F25 for ; Fri, 26 Jul 2019 12:05:48 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 49DEC60148 for ; Fri, 26 Jul 2019 12:05:47 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id EACC811326ED; Fri, 26 Jul 2019 14:05:42 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 26 Jul 2019 14:05:32 +0200 Message-Id: <20190726120542.9894-19-armbru@redhat.com> In-Reply-To: <20190726120542.9894-1-armbru@redhat.com> References: <20190726120542.9894-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Fri, 26 Jul 2019 12:05:48 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 18/28] Include hw/hw.h exactly where needed X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP In my "build everything" tree, changing hw/hw.h triggers a recompile of some 2600 out of 6600 objects (not counting tests and objects that don't depend on qemu/osdep.h). The previous commits have left only the declaration of hw_error() in hw/hw.h. This permits dropping most of its inclusions. Touching it now recompiles less than 200 objects. Signed-off-by: Markus Armbruster Reviewed-by: Alistair Francis --- accel/kvm/kvm-all.c | 1 - audio/audio.c | 1 - audio/spiceaudio.c | 1 - audio/wavcapture.c | 1 - cpus.c | 1 + device-hotplug.c | 1 - exec.c | 1 - hw/9pfs/xen-9p-backend.c | 1 - hw/acpi/core.c | 1 - hw/acpi/cpu_hotplug.c | 1 - hw/acpi/ich9.c | 1 - hw/acpi/pcihp.c | 1 - hw/acpi/piix4.c | 1 - hw/adc/stm32f2xx_adc.c | 1 - hw/alpha/dp264.c | 1 - hw/alpha/typhoon.c | 1 - hw/arm/boot.c | 1 - hw/arm/collie.c | 1 - hw/arm/gumstix.c | 1 - hw/arm/integratorcp.c | 1 + hw/arm/mainstone.c | 1 - hw/arm/musicpal.c | 1 + hw/arm/omap2.c | 1 - hw/arm/omap_sx1.c | 1 - hw/arm/palm.c | 1 - hw/arm/pxa2xx_pic.c | 1 - hw/arm/spitz.c | 1 - hw/arm/tosa.c | 1 - hw/arm/virt-acpi-build.c | 1 - hw/arm/z2.c | 1 - hw/audio/ac97.c | 1 - hw/audio/adlib.c | 1 - hw/audio/cs4231a.c | 1 - hw/audio/es1370.c | 1 - hw/audio/gus.c | 1 - hw/audio/hda-codec.c | 1 - hw/audio/intel-hda.c | 1 - hw/audio/marvell_88w8618.c | 1 - hw/audio/milkymist-ac97.c | 1 - hw/audio/pcspk.c | 1 - hw/audio/sb16.c | 1 - hw/block/dataplane/xen-block.c | 1 - hw/block/ecc.c | 1 - hw/block/fdc.c | 1 - hw/block/m25p80.c | 1 - hw/block/nvme.c | 1 - hw/block/pflash_cfi01.c | 1 - hw/block/pflash_cfi02.c | 1 - hw/block/tc58128.c | 1 - hw/block/xen-block.c | 1 - hw/char/debugcon.c | 1 - hw/char/digic-uart.c | 1 - hw/char/escc.c | 1 - hw/char/lm32_juart.c | 1 - hw/char/lm32_uart.c | 1 - hw/char/mcf_uart.c | 1 - hw/char/milkymist-uart.c | 1 - hw/char/omap_uart.c | 1 - hw/char/parallel.c | 1 - hw/char/sh_serial.c | 1 - hw/char/xen_console.c | 1 - hw/char/xilinx_uartlite.c | 1 + hw/core/empty_slot.c | 1 - hw/core/null-machine.c | 1 - hw/core/ptimer.c | 1 - hw/cris/boot.c | 1 - hw/display/ati.c | 1 - hw/display/bcm2835_fb.c | 1 + hw/display/bochs-display.c | 1 - hw/display/cirrus_vga.c | 1 - hw/display/cirrus_vga_isa.c | 1 - hw/display/exynos4210_fimd.c | 1 + hw/display/framebuffer.c | 1 - hw/display/milkymist-tmu2.c | 1 - hw/display/omap_lcdc.c | 1 - hw/display/qxl.h | 1 - hw/display/sm501.c | 1 - hw/display/tc6393xb.c | 1 - hw/display/vga-isa-mm.c | 1 - hw/display/vga-isa.c | 1 - hw/display/vga-pci.c | 1 - hw/display/vga.c | 1 - hw/display/virtio-vga.c | 1 - hw/display/vmware_vga.c | 1 - hw/display/xenfb.c | 1 - hw/dma/i8257.c | 1 - hw/dma/pl080.c | 1 + hw/dma/puv3_dma.c | 1 - hw/dma/rc4030.c | 1 - hw/dma/sparc32_dma.c | 1 - hw/dma/xilinx_axidma.c | 1 + hw/gpio/max7310.c | 1 + hw/gpio/omap_gpio.c | 1 - hw/gpio/puv3_gpio.c | 1 - hw/gpio/zaurus.c | 1 - hw/hppa/dino.c | 1 - hw/hppa/machine.c | 1 - hw/i2c/bitbang_i2c.c | 1 - hw/i2c/omap_i2c.c | 1 - hw/i2c/pm_smbus.c | 1 - hw/i2c/ppc4xx_i2c.c | 1 - hw/i2c/smbus_eeprom.c | 1 - hw/i2c/smbus_ich9.c | 1 - hw/i2c/smbus_master.c | 1 - hw/i2c/smbus_slave.c | 1 - hw/i386/amd_iommu.h | 1 - hw/i386/multiboot.c | 1 - hw/i386/pc.c | 1 - hw/i386/pc_piix.c | 1 - hw/i386/pc_q35.c | 1 - hw/i386/pc_sysfw.c | 1 - hw/i386/vmmouse.c | 1 - hw/i386/vmport.c | 1 - hw/i386/xen/xen-hvm.c | 1 + hw/i386/xen/xen_platform.c | 1 - hw/i386/xen/xen_pvdevice.c | 1 - hw/ide/ahci-allwinner.c | 1 - hw/ide/ahci.c | 1 - hw/ide/cmd646.c | 1 - hw/ide/core.c | 1 - hw/ide/ich.c | 1 - hw/ide/ioport.c | 1 - hw/ide/isa.c | 1 - hw/ide/macio.c | 1 - hw/ide/microdrive.c | 1 - hw/ide/mmio.c | 1 - hw/ide/pci.c | 1 - hw/ide/piix.c | 1 - hw/ide/qdev.c | 1 - hw/ide/via.c | 1 - hw/input/hid.c | 1 - hw/input/lm832x.c | 1 - hw/input/milkymist-softusb.c | 1 - hw/input/pckbd.c | 1 - hw/input/ps2.c | 1 - hw/input/stellaris_input.c | 1 - hw/input/tsc2005.c | 1 - hw/intc/etraxfs_pic.c | 1 - hw/intc/exynos4210_combiner.c | 1 + hw/intc/heathrow_pic.c | 1 - hw/intc/i8259.c | 1 - hw/intc/ioapic.c | 1 - hw/intc/lm32_pic.c | 1 - hw/intc/mips_gic.c | 1 - hw/intc/omap_intc.c | 1 - hw/intc/ompic.c | 1 - hw/intc/openpic.c | 1 - hw/intc/openpic_kvm.c | 1 - hw/intc/sh_intc.c | 1 - hw/intc/xics.c | 1 - hw/intc/xics_kvm.c | 1 - hw/intc/xics_spapr.c | 1 - hw/intc/xilinx_intc.c | 1 - hw/ipmi/ipmi.c | 1 - hw/ipmi/isa_ipmi_bt.c | 1 - hw/ipmi/isa_ipmi_kcs.c | 1 - hw/isa/apm.c | 1 - hw/isa/lpc_ich9.c | 1 - hw/isa/piix4.c | 1 - hw/isa/vt82c686.c | 1 - hw/lm32/lm32_boards.c | 1 - hw/lm32/milkymist.c | 1 - hw/m68k/an5206.c | 1 - hw/microblaze/boot.h | 1 - hw/microblaze/petalogix_ml605_mmu.c | 1 - hw/microblaze/petalogix_s3adsp1800_mmu.c | 1 - hw/mips/addr.c | 1 - hw/mips/boston.c | 1 - hw/mips/gt64xxx_pci.c | 1 - hw/mips/mips_fulong2e.c | 1 - hw/mips/mips_int.c | 1 - hw/mips/mips_jazz.c | 1 - hw/mips/mips_malta.c | 1 - hw/mips/mips_mipssim.c | 1 - hw/mips/mips_r4k.c | 1 - hw/misc/applesmc.c | 1 - hw/misc/arm_integrator_debug.c | 1 - hw/misc/arm_sysctl.c | 1 - hw/misc/debugexit.c | 1 - hw/misc/edu.c | 1 + hw/misc/ivshmem.c | 1 - hw/misc/macio/cuda.c | 1 - hw/misc/macio/gpio.c | 1 - hw/misc/macio/mac_dbdma.c | 1 - hw/misc/macio/macio.c | 1 - hw/misc/macio/pmu.c | 1 - hw/misc/milkymist-hpdmc.c | 1 - hw/misc/milkymist-pfpu.c | 1 - hw/misc/mips_cmgcr.c | 1 - hw/misc/mos6522.c | 1 - hw/misc/mst_fpga.c | 1 - hw/misc/omap_gpmc.c | 1 - hw/misc/omap_l4.c | 1 - hw/misc/omap_sdrc.c | 1 - hw/misc/pc-testdev.c | 1 - hw/misc/pca9552.c | 1 - hw/misc/pci-testdev.c | 1 - hw/misc/puv3_pm.c | 1 - hw/misc/tmp105.c | 1 - hw/misc/tmp421.c | 1 - hw/misc/unimp.c | 1 - hw/misc/zynq-xadc.c | 1 - hw/misc/zynq_slcr.c | 1 - hw/moxie/moxiesim.c | 1 - hw/net/can/can_kvaser_pci.c | 1 - hw/net/can/can_mioe3680_pci.c | 1 - hw/net/can/can_pcm3680_pci.c | 1 - hw/net/can/can_sja1000.c | 1 - hw/net/e1000.c | 1 - hw/net/e1000e.c | 1 + hw/net/e1000e_core.c | 1 + hw/net/e1000x_common.c | 1 - hw/net/eepro100.c | 1 - hw/net/lan9118.c | 1 + hw/net/milkymist-minimac2.c | 1 - hw/net/mipsnet.c | 1 - hw/net/ne2000.h | 1 - hw/net/opencores_eth.c | 1 - hw/net/rocker/rocker.c | 1 - hw/net/rocker/rocker_desc.c | 1 - hw/net/rtl8139.c | 1 - hw/net/spapr_llan.c | 1 - hw/net/sunhme.c | 1 - hw/net/xen_nic.c | 1 - hw/net/xilinx_axienet.c | 1 + hw/net/xilinx_ethlite.c | 1 - hw/nios2/10m50_devboard.c | 1 - hw/nios2/boot.h | 1 - hw/nios2/generic_nommu.c | 1 - hw/nvram/chrp_nvram.c | 1 - hw/nvram/eeprom93xx.c | 1 - hw/nvram/eeprom_at24c.c | 1 - hw/nvram/fw_cfg.c | 1 - hw/nvram/mac_nvram.c | 1 - hw/openrisc/cputimer.c | 1 - hw/openrisc/openrisc_sim.c | 1 - hw/openrisc/pic_cpu.c | 1 - hw/pci-host/bonito.c | 1 - hw/pci-host/gpex.c | 1 - hw/pci-host/piix.c | 1 - hw/pci-host/ppce500.c | 1 - hw/pci-host/prep.c | 1 - hw/pci-host/q35.c | 1 - hw/pci-host/uninorth.c | 1 - hw/pci/msix.c | 1 - hw/pci/pci.c | 1 - hw/pci/pcie_host.c | 1 - hw/pcmcia/pcmcia.c | 1 - hw/pcmcia/pxa2xx.c | 1 - hw/ppc/e500.c | 1 - hw/ppc/mac_newworld.c | 1 - hw/ppc/mac_oldworld.c | 1 - hw/ppc/mpc8544_guts.c | 1 - hw/ppc/pnv.c | 1 - hw/ppc/pnv_bmc.c | 1 - hw/ppc/pnv_occ.c | 1 - hw/ppc/pnv_psi.c | 1 - hw/ppc/pnv_xscom.c | 1 - hw/ppc/ppc.c | 1 - hw/ppc/ppc405_boards.c | 1 - hw/ppc/ppc405_uc.c | 1 - hw/ppc/ppc440_bamboo.c | 1 - hw/ppc/ppc440_pcix.c | 1 - hw/ppc/ppc440_uc.c | 1 - hw/ppc/ppc4xx_devs.c | 1 - hw/ppc/ppc4xx_pci.c | 1 - hw/ppc/ppc_booke.c | 1 - hw/ppc/prep.c | 1 - hw/ppc/sam460ex.c | 1 - hw/ppc/spapr.c | 1 - hw/ppc/spapr_iommu.c | 1 - hw/ppc/spapr_pci.c | 1 - hw/ppc/spapr_vio.c | 1 - hw/ppc/virtex_ml507.c | 1 - hw/rdma/vmw/pvrdma_cmd.c | 1 - hw/rdma/vmw/pvrdma_main.c | 1 - hw/riscv/sifive_e.c | 1 - hw/riscv/sifive_prci.c | 1 + hw/riscv/sifive_test.c | 1 + hw/riscv/sifive_u.c | 1 - hw/riscv/sifive_uart.c | 1 + hw/riscv/spike.c | 1 - hw/riscv/virt.c | 1 - hw/s390x/virtio-ccw.c | 1 - hw/scsi/lsi53c895a.c | 1 - hw/scsi/megasas.c | 1 - hw/scsi/mptconfig.c | 1 - hw/scsi/mptendian.c | 1 - hw/scsi/mptsas.c | 1 - hw/scsi/scsi-bus.c | 1 - hw/scsi/spapr_vscsi.c | 1 - hw/sd/milkymist-memcard.c | 1 - hw/sd/omap_mmc.c | 1 - hw/sd/pxa2xx_mmci.c | 1 - hw/sd/sd.c | 1 - hw/sd/sdhci-pci.c | 1 - hw/sd/sdhci.c | 1 - hw/sh4/r2d.c | 1 - hw/sh4/sh7750.c | 1 - hw/sh4/sh7750_regnames.c | 1 - hw/sh4/shix.c | 1 - hw/sparc/leon3.c | 1 - hw/sparc64/niagara.c | 1 - hw/sparc64/sun4u.c | 1 - hw/timer/a9gtimer.c | 1 + hw/timer/arm_mptimer.c | 1 + hw/timer/exynos4210_mct.c | 1 + hw/timer/exynos4210_rtc.c | 1 - hw/timer/hpet.c | 1 - hw/timer/i8254.c | 1 - hw/timer/i8254_common.c | 1 - hw/timer/lm32_timer.c | 1 - hw/timer/m48t59.c | 1 - hw/timer/mc146818rtc.c | 1 - hw/timer/milkymist-sysctl.c | 1 - hw/timer/mips_gictimer.c | 1 - hw/timer/omap_gptimer.c | 1 - hw/timer/omap_synctimer.c | 1 - hw/timer/pxa2xx_timer.c | 1 - hw/timer/sun4v-rtc.c | 1 - hw/timer/twl92230.c | 1 - hw/tpm/tpm_emulator.c | 1 - hw/tpm/tpm_passthrough.c | 1 - hw/tricore/tricore_testboard.c | 1 - hw/usb/bus.c | 1 - hw/usb/dev-audio.c | 1 - hw/usb/dev-hid.c | 1 - hw/usb/dev-wacom.c | 1 - hw/usb/hcd-ehci.h | 1 - hw/usb/hcd-ohci-pci.c | 1 - hw/usb/hcd-ohci.c | 1 - hw/usb/hcd-uhci.c | 1 - hw/usb/hcd-xhci-nec.c | 1 - hw/usb/hcd-xhci.c | 1 - hw/usb/libhw.c | 1 - hw/usb/tusb6010.c | 1 + hw/vfio/pci-quirks.c | 1 + hw/vfio/pci.c | 1 + hw/virtio/vhost.c | 1 - hw/virtio/virtio-bus.c | 1 - hw/watchdog/wdt_i6300esb.c | 1 - hw/watchdog/wdt_ib700.c | 1 - hw/xen/xen-bus-helper.c | 1 - hw/xen/xen-bus.c | 1 - hw/xen/xen-legacy-backend.c | 1 - hw/xen/xen_pt_load_rom.c | 1 - hw/xenpv/xen_machine_pv.c | 1 - hw/xtensa/mx_pic.c | 1 - hw/xtensa/pic_cpu.c | 1 - include/hw/audio/pcspk.h | 1 - include/hw/audio/wm8750.h | 1 - include/hw/char/serial.h | 1 - include/hw/char/stm32f2xx_usart.h | 1 - include/hw/dma/i8257.h | 1 - include/hw/hw.h | 1 - include/hw/i386/ich9.h | 1 - include/hw/i386/ioapic_internal.h | 1 - include/hw/input/i8042.h | 1 - include/hw/isa/apm.h | 1 - include/hw/isa/i8259_internal.h | 1 - include/hw/misc/stm32f2xx_syscfg.h | 1 - include/hw/net/ne2000-isa.h | 1 - include/hw/pci-host/designware.h | 1 - include/hw/pci-host/gpex.h | 1 - include/hw/pci-host/q35.h | 1 - include/hw/pci-host/uninorth.h | 1 - include/hw/pci-host/xilinx-pcie.h | 1 - include/hw/pci/pcie.h | 1 - include/hw/pci/pcie_aer.h | 1 - include/hw/qdev.h | 1 - include/hw/riscv/riscv_htif.h | 1 - include/hw/ssi/stm32f2xx_spi.h | 1 - include/hw/timer/aspeed_rtc.h | 1 - include/hw/timer/i8254.h | 1 - include/hw/timer/i8254_internal.h | 1 - include/hw/virtio/vhost.h | 1 - include/hw/virtio/virtio.h | 1 - include/hw/xen/xen_common.h | 1 - include/sysemu/dma.h | 1 - include/sysemu/hax.h | 1 - include/sysemu/hvf.h | 1 - monitor/misc.c | 1 - target/alpha/machine.c | 1 - target/arm/machine.c | 1 - target/cris/machine.c | 1 - target/hppa/machine.c | 1 - target/i386/cpu.c | 1 - target/i386/machine.c | 1 - target/lm32/machine.c | 1 - target/mips/machine.c | 1 - target/moxie/machine.c | 1 - target/openrisc/machine.c | 1 - target/ppc/kvm.c | 1 + target/ppc/machine.c | 1 - target/s390x/cpu.c | 1 - target/s390x/kvm.c | 1 - target/s390x/machine.c | 1 - target/s390x/mmu_helper.c | 1 + target/sparc/machine.c | 1 - ui/spice-core.c | 1 - vl.c | 1 - 401 files changed, 27 insertions(+), 374 deletions(-) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 35ea3cb624..2673952694 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -23,7 +23,6 @@ #include "qemu/config-file.h" #include "qemu/error-report.h" #include "qapi/error.h" -#include "hw/hw.h" #include "hw/pci/msi.h" #include "hw/pci/msix.h" #include "hw/s390x/adapter.h" diff --git a/audio/audio.c b/audio/audio.c index cf65ae49f4..b9b2d07e54 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -23,7 +23,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "audio.h" #include "migration/vmstate.h" #include "monitor/monitor.h" diff --git a/audio/spiceaudio.c b/audio/spiceaudio.c index 0ead5ae43a..ec1c8fe936 100644 --- a/audio/spiceaudio.c +++ b/audio/spiceaudio.c @@ -18,7 +18,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "qemu/host-utils.h" #include "qemu/module.h" #include "qemu/error-report.h" diff --git a/audio/wavcapture.c b/audio/wavcapture.c index 74320dfecc..493edc60e4 100644 --- a/audio/wavcapture.c +++ b/audio/wavcapture.c @@ -1,5 +1,4 @@ #include "qemu/osdep.h" -#include "hw/hw.h" #include "monitor/monitor.h" #include "qapi/error.h" #include "qemu/error-report.h" diff --git a/cpus.c b/cpus.c index 4ebdacdd44..e70cc58e31 100644 --- a/cpus.c +++ b/cpus.c @@ -56,6 +56,7 @@ #include "hw/nmi.h" #include "sysemu/replay.h" #include "hw/boards.h" +#include "hw/hw.h" #ifdef CONFIG_LINUX diff --git a/device-hotplug.c b/device-hotplug.c index 6153259d71..f01d53774b 100644 --- a/device-hotplug.c +++ b/device-hotplug.c @@ -23,7 +23,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/boards.h" #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" diff --git a/exec.c b/exec.c index 3e78de3b8f..78f849de99 100644 --- a/exec.c +++ b/exec.c @@ -42,7 +42,6 @@ #if defined(CONFIG_USER_ONLY) #include "qemu.h" #else /* !CONFIG_USER_ONLY */ -#include "hw/hw.h" #include "exec/memory.h" #include "exec/ioport.h" #include "sysemu/dma.h" diff --git a/hw/9pfs/xen-9p-backend.c b/hw/9pfs/xen-9p-backend.c index 25ab04d95a..c50b1961d3 100644 --- a/hw/9pfs/xen-9p-backend.c +++ b/hw/9pfs/xen-9p-backend.c @@ -10,7 +10,6 @@ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/9pfs/9p.h" #include "hw/xen/xen-legacy-backend.h" #include "hw/9pfs/xen-9pfs.h" diff --git a/hw/acpi/core.c b/hw/acpi/core.c index 39e9fb1a6c..f36d60f619 100644 --- a/hw/acpi/core.c +++ b/hw/acpi/core.c @@ -21,7 +21,6 @@ #include "qemu/osdep.h" #include "sysemu/sysemu.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/acpi/acpi.h" #include "hw/nvram/fw_cfg.h" diff --git a/hw/acpi/cpu_hotplug.c b/hw/acpi/cpu_hotplug.c index 5243918125..a83567e6aa 100644 --- a/hw/acpi/cpu_hotplug.c +++ b/hw/acpi/cpu_hotplug.c @@ -10,7 +10,6 @@ * See the COPYING file in the top-level directory. */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/acpi/cpu_hotplug.h" #include "qapi/error.h" #include "qom/cpu.h" diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c index 88eb7dbab1..39649cbe6a 100644 --- a/hw/acpi/ich9.c +++ b/hw/acpi/ich9.c @@ -25,7 +25,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "qapi/error.h" #include "qapi/visitor.h" #include "hw/i386/pc.h" diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c index 912ff6dd5c..ac49a5a77b 100644 --- a/hw/acpi/pcihp.c +++ b/hw/acpi/pcihp.c @@ -27,7 +27,6 @@ #include "qemu/osdep.h" #include "hw/acpi/pcihp.h" -#include "hw/hw.h" #include "hw/i386/pc.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bridge.h" diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 1896dbbfb9..ec47a9143b 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -20,7 +20,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/i386/pc.h" #include "hw/irq.h" #include "hw/isa/apm.h" diff --git a/hw/adc/stm32f2xx_adc.c b/hw/adc/stm32f2xx_adc.c index 9684653e5e..4f9d485ecf 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 "migration/vmstate.h" -#include "hw/hw.h" #include "qemu/log.h" #include "qemu/module.h" #include "hw/adc/stm32f2xx_adc.h" diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c index 9dfb835013..546b89bbcc 100644 --- a/hw/alpha/dp264.c +++ b/hw/alpha/dp264.c @@ -9,7 +9,6 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "cpu.h" -#include "hw/hw.h" #include "elf.h" #include "hw/loader.h" #include "hw/boards.h" diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c index 6797eb0abe..5d7f8f3342 100644 --- a/hw/alpha/typhoon.c +++ b/hw/alpha/typhoon.c @@ -11,7 +11,6 @@ #include "qemu/units.h" #include "qapi/error.h" #include "cpu.h" -#include "hw/hw.h" #include "hw/irq.h" #include "sysemu/sysemu.h" #include "alpha_sys.h" diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 7123fba777..c9e1e844b8 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -12,7 +12,6 @@ #include "qemu/error-report.h" #include "qapi/error.h" #include -#include "hw/hw.h" #include "hw/arm/boot.h" #include "hw/arm/linux-boot-if.h" #include "sysemu/kvm.h" diff --git a/hw/arm/collie.c b/hw/arm/collie.c index 3db3c56004..219643c633 100644 --- a/hw/arm/collie.c +++ b/hw/arm/collie.c @@ -10,7 +10,6 @@ */ #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/hw.h" #include "hw/sysbus.h" #include "hw/boards.h" #include "strongarm.h" diff --git a/hw/arm/gumstix.c b/hw/arm/gumstix.c index 343cbfd7da..f26a0e8010 100644 --- a/hw/arm/gumstix.c +++ b/hw/arm/gumstix.c @@ -36,7 +36,6 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" -#include "hw/hw.h" #include "hw/arm/pxa.h" #include "net/net.h" #include "hw/block/flash.h" diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index f8fbe402db..ecccb4125a 100644 --- a/hw/arm/integratorcp.c +++ b/hw/arm/integratorcp.c @@ -21,6 +21,7 @@ #include "sysemu/sysemu.h" #include "qemu/error-report.h" #include "hw/char/pl011.h" +#include "hw/hw.h" #include "hw/irq.h" #define TYPE_INTEGRATOR_CM "integrator_core" diff --git a/hw/arm/mainstone.c b/hw/arm/mainstone.c index cd1f904c6c..1bad1aea76 100644 --- a/hw/arm/mainstone.c +++ b/hw/arm/mainstone.c @@ -14,7 +14,6 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" #include "qapi/error.h" -#include "hw/hw.h" #include "hw/arm/pxa.h" #include "hw/arm/boot.h" #include "net/net.h" diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index 72e522a629..a3cfdc3077 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -19,6 +19,7 @@ #include "sysemu/sysemu.h" #include "hw/boards.h" #include "hw/char/serial.h" +#include "hw/hw.h" #include "qemu/timer.h" #include "hw/ptimer.h" #include "hw/block/flash.h" diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c index 397630e2f2..af5e3d0ba7 100644 --- a/hw/arm/omap2.c +++ b/hw/arm/omap2.c @@ -25,7 +25,6 @@ #include "sysemu/qtest.h" #include "sysemu/reset.h" #include "hw/boards.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/arm/boot.h" #include "hw/arm/omap.h" diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c index cae78d0a36..75a05c36b0 100644 --- a/hw/arm/omap_sx1.c +++ b/hw/arm/omap_sx1.c @@ -27,7 +27,6 @@ */ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/hw.h" #include "ui/console.h" #include "hw/arm/omap.h" #include "hw/boards.h" diff --git a/hw/arm/palm.c b/hw/arm/palm.c index a5eccb7290..bea47b917d 100644 --- a/hw/arm/palm.c +++ b/hw/arm/palm.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/hw.h" #include "audio/audio.h" #include "sysemu/sysemu.h" #include "sysemu/qtest.h" diff --git a/hw/arm/pxa2xx_pic.c b/hw/arm/pxa2xx_pic.c index c8bd497e99..203d4d28af 100644 --- a/hw/arm/pxa2xx_pic.c +++ b/hw/arm/pxa2xx_pic.c @@ -11,7 +11,6 @@ #include "qemu/osdep.h" #include "qemu/module.h" #include "cpu.h" -#include "hw/hw.h" #include "hw/arm/pxa.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c index 003929b3e0..2eabb9c814 100644 --- a/hw/arm/spitz.c +++ b/hw/arm/spitz.c @@ -12,7 +12,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/hw.h" #include "hw/arm/pxa.h" #include "hw/arm/boot.h" #include "sysemu/sysemu.h" diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c index 80c61aef16..7f136bf187 100644 --- a/hw/arm/tosa.c +++ b/hw/arm/tosa.c @@ -13,7 +13,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/hw.h" #include "hw/arm/pxa.h" #include "hw/arm/boot.h" #include "hw/arm/sharpsl.h" diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 4f85eb575c..fa9afd2b7e 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -36,7 +36,6 @@ #include "hw/acpi/acpi.h" #include "hw/nvram/fw_cfg.h" #include "hw/acpi/bios-linker-loader.h" -#include "hw/hw.h" #include "hw/acpi/aml-build.h" #include "hw/acpi/utils.h" #include "hw/acpi/pci.h" diff --git a/hw/arm/z2.c b/hw/arm/z2.c index 810922d74e..1e3db425ef 100644 --- a/hw/arm/z2.c +++ b/hw/arm/z2.c @@ -12,7 +12,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/arm/pxa.h" #include "hw/arm/boot.h" #include "hw/i2c/i2c.h" diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c index 26ac84b388..9af584fb12 100644 --- a/hw/audio/ac97.c +++ b/hw/audio/ac97.c @@ -18,7 +18,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/audio/soundhw.h" #include "audio/audio.h" #include "hw/pci/pci.h" diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c index 7dd9a89b89..62e59ccee6 100644 --- a/hw/audio/adlib.c +++ b/hw/audio/adlib.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/module.h" -#include "hw/hw.h" #include "hw/audio/soundhw.h" #include "audio/audio.h" #include "hw/isa/isa.h" diff --git a/hw/audio/cs4231a.c b/hw/audio/cs4231a.c index f7a39c0af4..383200e1e2 100644 --- a/hw/audio/cs4231a.c +++ b/hw/audio/cs4231a.c @@ -23,7 +23,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/audio/soundhw.h" #include "audio/audio.h" #include "hw/irq.h" diff --git a/hw/audio/es1370.c b/hw/audio/es1370.c index 0289f771c1..39deecbbc6 100644 --- a/hw/audio/es1370.c +++ b/hw/audio/es1370.c @@ -27,7 +27,6 @@ #define SILENT_ES1370 #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/audio/soundhw.h" #include "audio/audio.h" #include "hw/pci/pci.h" diff --git a/hw/audio/gus.c b/hw/audio/gus.c index 1a78cc47cd..787e04774a 100644 --- a/hw/audio/gus.c +++ b/hw/audio/gus.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/module.h" -#include "hw/hw.h" #include "hw/audio/soundhw.h" #include "audio/audio.h" #include "hw/irq.h" diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c index 4f6fbb8b13..4c33c477e1 100644 --- a/hw/audio/hda-codec.c +++ b/hw/audio/hda-codec.c @@ -18,7 +18,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/pci/pci.h" #include "intel-hda.h" #include "migration/vmstate.h" diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c index e6f150bb0d..5a1fcded55 100644 --- a/hw/audio/intel-hda.c +++ b/hw/audio/intel-hda.c @@ -18,7 +18,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/pci/pci.h" #include "hw/pci/msi.h" #include "qemu/timer.h" diff --git a/hw/audio/marvell_88w8618.c b/hw/audio/marvell_88w8618.c index 6345bc1d5c..158a456a41 100644 --- a/hw/audio/marvell_88w8618.c +++ b/hw/audio/marvell_88w8618.c @@ -13,7 +13,6 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "migration/vmstate.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/audio/wm8750.h" #include "audio/audio.h" diff --git a/hw/audio/milkymist-ac97.c b/hw/audio/milkymist-ac97.c index 890a5fe89e..481dde10a1 100644 --- a/hw/audio/milkymist-ac97.c +++ b/hw/audio/milkymist-ac97.c @@ -22,7 +22,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c index 9039c9786d..016946d4b2 100644 --- a/hw/audio/pcspk.c +++ b/hw/audio/pcspk.c @@ -23,7 +23,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/isa/isa.h" #include "hw/audio/soundhw.h" #include "audio/audio.h" diff --git a/hw/audio/sb16.c b/hw/audio/sb16.c index 599194779d..818659546f 100644 --- a/hw/audio/sb16.c +++ b/hw/audio/sb16.c @@ -23,7 +23,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/audio/soundhw.h" #include "audio/audio.h" #include "hw/irq.h" diff --git a/hw/block/dataplane/xen-block.c b/hw/block/dataplane/xen-block.c index 0f200c5fb0..71c63330ac 100644 --- a/hw/block/dataplane/xen-block.c +++ b/hw/block/dataplane/xen-block.c @@ -21,7 +21,6 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" #include "qapi/error.h" -#include "hw/hw.h" #include "hw/xen/xen_common.h" #include "hw/block/xen_blkif.h" #include "sysemu/block-backend.h" diff --git a/hw/block/ecc.c b/hw/block/ecc.c index f846ab3e01..1a182367ee 100644 --- a/hw/block/ecc.c +++ b/hw/block/ecc.c @@ -12,7 +12,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "migration/vmstate.h" #include "hw/block/flash.h" diff --git a/hw/block/fdc.c b/hw/block/fdc.c index d39314b79e..acb19800fe 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -28,7 +28,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/block/fdc.h" #include "qapi/error.h" #include "qemu/error-report.h" diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index 9d395169b2..c213e2ed7b 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -23,7 +23,6 @@ #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/hw.h" #include "sysemu/block-backend.h" #include "hw/ssi/ssi.h" #include "migration/vmstate.h" diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 079a8ffe80..e08853fe5e 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -28,7 +28,6 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "hw/block/block.h" -#include "hw/hw.h" #include "hw/pci/msix.h" #include "hw/pci/pci.h" #include "migration/vmstate.h" diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index c8a46d1a3b..17920790ec 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -37,7 +37,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/block/block.h" #include "hw/block/flash.h" #include "sysemu/block-backend.h" diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index 9af1b18e19..e9f7e499b1 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -33,7 +33,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/block/block.h" #include "hw/block/flash.h" #include "qapi/error.h" diff --git a/hw/block/tc58128.c b/hw/block/tc58128.c index d0fae248dc..9888f01ac6 100644 --- a/hw/block/tc58128.c +++ b/hw/block/tc58128.c @@ -1,6 +1,5 @@ #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/hw.h" #include "hw/sh4/sh.h" #include "hw/loader.h" #include "sysemu/qtest.h" diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c index 69d73196e2..848a0ad0ea 100644 --- a/hw/block/xen-block.c +++ b/hw/block/xen-block.c @@ -17,7 +17,6 @@ #include "qapi/visitor.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" -#include "hw/hw.h" #include "hw/xen/xen_common.h" #include "hw/block/xen_blkif.h" #include "hw/xen/xen-block.h" diff --git a/hw/char/debugcon.c b/hw/char/debugcon.c index e1b6d1190f..b38d82891f 100644 --- a/hw/char/debugcon.c +++ b/hw/char/debugcon.c @@ -27,7 +27,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/module.h" -#include "hw/hw.h" #include "chardev/char-fe.h" #include "hw/isa/isa.h" diff --git a/hw/char/digic-uart.c b/hw/char/digic-uart.c index 79ea92249c..cc501678ce 100644 --- a/hw/char/digic-uart.c +++ b/hw/char/digic-uart.c @@ -27,7 +27,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "chardev/char-fe.h" diff --git a/hw/char/escc.c b/hw/char/escc.c index 404002b899..35c6952bbd 100644 --- a/hw/char/escc.c +++ b/hw/char/escc.c @@ -23,7 +23,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/char/lm32_juart.c b/hw/char/lm32_juart.c index f4488fa736..69dd7ac72b 100644 --- a/hw/char/lm32_juart.c +++ b/hw/char/lm32_juart.c @@ -18,7 +18,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "qemu/module.h" diff --git a/hw/char/lm32_uart.c b/hw/char/lm32_uart.c index 4b3215fe96..00832fba86 100644 --- a/hw/char/lm32_uart.c +++ b/hw/char/lm32_uart.c @@ -23,7 +23,6 @@ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/char/mcf_uart.c b/hw/char/mcf_uart.c index c403a1fdc6..1712b2296e 100644 --- a/hw/char/mcf_uart.c +++ b/hw/char/mcf_uart.c @@ -7,7 +7,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/sysbus.h" #include "qemu/module.h" diff --git a/hw/char/milkymist-uart.c b/hw/char/milkymist-uart.c index 53c1ca789d..e90f84d53e 100644 --- a/hw/char/milkymist-uart.c +++ b/hw/char/milkymist-uart.c @@ -22,7 +22,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/char/omap_uart.c b/hw/char/omap_uart.c index b3bb1cfcec..13e4f43c4c 100644 --- a/hw/char/omap_uart.c +++ b/hw/char/omap_uart.c @@ -19,7 +19,6 @@ */ #include "qemu/osdep.h" #include "chardev/char.h" -#include "hw/hw.h" #include "hw/arm/omap.h" #include "hw/char/serial.h" #include "exec/address-spaces.h" diff --git a/hw/char/parallel.c b/hw/char/parallel.c index 1798fd0c44..3980eb5909 100644 --- a/hw/char/parallel.c +++ b/hw/char/parallel.c @@ -26,7 +26,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/module.h" -#include "hw/hw.h" #include "chardev/char-parallel.h" #include "chardev/char-fe.h" #include "hw/irq.h" diff --git a/hw/char/sh_serial.c b/hw/char/sh_serial.c index 7a40aa90af..07dc16be13 100644 --- a/hw/char/sh_serial.c +++ b/hw/char/sh_serial.c @@ -26,7 +26,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/sh4/sh.h" #include "chardev/char-fe.h" diff --git a/hw/char/xen_console.c b/hw/char/xen_console.c index 47e1092263..8cc9328b3f 100644 --- a/hw/char/xen_console.c +++ b/hw/char/xen_console.c @@ -24,7 +24,6 @@ #include #include "qapi/error.h" -#include "hw/hw.h" #include "chardev/char-fe.h" #include "hw/xen/xen-legacy-backend.h" diff --git a/hw/char/xilinx_uartlite.c b/hw/char/xilinx_uartlite.c index 250eed945c..fa7451fd67 100644 --- a/hw/char/xilinx_uartlite.c +++ b/hw/char/xilinx_uartlite.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "hw/hw.h" #include "hw/irq.h" #include "hw/sysbus.h" #include "qemu/module.h" diff --git a/hw/core/empty_slot.c b/hw/core/empty_slot.c index c694532046..3ba450e1ca 100644 --- a/hw/core/empty_slot.c +++ b/hw/core/empty_slot.c @@ -10,7 +10,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/sysbus.h" #include "qemu/module.h" #include "hw/empty_slot.h" diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c index 04a1e2b02a..30b1991b52 100644 --- a/hw/core/null-machine.c +++ b/hw/core/null-machine.c @@ -13,7 +13,6 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" -#include "hw/hw.h" #include "hw/boards.h" #include "sysemu/sysemu.h" #include "exec/address-spaces.h" diff --git a/hw/core/ptimer.c b/hw/core/ptimer.c index 49b60282cf..d58e2dfdb0 100644 --- a/hw/core/ptimer.c +++ b/hw/core/ptimer.c @@ -7,7 +7,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "qemu/timer.h" #include "hw/ptimer.h" #include "migration/vmstate.h" diff --git a/hw/cris/boot.c b/hw/cris/boot.c index d44fdec43f..2d2cc0c7a5 100644 --- a/hw/cris/boot.c +++ b/hw/cris/boot.c @@ -24,7 +24,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "hw/hw.h" #include "hw/loader.h" #include "elf.h" #include "boot.h" diff --git a/hw/display/ati.c b/hw/display/ati.c index a747c4cc98..df978a420d 100644 --- a/hw/display/ati.c +++ b/hw/display/ati.c @@ -24,7 +24,6 @@ #include "qemu/module.h" #include "qemu/error-report.h" #include "qapi/error.h" -#include "hw/hw.h" #include "ui/console.h" #include "hw/display/i2c-ddc.h" #include "trace.h" diff --git a/hw/display/bcm2835_fb.c b/hw/display/bcm2835_fb.c index 3d99d99e2b..e606893f28 100644 --- a/hw/display/bcm2835_fb.c +++ b/hw/display/bcm2835_fb.c @@ -26,6 +26,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/display/bcm2835_fb.h" +#include "hw/hw.h" #include "hw/irq.h" #include "framebuffer.h" #include "ui/pixel_ops.h" diff --git a/hw/display/bochs-display.c b/hw/display/bochs-display.c index ce40aea354..0a535de40c 100644 --- a/hw/display/bochs-display.c +++ b/hw/display/bochs-display.c @@ -8,7 +8,6 @@ #include "qemu/osdep.h" #include "qemu/module.h" #include "qemu/units.h" -#include "hw/hw.h" #include "hw/pci/pci.h" #include "migration/vmstate.h" #include "hw/display/bochs-vbe.h" diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c index 3120b3cfaf..0f5465bc14 100644 --- a/hw/display/cirrus_vga.c +++ b/hw/display/cirrus_vga.c @@ -38,7 +38,6 @@ #include "sysemu/reset.h" #include "qapi/error.h" #include "trace.h" -#include "hw/hw.h" #include "hw/pci/pci.h" #include "migration/vmstate.h" #include "ui/pixel_ops.h" diff --git a/hw/display/cirrus_vga_isa.c b/hw/display/cirrus_vga_isa.c index 69cdb9e066..49f409b638 100644 --- a/hw/display/cirrus_vga_isa.c +++ b/hw/display/cirrus_vga_isa.c @@ -26,7 +26,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/module.h" -#include "hw/hw.h" #include "hw/loader.h" #include "hw/isa/isa.h" #include "cirrus_vga_internal.h" diff --git a/hw/display/exynos4210_fimd.c b/hw/display/exynos4210_fimd.c index 8e1508a3e6..c1071ecd46 100644 --- a/hw/display/exynos4210_fimd.c +++ b/hw/display/exynos4210_fimd.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "hw/hw.h" #include "hw/irq.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/display/framebuffer.c b/hw/display/framebuffer.c index 36e3db189a..4485aa335b 100644 --- a/hw/display/framebuffer.c +++ b/hw/display/framebuffer.c @@ -18,7 +18,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "ui/console.h" #include "framebuffer.h" diff --git a/hw/display/milkymist-tmu2.c b/hw/display/milkymist-tmu2.c index 7bfffa52da..199f1227e7 100644 --- a/hw/display/milkymist-tmu2.c +++ b/hw/display/milkymist-tmu2.c @@ -25,7 +25,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/display/omap_lcdc.c b/hw/display/omap_lcdc.c index b00ce04b3b..6ad13f2e9e 100644 --- a/hw/display/omap_lcdc.c +++ b/hw/display/omap_lcdc.c @@ -18,7 +18,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "ui/console.h" #include "hw/arm/omap.h" diff --git a/hw/display/qxl.h b/hw/display/qxl.h index 4adfdb1e5d..80eb0d2672 100644 --- a/hw/display/qxl.h +++ b/hw/display/qxl.h @@ -2,7 +2,6 @@ #define HW_QXL_H -#include "hw/hw.h" #include "hw/pci/pci.h" #include "vga_int.h" #include "qemu/thread.h" diff --git a/hw/display/sm501.c b/hw/display/sm501.c index 6f88aaaa08..603396358d 100644 --- a/hw/display/sm501.c +++ b/hw/display/sm501.c @@ -29,7 +29,6 @@ #include "qemu/log.h" #include "qemu/module.h" #include "cpu.h" -#include "hw/hw.h" #include "hw/char/serial.h" #include "ui/console.h" #include "hw/sysbus.h" diff --git a/hw/display/tc6393xb.c b/hw/display/tc6393xb.c index 74a77eb43b..49a676d1b0 100644 --- a/hw/display/tc6393xb.c +++ b/hw/display/tc6393xb.c @@ -14,7 +14,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/host-utils.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/display/tc6393xb.h" #include "exec/memory.h" diff --git a/hw/display/vga-isa-mm.c b/hw/display/vga-isa-mm.c index 1c4f43b52b..e9c43e5530 100644 --- a/hw/display/vga-isa-mm.c +++ b/hw/display/vga-isa-mm.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include "qemu/bitops.h" #include "qemu/units.h" -#include "hw/hw.h" #include "migration/vmstate.h" #include "hw/display/vga.h" #include "vga_int.h" diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c index 945952a9b0..189a4afc15 100644 --- a/hw/display/vga-isa.c +++ b/hw/display/vga-isa.c @@ -25,7 +25,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/isa/isa.h" #include "vga_int.h" #include "ui/pixel_ops.h" diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c index cb956b4545..86299f5e97 100644 --- a/hw/display/vga-pci.c +++ b/hw/display/vga-pci.c @@ -25,7 +25,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/pci/pci.h" #include "migration/vmstate.h" #include "vga_int.h" diff --git a/hw/display/vga.c b/hw/display/vga.c index f8098f63e9..573d223d46 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -26,7 +26,6 @@ #include "qemu/units.h" #include "sysemu/reset.h" #include "qapi/error.h" -#include "hw/hw.h" #include "hw/display/vga.h" #include "hw/pci/pci.h" #include "vga_int.h" diff --git a/hw/display/virtio-vga.c b/hw/display/virtio-vga.c index 416e7fec87..55e6a9085c 100644 --- a/hw/display/virtio-vga.c +++ b/hw/display/virtio-vga.c @@ -1,5 +1,4 @@ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/pci/pci.h" #include "hw/virtio/virtio-gpu.h" #include "qapi/error.h" diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c index ebfcc46a2d..f0b136eb16 100644 --- a/hw/display/vmware_vga.c +++ b/hw/display/vmware_vga.c @@ -26,7 +26,6 @@ #include "qemu/module.h" #include "qemu/units.h" #include "qapi/error.h" -#include "hw/hw.h" #include "hw/loader.h" #include "trace.h" #include "ui/vnc.h" diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c index 3c79913b31..838260b6ad 100644 --- a/hw/display/xenfb.c +++ b/hw/display/xenfb.c @@ -27,7 +27,6 @@ #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/hw.h" #include "ui/input.h" #include "ui/console.h" #include "hw/xen/xen-legacy-backend.h" diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c index b7404cff60..c626bd958a 100644 --- a/hw/dma/i8257.c +++ b/hw/dma/i8257.c @@ -23,7 +23,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/isa/isa.h" #include "migration/vmstate.h" #include "hw/dma/i8257.h" diff --git a/hw/dma/pl080.c b/hw/dma/pl080.c index 59bc929363..3713d5dadd 100644 --- a/hw/dma/pl080.c +++ b/hw/dma/pl080.c @@ -14,6 +14,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/dma/pl080.h" +#include "hw/hw.h" #include "hw/irq.h" #include "qapi/error.h" diff --git a/hw/dma/puv3_dma.c b/hw/dma/puv3_dma.c index 122f87aff1..5488d388a9 100644 --- a/hw/dma/puv3_dma.c +++ b/hw/dma/puv3_dma.c @@ -10,7 +10,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/sysbus.h" #undef DEBUG_PUV3 diff --git a/hw/dma/rc4030.c b/hw/dma/rc4030.c index d35fb59eee..d54e296d3a 100644 --- a/hw/dma/rc4030.c +++ b/hw/dma/rc4030.c @@ -24,7 +24,6 @@ #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/mips/mips.h" #include "hw/sysbus.h" diff --git a/hw/dma/sparc32_dma.c b/hw/dma/sparc32_dma.c index 8955fe262e..16d53b92dd 100644 --- a/hw/dma/sparc32_dma.c +++ b/hw/dma/sparc32_dma.c @@ -26,7 +26,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/sparc/sparc32_dma.h" #include "hw/sparc/sun4m_iommu.h" diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c index 83b52e4ac7..2c2d567a95 100644 --- a/hw/dma/xilinx_axidma.c +++ b/hw/dma/xilinx_axidma.c @@ -26,6 +26,7 @@ #include "hw/sysbus.h" #include "qapi/error.h" #include "qemu/timer.h" +#include "hw/hw.h" #include "hw/irq.h" #include "hw/ptimer.h" #include "qemu/log.h" diff --git a/hw/gpio/max7310.c b/hw/gpio/max7310.c index 432f0b00fe..87b0f24747 100644 --- a/hw/gpio/max7310.c +++ b/hw/gpio/max7310.c @@ -8,6 +8,7 @@ */ #include "qemu/osdep.h" +#include "hw/hw.h" #include "hw/i2c/i2c.h" #include "hw/irq.h" #include "migration/vmstate.h" diff --git a/hw/gpio/omap_gpio.c b/hw/gpio/omap_gpio.c index 6ab51a9428..46a721779c 100644 --- a/hw/gpio/omap_gpio.c +++ b/hw/gpio/omap_gpio.c @@ -19,7 +19,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/arm/omap.h" #include "hw/sysbus.h" diff --git a/hw/gpio/puv3_gpio.c b/hw/gpio/puv3_gpio.c index 54d30cada2..d19e342514 100644 --- a/hw/gpio/puv3_gpio.c +++ b/hw/gpio/puv3_gpio.c @@ -10,7 +10,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/sysbus.h" #undef DEBUG_PUV3 diff --git a/hw/gpio/zaurus.c b/hw/gpio/zaurus.c index a1ba09c6f2..9a12c68342 100644 --- a/hw/gpio/zaurus.c +++ b/hw/gpio/zaurus.c @@ -17,7 +17,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/arm/sharpsl.h" #include "hw/sysbus.h" diff --git a/hw/hppa/dino.c b/hw/hppa/dino.c index dfb9d7a742..bb9d0e033c 100644 --- a/hw/hppa/dino.c +++ b/hw/hppa/dino.c @@ -15,7 +15,6 @@ #include "qemu/units.h" #include "qapi/error.h" #include "cpu.h" -#include "hw/hw.h" #include "hw/irq.h" #include "sysemu/sysemu.h" #include "hw/pci/pci.h" diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index bc74438496..2736ce835e 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -6,7 +6,6 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "cpu.h" -#include "hw/hw.h" #include "elf.h" #include "hw/loader.h" #include "hw/boards.h" diff --git a/hw/i2c/bitbang_i2c.c b/hw/i2c/bitbang_i2c.c index 2289128aaf..b000952b98 100644 --- a/hw/i2c/bitbang_i2c.c +++ b/hw/i2c/bitbang_i2c.c @@ -11,7 +11,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/i2c/bitbang_i2c.h" #include "hw/sysbus.h" diff --git a/hw/i2c/omap_i2c.c b/hw/i2c/omap_i2c.c index 309a37b1fa..34f34e3b05 100644 --- a/hw/i2c/omap_i2c.c +++ b/hw/i2c/omap_i2c.c @@ -20,7 +20,6 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "qemu/module.h" -#include "hw/hw.h" #include "hw/i2c/i2c.h" #include "hw/irq.h" #include "hw/arm/omap.h" diff --git a/hw/i2c/pm_smbus.c b/hw/i2c/pm_smbus.c index d9e3bad90d..36994ff585 100644 --- a/hw/i2c/pm_smbus.c +++ b/hw/i2c/pm_smbus.c @@ -19,7 +19,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/boards.h" #include "hw/i2c/pm_smbus.h" #include "hw/i2c/smbus_master.h" diff --git a/hw/i2c/ppc4xx_i2c.c b/hw/i2c/ppc4xx_i2c.c index d110b417c6..3f015a1581 100644 --- a/hw/i2c/ppc4xx_i2c.c +++ b/hw/i2c/ppc4xx_i2c.c @@ -28,7 +28,6 @@ #include "qemu/log.h" #include "qemu/module.h" #include "cpu.h" -#include "hw/hw.h" #include "hw/i2c/ppc4xx_i2c.h" #include "hw/irq.h" diff --git a/hw/i2c/smbus_eeprom.c b/hw/i2c/smbus_eeprom.c index e05bc8c39c..8642f0036d 100644 --- a/hw/i2c/smbus_eeprom.c +++ b/hw/i2c/smbus_eeprom.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "qapi/error.h" -#include "hw/hw.h" #include "hw/boards.h" #include "hw/i2c/i2c.h" #include "hw/i2c/smbus_slave.h" diff --git a/hw/i2c/smbus_ich9.c b/hw/i2c/smbus_ich9.c index f7e626e95a..564198dae9 100644 --- a/hw/i2c/smbus_ich9.c +++ b/hw/i2c/smbus_ich9.c @@ -21,7 +21,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/i2c/pm_smbus.h" #include "hw/pci/pci.h" #include "migration/vmstate.h" diff --git a/hw/i2c/smbus_master.c b/hw/i2c/smbus_master.c index 0a6223744c..dc43b8637d 100644 --- a/hw/i2c/smbus_master.c +++ b/hw/i2c/smbus_master.c @@ -12,7 +12,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/i2c/i2c.h" #include "hw/i2c/smbus_master.h" diff --git a/hw/i2c/smbus_slave.c b/hw/i2c/smbus_slave.c index 7b145a384d..5d10e27664 100644 --- a/hw/i2c/smbus_slave.c +++ b/hw/i2c/smbus_slave.c @@ -14,7 +14,6 @@ /* TODO: Implement PEC. */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/i2c/i2c.h" #include "hw/i2c/smbus_slave.h" #include "migration/vmstate.h" diff --git a/hw/i386/amd_iommu.h b/hw/i386/amd_iommu.h index 3a694b186b..e05a4eff5d 100644 --- a/hw/i386/amd_iommu.h +++ b/hw/i386/amd_iommu.h @@ -21,7 +21,6 @@ #ifndef AMD_IOMMU_H #define AMD_IOMMU_H -#include "hw/hw.h" #include "hw/pci/pci.h" #include "hw/i386/x86-iommu.h" diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c index a3e33fbe5e..9a59f95497 100644 --- a/hw/i386/multiboot.c +++ b/hw/i386/multiboot.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include "qemu/option.h" #include "cpu.h" -#include "hw/hw.h" #include "hw/nvram/fw_cfg.h" #include "multiboot.h" #include "hw/loader.h" diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 1e8251d327..14fe8233ae 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -24,7 +24,6 @@ #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/hw.h" #include "hw/i386/pc.h" #include "hw/char/serial.h" #include "hw/char/parallel.h" diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 129f47493b..2fbb581c46 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -26,7 +26,6 @@ #include "config-devices.h" #include "qemu/units.h" -#include "hw/hw.h" #include "hw/loader.h" #include "hw/i386/pc.h" #include "hw/i386/apic.h" diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 397e1fdd2f..060b47f845 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -30,7 +30,6 @@ #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/hw.h" #include "hw/loader.h" #include "sysemu/arch_init.h" #include "hw/i2c/smbus_eeprom.h" diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c index de43943af8..defea37fe4 100644 --- a/hw/i386/pc_sysfw.c +++ b/hw/i386/pc_sysfw.c @@ -31,7 +31,6 @@ #include "qemu/option.h" #include "qemu/units.h" #include "hw/sysbus.h" -#include "hw/hw.h" #include "hw/i386/pc.h" #include "hw/boards.h" #include "hw/loader.h" diff --git a/hw/i386/vmmouse.c b/hw/i386/vmmouse.c index a50f5d5dd4..4f81504577 100644 --- a/hw/i386/vmmouse.c +++ b/hw/i386/vmmouse.c @@ -23,7 +23,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "ui/console.h" #include "hw/i386/pc.h" #include "hw/input/i8042.h" diff --git a/hw/i386/vmport.c b/hw/i386/vmport.c index 3bf8cfe041..26fcbe3827 100644 --- a/hw/i386/vmport.c +++ b/hw/i386/vmport.c @@ -22,7 +22,6 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/isa/isa.h" #include "hw/i386/pc.h" #include "hw/input/i8042.h" diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c index f769cd91f2..63abace70a 100644 --- a/hw/i386/xen/xen-hvm.c +++ b/hw/i386/xen/xen-hvm.c @@ -15,6 +15,7 @@ #include "hw/pci/pci_host.h" #include "hw/i386/pc.h" #include "hw/irq.h" +#include "hw/hw.h" #include "hw/i386/apic-msidef.h" #include "hw/xen/xen_common.h" #include "hw/xen/xen-legacy-backend.h" diff --git a/hw/i386/xen/xen_platform.c b/hw/i386/xen/xen_platform.c index 800687a188..0f7b05e5e1 100644 --- a/hw/i386/xen/xen_platform.c +++ b/hw/i386/xen/xen_platform.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/hw.h" #include "hw/ide.h" #include "hw/pci/pci.h" #include "hw/irq.h" diff --git a/hw/i386/xen/xen_pvdevice.c b/hw/i386/xen/xen_pvdevice.c index 700db81cbc..10c89cda41 100644 --- a/hw/i386/xen/xen_pvdevice.c +++ b/hw/i386/xen/xen_pvdevice.c @@ -32,7 +32,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/module.h" -#include "hw/hw.h" #include "hw/pci/pci.h" #include "migration/vmstate.h" #include "trace.h" diff --git a/hw/ide/ahci-allwinner.c b/hw/ide/ahci-allwinner.c index 8777122c9c..bb8393d2b6 100644 --- a/hw/ide/ahci-allwinner.c +++ b/hw/ide/ahci-allwinner.c @@ -16,7 +16,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "qemu/error-report.h" #include "qemu/module.h" #include "sysemu/dma.h" diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index e0b1a91fd9..1d5a54b29e 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -22,7 +22,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/pci/msi.h" #include "hw/pci/pci.h" #include "migration/vmstate.h" diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index a3763a1d3a..c2ee427f56 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -24,7 +24,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/pci/pci.h" #include "migration/vmstate.h" #include "qemu/module.h" diff --git a/hw/ide/core.c b/hw/ide/core.c index 0453a925f9..005b4d5ef4 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -24,7 +24,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/isa/isa.h" #include "migration/vmstate.h" #include "qemu/error-report.h" diff --git a/hw/ide/ich.c b/hw/ide/ich.c index 00fb43a127..eff3188fff 100644 --- a/hw/ide/ich.c +++ b/hw/ide/ich.c @@ -61,7 +61,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/pci/msi.h" #include "hw/pci/pci.h" #include "migration/vmstate.h" diff --git a/hw/ide/ioport.c b/hw/ide/ioport.c index a0b3c1f6a1..e6085612d4 100644 --- a/hw/ide/ioport.c +++ b/hw/ide/ioport.c @@ -24,7 +24,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/isa/isa.h" #include "qemu/error-report.h" #include "qemu/timer.h" diff --git a/hw/ide/isa.c b/hw/ide/isa.c index fda912f3ed..939b473dad 100644 --- a/hw/ide/isa.c +++ b/hw/ide/isa.c @@ -24,7 +24,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/isa/isa.h" #include "migration/vmstate.h" #include "qemu/module.h" diff --git a/hw/ide/macio.c b/hw/ide/macio.c index aa447cd2b5..44f2ff92bb 100644 --- a/hw/ide/macio.c +++ b/hw/ide/macio.c @@ -24,7 +24,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/ppc/mac.h" #include "hw/ppc/mac_dbdma.h" #include "migration/vmstate.h" diff --git a/hw/ide/microdrive.c b/hw/ide/microdrive.c index be3cf8779a..b0272ea14b 100644 --- a/hw/ide/microdrive.c +++ b/hw/ide/microdrive.c @@ -24,7 +24,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/pcmcia.h" #include "migration/vmstate.h" #include "qemu/module.h" diff --git a/hw/ide/mmio.c b/hw/ide/mmio.c index f3de6db33e..d2a377f326 100644 --- a/hw/ide/mmio.c +++ b/hw/ide/mmio.c @@ -24,7 +24,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "qemu/module.h" diff --git a/hw/ide/pci.c b/hw/ide/pci.c index c5b081a028..cce1da804d 100644 --- a/hw/ide/pci.c +++ b/hw/ide/pci.c @@ -24,7 +24,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/pci/pci.h" #include "migration/vmstate.h" #include "sysemu/dma.h" diff --git a/hw/ide/piix.c b/hw/ide/piix.c index 407d3e3ce8..bcfd119a8e 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -24,7 +24,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/pci/pci.h" #include "migration/vmstate.h" #include "qemu/module.h" diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c index eea22c09f4..d85c31a0ee 100644 --- a/hw/ide/qdev.c +++ b/hw/ide/qdev.c @@ -18,7 +18,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "sysemu/dma.h" #include "qapi/error.h" #include "qapi/qapi-types-block.h" diff --git a/hw/ide/via.c b/hw/ide/via.c index 8fa1972d92..45f929395f 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -25,7 +25,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/pci/pci.h" #include "migration/vmstate.h" #include "qemu/module.h" diff --git a/hw/input/hid.c b/hw/input/hid.c index c570ca25b1..89239b5634 100644 --- a/hw/input/hid.c +++ b/hw/input/hid.c @@ -24,7 +24,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "ui/console.h" #include "qemu/timer.h" #include "hw/input/hid.h" diff --git a/hw/input/lm832x.c b/hw/input/lm832x.c index de03913d7c..a37eb854b9 100644 --- a/hw/input/lm832x.c +++ b/hw/input/lm832x.c @@ -19,7 +19,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/i2c/i2c.h" #include "hw/irq.h" #include "migration/vmstate.h" diff --git a/hw/input/milkymist-softusb.c b/hw/input/milkymist-softusb.c index e17666d56b..8f6fdf2d97 100644 --- a/hw/input/milkymist-softusb.c +++ b/hw/input/milkymist-softusb.c @@ -23,7 +23,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/hw.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "trace.h" diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c index cf1690332d..f2e32a1ed5 100644 --- a/hw/input/pckbd.c +++ b/hw/input/pckbd.c @@ -24,7 +24,6 @@ #include "qemu/osdep.h" #include "qemu/log.h" -#include "hw/hw.h" #include "hw/isa/isa.h" #include "migration/vmstate.h" #include "hw/i386/pc.h" diff --git a/hw/input/ps2.c b/hw/input/ps2.c index 07d07ee6bd..68b30229f4 100644 --- a/hw/input/ps2.c +++ b/hw/input/ps2.c @@ -24,7 +24,6 @@ #include "qemu/osdep.h" #include "qemu/log.h" -#include "hw/hw.h" #include "hw/input/ps2.h" #include "migration/vmstate.h" #include "ui/console.h" diff --git a/hw/input/stellaris_input.c b/hw/input/stellaris_input.c index 766365683a..2940025bf5 100644 --- a/hw/input/stellaris_input.c +++ b/hw/input/stellaris_input.c @@ -8,7 +8,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/input/gamepad.h" #include "hw/irq.h" #include "migration/vmstate.h" diff --git a/hw/input/tsc2005.c b/hw/input/tsc2005.c index b92a034496..55d61cc843 100644 --- a/hw/input/tsc2005.c +++ b/hw/input/tsc2005.c @@ -20,7 +20,6 @@ #include "qemu/osdep.h" #include "qemu/log.h" -#include "hw/hw.h" #include "qemu/timer.h" #include "sysemu/reset.h" #include "ui/console.h" diff --git a/hw/intc/etraxfs_pic.c b/hw/intc/etraxfs_pic.c index dc72dd5412..88d3b0c36f 100644 --- a/hw/intc/etraxfs_pic.c +++ b/hw/intc/etraxfs_pic.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "qemu/module.h" -#include "hw/hw.h" #include "hw/irq.h" //#include "pc.h" //#include "etraxfs.h" diff --git a/hw/intc/exynos4210_combiner.c b/hw/intc/exynos4210_combiner.c index 3b49ce4d27..833e164350 100644 --- a/hw/intc/exynos4210_combiner.c +++ b/hw/intc/exynos4210_combiner.c @@ -33,6 +33,7 @@ #include "qemu/module.h" #include "hw/arm/exynos4210.h" +#include "hw/hw.h" #include "hw/irq.h" //#define DEBUG_COMBINER diff --git a/hw/intc/heathrow_pic.c b/hw/intc/heathrow_pic.c index 572e9115aa..cb97c315da 100644 --- a/hw/intc/heathrow_pic.c +++ b/hw/intc/heathrow_pic.c @@ -24,7 +24,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/ppc/mac.h" #include "migration/vmstate.h" #include "qemu/module.h" diff --git a/hw/intc/i8259.c b/hw/intc/i8259.c index e581e6b0ab..211a98962e 100644 --- a/hw/intc/i8259.c +++ b/hw/intc/i8259.c @@ -23,7 +23,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/i386/pc.h" #include "hw/irq.h" #include "hw/isa/isa.h" diff --git a/hw/intc/ioapic.c b/hw/intc/ioapic.c index c408749876..c9cbb11f9c 100644 --- a/hw/intc/ioapic.c +++ b/hw/intc/ioapic.c @@ -23,7 +23,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "monitor/monitor.h" -#include "hw/hw.h" #include "hw/i386/pc.h" #include "hw/i386/apic.h" #include "hw/i386/ioapic.h" diff --git a/hw/intc/lm32_pic.c b/hw/intc/lm32_pic.c index 4df4eef7df..36de670c9e 100644 --- a/hw/intc/lm32_pic.c +++ b/hw/intc/lm32_pic.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" -#include "hw/hw.h" #include "migration/vmstate.h" #include "monitor/monitor.h" #include "qemu/module.h" diff --git a/hw/intc/mips_gic.c b/hw/intc/mips_gic.c index 166eb6ecce..6b4322bc5c 100644 --- a/hw/intc/mips_gic.c +++ b/hw/intc/mips_gic.c @@ -13,7 +13,6 @@ #include "qemu/log.h" #include "qemu/module.h" #include "qapi/error.h" -#include "hw/hw.h" #include "hw/sysbus.h" #include "exec/memory.h" #include "sysemu/sysemu.h" diff --git a/hw/intc/omap_intc.c b/hw/intc/omap_intc.c index 4b3ddc0a67..f740578e7e 100644 --- a/hw/intc/omap_intc.c +++ b/hw/intc/omap_intc.c @@ -19,7 +19,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/arm/omap.h" #include "hw/sysbus.h" diff --git a/hw/intc/ompic.c b/hw/intc/ompic.c index 77591f827d..8a4a422142 100644 --- a/hw/intc/ompic.c +++ b/hw/intc/ompic.c @@ -10,7 +10,6 @@ #include "qemu/log.h" #include "qemu/module.h" #include "qapi/error.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/intc/openpic.c b/hw/intc/openpic.c index bb869ca221..312ac54c7c 100644 --- a/hw/intc/openpic.c +++ b/hw/intc/openpic.c @@ -35,7 +35,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/ppc/mac.h" #include "hw/pci/pci.h" diff --git a/hw/intc/openpic_kvm.c b/hw/intc/openpic_kvm.c index 49fc6fa0cf..e91910b331 100644 --- a/hw/intc/openpic_kvm.c +++ b/hw/intc/openpic_kvm.c @@ -27,7 +27,6 @@ #include "cpu.h" #include #include "exec/address-spaces.h" -#include "hw/hw.h" #include "hw/ppc/openpic.h" #include "hw/ppc/openpic_kvm.h" #include "hw/pci/msi.h" diff --git a/hw/intc/sh_intc.c b/hw/intc/sh_intc.c index 62521500f9..72a55e32dd 100644 --- a/hw/intc/sh_intc.c +++ b/hw/intc/sh_intc.c @@ -11,7 +11,6 @@ #include "qemu/osdep.h" #include "cpu.h" #include "hw/sh4/sh_intc.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/sh4/sh.h" diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 41da9b3091..88709d4b90 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -28,7 +28,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "cpu.h" -#include "hw/hw.h" #include "trace.h" #include "qemu/timer.h" #include "hw/ppc/xics.h" diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c index 2df1f3e92c..40e3b2985b 100644 --- a/hw/intc/xics_kvm.c +++ b/hw/intc/xics_kvm.c @@ -29,7 +29,6 @@ #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" -#include "hw/hw.h" #include "trace.h" #include "sysemu/kvm.h" #include "hw/ppc/spapr.h" diff --git a/hw/intc/xics_spapr.c b/hw/intc/xics_spapr.c index 7cd3c93d71..6577be0d92 100644 --- a/hw/intc/xics_spapr.c +++ b/hw/intc/xics_spapr.c @@ -27,7 +27,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "hw/hw.h" #include "trace.h" #include "qemu/timer.h" #include "hw/ppc/spapr.h" diff --git a/hw/intc/xilinx_intc.c b/hw/intc/xilinx_intc.c index baf5353cd1..3a5c7f82f4 100644 --- a/hw/intc/xilinx_intc.c +++ b/hw/intc/xilinx_intc.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "qemu/module.h" -#include "hw/hw.h" #include "hw/irq.h" #define D(x) diff --git a/hw/ipmi/ipmi.c b/hw/ipmi/ipmi.c index a837f91782..2090c6f73a 100644 --- a/hw/ipmi/ipmi.c +++ b/hw/ipmi/ipmi.c @@ -23,7 +23,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/ipmi/ipmi.h" #include "sysemu/sysemu.h" #include "qom/object_interfaces.h" diff --git a/hw/ipmi/isa_ipmi_bt.c b/hw/ipmi/isa_ipmi_bt.c index 588dfbac34..33c800acb5 100644 --- a/hw/ipmi/isa_ipmi_bt.c +++ b/hw/ipmi/isa_ipmi_bt.c @@ -26,7 +26,6 @@ #include "qemu/log.h" #include "qemu/module.h" #include "qapi/error.h" -#include "hw/hw.h" #include "hw/ipmi/ipmi.h" #include "hw/irq.h" #include "hw/isa/isa.h" diff --git a/hw/ipmi/isa_ipmi_kcs.c b/hw/ipmi/isa_ipmi_kcs.c index e63753f03e..9a1de662ba 100644 --- a/hw/ipmi/isa_ipmi_kcs.c +++ b/hw/ipmi/isa_ipmi_kcs.c @@ -26,7 +26,6 @@ #include "qemu/log.h" #include "qemu/module.h" #include "qapi/error.h" -#include "hw/hw.h" #include "hw/ipmi/ipmi.h" #include "hw/irq.h" #include "hw/isa/isa.h" diff --git a/hw/isa/apm.c b/hw/isa/apm.c index f22b2d78a4..6300b1ba7a 100644 --- a/hw/isa/apm.c +++ b/hw/isa/apm.c @@ -22,7 +22,6 @@ #include "qemu/osdep.h" #include "hw/isa/apm.h" -#include "hw/hw.h" #include "hw/pci/pci.h" #include "migration/vmstate.h" diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c index 79d44c1b41..a037c21104 100644 --- a/hw/isa/lpc_ich9.c +++ b/hw/isa/lpc_ich9.c @@ -30,7 +30,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "hw/hw.h" #include "qapi/visitor.h" #include "qemu/range.h" #include "hw/isa/isa.h" diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c index 8abd5daaae..3294056cd5 100644 --- a/hw/isa/piix4.c +++ b/hw/isa/piix4.c @@ -23,7 +23,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/i386/pc.h" #include "hw/pci/pci.h" #include "hw/isa/isa.h" diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index d98b94ab05..7379d90cf4 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -11,7 +11,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/isa/vt82c686.h" #include "hw/i2c/i2c.h" #include "hw/pci/pci.h" diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c index d710980045..5ae308bfcf 100644 --- a/hw/lm32/lm32_boards.c +++ b/hw/lm32/lm32_boards.c @@ -22,7 +22,6 @@ #include "qemu/error-report.h" #include "cpu.h" #include "hw/sysbus.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/block/flash.h" #include "hw/boards.h" diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c index 864712d977..5ec3ae0300 100644 --- a/hw/lm32/milkymist.c +++ b/hw/lm32/milkymist.c @@ -23,7 +23,6 @@ #include "qemu-common.h" #include "cpu.h" #include "hw/sysbus.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/block/flash.h" #include "sysemu/sysemu.h" diff --git a/hw/m68k/an5206.c b/hw/m68k/an5206.c index 68d15a6ebe..54ccbe1a82 100644 --- a/hw/m68k/an5206.c +++ b/hw/m68k/an5206.c @@ -9,7 +9,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "cpu.h" -#include "hw/hw.h" #include "hw/m68k/mcf.h" #include "hw/boards.h" #include "hw/loader.h" diff --git a/hw/microblaze/boot.h b/hw/microblaze/boot.h index dd1090d8b5..5a8c2f7975 100644 --- a/hw/microblaze/boot.h +++ b/hw/microblaze/boot.h @@ -1,7 +1,6 @@ #ifndef MICROBLAZE_BOOT_H #define MICROBLAZE_BOOT_H -#include "hw/hw.h" void microblaze_load_kernel(MicroBlazeCPU *cpu, hwaddr ddr_base, uint32_t ramsize, diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c index a88bf16cc8..03f6c1cc7c 100644 --- a/hw/microblaze/petalogix_ml605_mmu.c +++ b/hw/microblaze/petalogix_ml605_mmu.c @@ -30,7 +30,6 @@ #include "qapi/error.h" #include "cpu.h" #include "hw/sysbus.h" -#include "hw/hw.h" #include "net/net.h" #include "hw/block/flash.h" #include "sysemu/sysemu.h" diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c index 8d83474262..849bafc186 100644 --- a/hw/microblaze/petalogix_s3adsp1800_mmu.c +++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c @@ -28,7 +28,6 @@ #include "qapi/error.h" #include "cpu.h" #include "hw/sysbus.h" -#include "hw/hw.h" #include "net/net.h" #include "hw/block/flash.h" #include "sysemu/sysemu.h" diff --git a/hw/mips/addr.c b/hw/mips/addr.c index 4da46e1731..2f138fe1ea 100644 --- a/hw/mips/addr.c +++ b/hw/mips/addr.c @@ -21,7 +21,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/mips/cpudevs.h" static int mips_um_ksegs; diff --git a/hw/mips/boston.c b/hw/mips/boston.c index 9eeccbea9a..ce86b75664 100644 --- a/hw/mips/boston.c +++ b/hw/mips/boston.c @@ -23,7 +23,6 @@ #include "exec/address-spaces.h" #include "hw/boards.h" #include "hw/char/serial.h" -#include "hw/hw.h" #include "hw/ide/pci.h" #include "hw/ide/ahci.h" #include "hw/loader.h" diff --git a/hw/mips/gt64xxx_pci.c b/hw/mips/gt64xxx_pci.c index b4412c6c24..f325bd6c1c 100644 --- a/hw/mips/gt64xxx_pci.c +++ b/hw/mips/gt64xxx_pci.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "qemu/log.h" -#include "hw/hw.h" #include "hw/mips/mips.h" #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c index 0a1bf5ef5c..6e4fba285b 100644 --- a/hw/mips/mips_fulong2e.c +++ b/hw/mips/mips_fulong2e.c @@ -23,7 +23,6 @@ #include "qemu/units.h" #include "qapi/error.h" #include "cpu.h" -#include "hw/hw.h" #include "hw/i386/pc.h" #include "hw/dma/i8257.h" #include "hw/isa/superio.h" diff --git a/hw/mips/mips_int.c b/hw/mips/mips_int.c index ae4244c32e..74cf587d5b 100644 --- a/hw/mips/mips_int.c +++ b/hw/mips/mips_int.c @@ -22,7 +22,6 @@ #include "qemu/osdep.h" #include "qemu/main-loop.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/mips/cpudevs.h" #include "cpu.h" diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c index 6ea25cd5f4..388c15c376 100644 --- a/hw/mips/mips_jazz.c +++ b/hw/mips/mips_jazz.c @@ -24,7 +24,6 @@ #include "qemu/osdep.h" #include "qemu-common.h" -#include "hw/hw.h" #include "hw/mips/mips.h" #include "hw/mips/cpudevs.h" #include "hw/i386/pc.h" diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 02200ab7d4..bdba712329 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -26,7 +26,6 @@ #include "qemu/units.h" #include "qemu-common.h" #include "cpu.h" -#include "hw/hw.h" #include "hw/i386/pc.h" #include "hw/isa/superio.h" #include "hw/dma/i8257.h" diff --git a/hw/mips/mips_mipssim.c b/hw/mips/mips_mipssim.c index 280e76a482..1ca7e909d1 100644 --- a/hw/mips/mips_mipssim.c +++ b/hw/mips/mips_mipssim.c @@ -29,7 +29,6 @@ #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" -#include "hw/hw.h" #include "hw/mips/mips.h" #include "hw/mips/cpudevs.h" #include "hw/char/serial.h" diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c index 191047826d..a41b0b0524 100644 --- a/hw/mips/mips_r4k.c +++ b/hw/mips/mips_r4k.c @@ -13,7 +13,6 @@ #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" -#include "hw/hw.h" #include "hw/mips/mips.h" #include "hw/mips/cpudevs.h" #include "hw/i386/pc.h" diff --git a/hw/misc/applesmc.c b/hw/misc/applesmc.c index 2d7eb3c7e2..d9d369777c 100644 --- a/hw/misc/applesmc.c +++ b/hw/misc/applesmc.c @@ -31,7 +31,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/isa/isa.h" #include "ui/console.h" #include "qemu/module.h" diff --git a/hw/misc/arm_integrator_debug.c b/hw/misc/arm_integrator_debug.c index 2646107b97..3e23201ae6 100644 --- a/hw/misc/arm_integrator_debug.c +++ b/hw/misc/arm_integrator_debug.c @@ -15,7 +15,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/sysbus.h" #include "hw/misc/arm_integrator_debug.h" #include "qemu/log.h" diff --git a/hw/misc/arm_sysctl.c b/hw/misc/arm_sysctl.c index 47051436f4..2a4e0458c7 100644 --- a/hw/misc/arm_sysctl.c +++ b/hw/misc/arm_sysctl.c @@ -8,7 +8,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "qemu/timer.h" #include "qemu/bitops.h" diff --git a/hw/misc/debugexit.c b/hw/misc/debugexit.c index 8e4a2fc701..752cb53cf6 100644 --- a/hw/misc/debugexit.c +++ b/hw/misc/debugexit.c @@ -8,7 +8,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/isa/isa.h" #include "qemu/module.h" diff --git a/hw/misc/edu.c b/hw/misc/edu.c index 3b6dba2c72..d5e2bdbb57 100644 --- a/hw/misc/edu.c +++ b/hw/misc/edu.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "hw/pci/pci.h" +#include "hw/hw.h" #include "hw/pci/msi.h" #include "qemu/timer.h" #include "qemu/main-loop.h" /* iothread mutex */ diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index d9b7ea145c..7a2334c98b 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -21,7 +21,6 @@ #include "qemu/units.h" #include "qapi/error.h" #include "qemu/cutils.h" -#include "hw/hw.h" #include "hw/pci/pci.h" #include "hw/pci/msi.h" #include "hw/pci/msix.h" diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c index feb80df0ff..5e8ee80c25 100644 --- a/hw/misc/macio/cuda.c +++ b/hw/misc/macio/cuda.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include "qemu-common.h" -#include "hw/hw.h" #include "hw/ppc/mac.h" #include "migration/vmstate.h" #include "hw/input/adb.h" diff --git a/hw/misc/macio/gpio.c b/hw/misc/macio/gpio.c index 6f90afefb7..e62b622112 100644 --- a/hw/misc/macio/gpio.c +++ b/hw/misc/macio/gpio.c @@ -24,7 +24,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/ppc/mac.h" #include "migration/vmstate.h" #include "hw/misc/macio/macio.h" diff --git a/hw/misc/macio/mac_dbdma.c b/hw/misc/macio/mac_dbdma.c index beaf083578..e220f1a927 100644 --- a/hw/misc/macio/mac_dbdma.c +++ b/hw/misc/macio/mac_dbdma.c @@ -38,7 +38,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/ppc/mac_dbdma.h" #include "migration/vmstate.h" diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c index c797bbd698..222f163139 100644 --- a/hw/misc/macio/macio.c +++ b/hw/misc/macio/macio.c @@ -26,7 +26,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/module.h" -#include "hw/hw.h" #include "hw/ppc/mac.h" #include "hw/misc/macio/cuda.h" #include "hw/pci/pci.h" diff --git a/hw/misc/macio/pmu.c b/hw/misc/macio/pmu.c index 507f62ba64..d824a068d9 100644 --- a/hw/misc/macio/pmu.c +++ b/hw/misc/macio/pmu.c @@ -30,7 +30,6 @@ #include "qemu/osdep.h" #include "qemu-common.h" -#include "hw/hw.h" #include "hw/ppc/mac.h" #include "migration/vmstate.h" #include "hw/input/adb.h" diff --git a/hw/misc/milkymist-hpdmc.c b/hw/misc/milkymist-hpdmc.c index e9722d6c76..61e86e6b34 100644 --- a/hw/misc/milkymist-hpdmc.c +++ b/hw/misc/milkymist-hpdmc.c @@ -22,7 +22,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "trace.h" diff --git a/hw/misc/milkymist-pfpu.c b/hw/misc/milkymist-pfpu.c index 8c6baf5406..516825e83d 100644 --- a/hw/misc/milkymist-pfpu.c +++ b/hw/misc/milkymist-pfpu.c @@ -23,7 +23,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/misc/mips_cmgcr.c b/hw/misc/mips_cmgcr.c index 6dcdb4a225..6bddb2312a 100644 --- a/hw/misc/mips_cmgcr.c +++ b/hw/misc/mips_cmgcr.c @@ -12,7 +12,6 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "qemu/module.h" -#include "hw/hw.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "sysemu/sysemu.h" diff --git a/hw/misc/mos6522.c b/hw/misc/mos6522.c index 7e6dead089..f06cf0b52a 100644 --- a/hw/misc/mos6522.c +++ b/hw/misc/mos6522.c @@ -25,7 +25,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/input/adb.h" #include "hw/irq.h" #include "hw/misc/mos6522.h" diff --git a/hw/misc/mst_fpga.c b/hw/misc/mst_fpga.c index d002870e56..81abdf8ede 100644 --- a/hw/misc/mst_fpga.c +++ b/hw/misc/mst_fpga.c @@ -12,7 +12,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/misc/omap_gpmc.c b/hw/misc/omap_gpmc.c index 6253b0b2d4..10de7a5523 100644 --- a/hw/misc/omap_gpmc.c +++ b/hw/misc/omap_gpmc.c @@ -20,7 +20,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/block/flash.h" #include "hw/arm/omap.h" diff --git a/hw/misc/omap_l4.c b/hw/misc/omap_l4.c index c217728c78..61b6df564a 100644 --- a/hw/misc/omap_l4.c +++ b/hw/misc/omap_l4.c @@ -18,7 +18,6 @@ * with this program; if not, see . */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/arm/omap.h" struct omap_l4_s { diff --git a/hw/misc/omap_sdrc.c b/hw/misc/omap_sdrc.c index 7b38c5568c..f2f72f6810 100644 --- a/hw/misc/omap_sdrc.c +++ b/hw/misc/omap_sdrc.c @@ -18,7 +18,6 @@ * with this program; if not, see . */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/arm/omap.h" /* SDRAM Controller Subsystem */ diff --git a/hw/misc/pc-testdev.c b/hw/misc/pc-testdev.c index 46adb6b5fc..94cf55440e 100644 --- a/hw/misc/pc-testdev.c +++ b/hw/misc/pc-testdev.c @@ -36,7 +36,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/qdev.h" #include "qemu/module.h" #include "hw/irq.h" diff --git a/hw/misc/pca9552.c b/hw/misc/pca9552.c index bb05811e1f..73be28d936 100644 --- a/hw/misc/pca9552.c +++ b/hw/misc/pca9552.c @@ -12,7 +12,6 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "qemu/module.h" -#include "hw/hw.h" #include "hw/misc/pca9552.h" #include "hw/misc/pca9552_regs.h" #include "migration/vmstate.h" diff --git a/hw/misc/pci-testdev.c b/hw/misc/pci-testdev.c index d4d89df4cf..0eb9ed5469 100644 --- a/hw/misc/pci-testdev.c +++ b/hw/misc/pci-testdev.c @@ -19,7 +19,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/pci/pci.h" #include "qemu/event_notifier.h" #include "qemu/module.h" diff --git a/hw/misc/puv3_pm.c b/hw/misc/puv3_pm.c index b538b4afbb..c213500d9c 100644 --- a/hw/misc/puv3_pm.c +++ b/hw/misc/puv3_pm.c @@ -10,7 +10,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/sysbus.h" #undef DEBUG_PUV3 diff --git a/hw/misc/tmp105.c b/hw/misc/tmp105.c index 28996473cb..75ddad3a12 100644 --- a/hw/misc/tmp105.c +++ b/hw/misc/tmp105.c @@ -19,7 +19,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/i2c/i2c.h" #include "hw/irq.h" #include "migration/vmstate.h" diff --git a/hw/misc/tmp421.c b/hw/misc/tmp421.c index 6728aa7e10..9f044705fa 100644 --- a/hw/misc/tmp421.c +++ b/hw/misc/tmp421.c @@ -25,7 +25,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/i2c/i2c.h" #include "migration/vmstate.h" #include "qapi/error.h" diff --git a/hw/misc/unimp.c b/hw/misc/unimp.c index 7f8e42cc2c..0e1cb24629 100644 --- a/hw/misc/unimp.c +++ b/hw/misc/unimp.c @@ -12,7 +12,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/sysbus.h" #include "hw/misc/unimp.h" #include "qemu/log.h" diff --git a/hw/misc/zynq-xadc.c b/hw/misc/zynq-xadc.c index edfe76ba20..7745df4c85 100644 --- a/hw/misc/zynq-xadc.c +++ b/hw/misc/zynq-xadc.c @@ -14,7 +14,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/misc/zynq-xadc.h" #include "migration/vmstate.h" diff --git a/hw/misc/zynq_slcr.c b/hw/misc/zynq_slcr.c index 82430a146a..d4fdd2c26d 100644 --- a/hw/misc/zynq_slcr.c +++ b/hw/misc/zynq_slcr.c @@ -15,7 +15,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "qemu/timer.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/moxie/moxiesim.c b/hw/moxie/moxiesim.c index 16a7d58274..57af1b4891 100644 --- a/hw/moxie/moxiesim.c +++ b/hw/moxie/moxiesim.c @@ -30,7 +30,6 @@ #include "qapi/error.h" #include "cpu.h" #include "hw/sysbus.h" -#include "hw/hw.h" #include "net/net.h" #include "sysemu/reset.h" #include "sysemu/sysemu.h" diff --git a/hw/net/can/can_kvaser_pci.c b/hw/net/can/can_kvaser_pci.c index 10963ef58c..401da73cc8 100644 --- a/hw/net/can/can_kvaser_pci.c +++ b/hw/net/can/can_kvaser_pci.c @@ -36,7 +36,6 @@ #include "qemu/sockets.h" #include "qapi/error.h" #include "chardev/char.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/pci/pci.h" #include "migration/vmstate.h" diff --git a/hw/net/can/can_mioe3680_pci.c b/hw/net/can/can_mioe3680_pci.c index 9e060dff01..0f0ca912c9 100644 --- a/hw/net/can/can_mioe3680_pci.c +++ b/hw/net/can/can_mioe3680_pci.c @@ -32,7 +32,6 @@ #include "qemu/sockets.h" #include "qapi/error.h" #include "chardev/char.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/pci/pci.h" #include "migration/vmstate.h" diff --git a/hw/net/can/can_pcm3680_pci.c b/hw/net/can/can_pcm3680_pci.c index 5d12f0c552..632eb0b59b 100644 --- a/hw/net/can/can_pcm3680_pci.c +++ b/hw/net/can/can_pcm3680_pci.c @@ -32,7 +32,6 @@ #include "qemu/sockets.h" #include "qapi/error.h" #include "chardev/char.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/pci/pci.h" #include "migration/vmstate.h" diff --git a/hw/net/can/can_sja1000.c b/hw/net/can/can_sja1000.c index 6c84be6d29..1f81341554 100644 --- a/hw/net/can/can_sja1000.c +++ b/hw/net/can/can_sja1000.c @@ -28,7 +28,6 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "chardev/char.h" -#include "hw/hw.h" #include "hw/irq.h" #include "migration/vmstate.h" #include "net/can_emu.h" diff --git a/hw/net/e1000.c b/hw/net/e1000.c index 81193231ea..1d035b8ff7 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -26,7 +26,6 @@ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/pci/pci.h" #include "migration/vmstate.h" #include "net/net.h" diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c index 22e3132581..270ff93841 100644 --- a/hw/net/e1000e.c +++ b/hw/net/e1000e.c @@ -40,6 +40,7 @@ #include "qemu/module.h" #include "qemu/range.h" #include "sysemu/sysemu.h" +#include "hw/hw.h" #include "hw/pci/msi.h" #include "hw/pci/msix.h" #include "migration/vmstate.h" diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c index 2a221c2ef9..40e41fdd92 100644 --- a/hw/net/e1000e_core.c +++ b/hw/net/e1000e_core.c @@ -37,6 +37,7 @@ #include "sysemu/sysemu.h" #include "net/net.h" #include "net/tap.h" +#include "hw/hw.h" #include "hw/pci/msi.h" #include "hw/pci/msix.h" diff --git a/hw/net/e1000x_common.c b/hw/net/e1000x_common.c index 09047806f2..717f9df1c9 100644 --- a/hw/net/e1000x_common.c +++ b/hw/net/e1000x_common.c @@ -24,7 +24,6 @@ #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/hw.h" #include "hw/pci/pci.h" #include "net/net.h" diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c index 3c1c534cbf..2ad1b328e4 100644 --- a/hw/net/eepro100.c +++ b/hw/net/eepro100.c @@ -42,7 +42,6 @@ #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/hw.h" #include "hw/pci/pci.h" #include "migration/vmstate.h" #include "net/net.h" diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c index 937d5603e2..1d32cb79e2 100644 --- a/hw/net/lan9118.c +++ b/hw/net/lan9118.c @@ -15,6 +15,7 @@ #include "migration/vmstate.h" #include "net/net.h" #include "net/eth.h" +#include "hw/hw.h" #include "hw/irq.h" #include "hw/net/lan9118.h" #include "sysemu/sysemu.h" diff --git a/hw/net/milkymist-minimac2.c b/hw/net/milkymist-minimac2.c index a7d879f0ab..1e3fb9c220 100644 --- a/hw/net/milkymist-minimac2.c +++ b/hw/net/milkymist-minimac2.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "cpu.h" /* FIXME: why does this use TARGET_PAGE_ALIGN? */ -#include "hw/hw.h" #include "hw/irq.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/net/mipsnet.c b/hw/net/mipsnet.c index 3910beb9a6..013f762d72 100644 --- a/hw/net/mipsnet.c +++ b/hw/net/mipsnet.c @@ -1,5 +1,4 @@ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "net/net.h" #include "qemu/module.h" diff --git a/hw/net/ne2000.h b/hw/net/ne2000.h index 2cd193e4c6..fc75843703 100644 --- a/hw/net/ne2000.h +++ b/hw/net/ne2000.h @@ -2,7 +2,6 @@ #define HW_NE2000_H #include "qemu/units.h" -#include "hw/hw.h" #include "net/net.h" #define NE2000_PMEM_SIZE (32 * KiB) diff --git a/hw/net/opencores_eth.c b/hw/net/opencores_eth.c index 3e759d79d8..a9e96cdd3a 100644 --- a/hw/net/opencores_eth.c +++ b/hw/net/opencores_eth.c @@ -32,7 +32,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/net/mii.h" #include "hw/sysbus.h" diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c index 4ce8f62a2a..789e5c4876 100644 --- a/hw/net/rocker/rocker.c +++ b/hw/net/rocker/rocker.c @@ -16,7 +16,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/pci/pci.h" #include "migration/vmstate.h" #include "hw/pci/msix.h" diff --git a/hw/net/rocker/rocker_desc.c b/hw/net/rocker/rocker_desc.c index b009da4f89..01845f1157 100644 --- a/hw/net/rocker/rocker_desc.c +++ b/hw/net/rocker/rocker_desc.c @@ -16,7 +16,6 @@ #include "qemu/osdep.h" #include "net/net.h" -#include "hw/hw.h" #include "hw/pci/pci.h" #include "rocker.h" diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c index 9975af44dd..89156ed802 100644 --- a/hw/net/rtl8139.c +++ b/hw/net/rtl8139.c @@ -53,7 +53,6 @@ #include "qemu/osdep.h" #include -#include "hw/hw.h" #include "hw/pci/pci.h" #include "migration/vmstate.h" #include "sysemu/dma.h" diff --git a/hw/net/spapr_llan.c b/hw/net/spapr_llan.c index 0ce5e37a28..60085b1bf4 100644 --- a/hw/net/spapr_llan.c +++ b/hw/net/spapr_llan.c @@ -27,7 +27,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "hw/hw.h" #include "hw/irq.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/net/sunhme.c b/hw/net/sunhme.c index 9d8fd70f51..359bd4f9f5 100644 --- a/hw/net/sunhme.c +++ b/hw/net/sunhme.c @@ -23,7 +23,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/pci/pci.h" #include "migration/vmstate.h" #include "hw/net/mii.h" diff --git a/hw/net/xen_nic.c b/hw/net/xen_nic.c index ffb3b5898d..00a7fdf843 100644 --- a/hw/net/xen_nic.c +++ b/hw/net/xen_nic.c @@ -24,7 +24,6 @@ #include #include -#include "hw/hw.h" #include "net/net.h" #include "net/checksum.h" #include "net/util.h" diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c index b1247a1d9b..b22e344a4b 100644 --- a/hw/net/xilinx_axienet.c +++ b/hw/net/xilinx_axienet.c @@ -30,6 +30,7 @@ #include "net/net.h" #include "net/checksum.h" +#include "hw/hw.h" #include "hw/irq.h" #include "hw/stream.h" diff --git a/hw/net/xilinx_ethlite.c b/hw/net/xilinx_ethlite.c index 27a4fc8d87..a963087f16 100644 --- a/hw/net/xilinx_ethlite.c +++ b/hw/net/xilinx_ethlite.c @@ -26,7 +26,6 @@ #include "qemu/module.h" #include "cpu.h" /* FIXME should not use tswap* */ #include "hw/sysbus.h" -#include "hw/hw.h" #include "hw/irq.h" #include "net/net.h" diff --git a/hw/nios2/10m50_devboard.c b/hw/nios2/10m50_devboard.c index 2c3388f5cf..3c01e4f667 100644 --- a/hw/nios2/10m50_devboard.c +++ b/hw/nios2/10m50_devboard.c @@ -27,7 +27,6 @@ #include "cpu.h" #include "hw/sysbus.h" -#include "hw/hw.h" #include "hw/char/serial.h" #include "sysemu/sysemu.h" #include "hw/boards.h" diff --git a/hw/nios2/boot.h b/hw/nios2/boot.h index 3116753818..59b9fbfc62 100644 --- a/hw/nios2/boot.h +++ b/hw/nios2/boot.h @@ -1,7 +1,6 @@ #ifndef NIOS2_BOOT_H #define NIOS2_BOOT_H -#include "hw/hw.h" #include "cpu.h" void nios2_load_kernel(Nios2CPU *cpu, hwaddr ddr_base, uint32_t ramsize, diff --git a/hw/nios2/generic_nommu.c b/hw/nios2/generic_nommu.c index 1788ffa7a4..2ec91e899b 100644 --- a/hw/nios2/generic_nommu.c +++ b/hw/nios2/generic_nommu.c @@ -32,7 +32,6 @@ #include "cpu.h" #include "hw/sysbus.h" -#include "hw/hw.h" #include "hw/char/serial.h" #include "sysemu/sysemu.h" #include "hw/boards.h" diff --git a/hw/nvram/chrp_nvram.c b/hw/nvram/chrp_nvram.c index 3837510dd2..d969f26704 100644 --- a/hw/nvram/chrp_nvram.c +++ b/hw/nvram/chrp_nvram.c @@ -21,7 +21,6 @@ #include "qemu/osdep.h" #include "qemu/cutils.h" -#include "hw/hw.h" #include "hw/nvram/chrp_nvram.h" #include "sysemu/sysemu.h" diff --git a/hw/nvram/eeprom93xx.c b/hw/nvram/eeprom93xx.c index c2b012d583..5b01b9b03f 100644 --- a/hw/nvram/eeprom93xx.c +++ b/hw/nvram/eeprom93xx.c @@ -36,7 +36,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/nvram/eeprom93xx.h" #include "migration/qemu-file-types.h" #include "migration/vmstate.h" diff --git a/hw/nvram/eeprom_at24c.c b/hw/nvram/eeprom_at24c.c index f75a485738..00f942db51 100644 --- a/hw/nvram/eeprom_at24c.c +++ b/hw/nvram/eeprom_at24c.c @@ -11,7 +11,6 @@ #include "qapi/error.h" #include "qemu/module.h" -#include "hw/hw.h" #include "hw/i2c/i2c.h" #include "sysemu/block-backend.h" diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index a5e614016a..f192c3ea16 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -24,7 +24,6 @@ #include "qemu/osdep.h" #include "qemu-common.h" -#include "hw/hw.h" #include "sysemu/sysemu.h" #include "sysemu/dma.h" #include "sysemu/reset.h" diff --git a/hw/nvram/mac_nvram.c b/hw/nvram/mac_nvram.c index 4f0d2f6bd4..853b693109 100644 --- a/hw/nvram/mac_nvram.c +++ b/hw/nvram/mac_nvram.c @@ -24,7 +24,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/nvram/chrp_nvram.h" #include "hw/ppc/mac.h" #include "migration/vmstate.h" diff --git a/hw/openrisc/cputimer.c b/hw/openrisc/cputimer.c index e9f89333dc..93268815d8 100644 --- a/hw/openrisc/cputimer.c +++ b/hw/openrisc/cputimer.c @@ -20,7 +20,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "hw/hw.h" #include "migration/vmstate.h" #include "qemu/timer.h" diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c index 965d5b44ee..13572b8eff 100644 --- a/hw/openrisc/openrisc_sim.c +++ b/hw/openrisc/openrisc_sim.c @@ -22,7 +22,6 @@ #include "qemu/error-report.h" #include "qapi/error.h" #include "cpu.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/boards.h" #include "elf.h" diff --git a/hw/openrisc/pic_cpu.c b/hw/openrisc/pic_cpu.c index d3f179ff8d..36f9350830 100644 --- a/hw/openrisc/pic_cpu.c +++ b/hw/openrisc/pic_cpu.c @@ -19,7 +19,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "cpu.h" diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index 58870e0d87..30e078763f 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -39,7 +39,6 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" -#include "hw/hw.h" #include "hw/pci/pci.h" #include "hw/i386/pc.h" #include "hw/irq.h" diff --git a/hw/pci-host/gpex.c b/hw/pci-host/gpex.c index 1a45c30505..93f28efb49 100644 --- a/hw/pci-host/gpex.c +++ b/hw/pci-host/gpex.c @@ -31,7 +31,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/pci-host/gpex.h" #include "migration/vmstate.h" diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index 9e8c8542d3..bc9726057a 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -23,7 +23,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/i386/pc.h" #include "hw/irq.h" #include "hw/pci/pci.h" diff --git a/hw/pci-host/ppce500.c b/hw/pci-host/ppce500.c index 840869f19c..241e7e788d 100644 --- a/hw/pci-host/ppce500.c +++ b/hw/pci-host/ppce500.c @@ -15,7 +15,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/ppc/e500-ccsr.h" #include "migration/vmstate.h" diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c index 34a36812ea..588c7dc6c0 100644 --- a/hw/pci-host/prep.c +++ b/hw/pci-host/prep.c @@ -27,7 +27,6 @@ #include "qemu-common.h" #include "qemu/units.h" #include "qapi/error.h" -#include "hw/hw.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bus.h" #include "hw/pci/pci_host.h" diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index 25335a8b71..1688a89b6a 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -29,7 +29,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/pci-host/q35.h" #include "migration/vmstate.h" #include "qapi/error.h" diff --git a/hw/pci-host/uninorth.c b/hw/pci-host/uninorth.c index 4ffb2d0d03..76293ab22b 100644 --- a/hw/pci-host/uninorth.c +++ b/hw/pci-host/uninorth.c @@ -23,7 +23,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/ppc/mac.h" #include "qemu/module.h" diff --git a/hw/pci/msix.c b/hw/pci/msix.c index 81a23accf3..29187898f2 100644 --- a/hw/pci/msix.c +++ b/hw/pci/msix.c @@ -15,7 +15,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/pci/msi.h" #include "hw/pci/msix.h" #include "hw/pci/pci.h" diff --git a/hw/pci/pci.c b/hw/pci/pci.c index de3691eee4..d84ecd8507 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -24,7 +24,6 @@ #include "qemu/osdep.h" #include "qemu-common.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bridge.h" diff --git a/hw/pci/pcie_host.c b/hw/pci/pcie_host.c index d6768b8eb6..3534006f99 100644 --- a/hw/pci/pcie_host.c +++ b/hw/pci/pcie_host.c @@ -20,7 +20,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/pci/pci.h" #include "hw/pci/pcie_host.h" #include "qemu/module.h" diff --git a/hw/pcmcia/pcmcia.c b/hw/pcmcia/pcmcia.c index c16b12db01..03d13e7d67 100644 --- a/hw/pcmcia/pcmcia.c +++ b/hw/pcmcia/pcmcia.c @@ -6,7 +6,6 @@ #include "qemu/osdep.h" #include "qemu/module.h" -#include "hw/hw.h" #include "hw/pcmcia.h" static const TypeInfo pcmcia_card_type_info = { diff --git a/hw/pcmcia/pxa2xx.c b/hw/pcmcia/pxa2xx.c index 26ab2267de..14e4dfe8b1 100644 --- a/hw/pcmcia/pxa2xx.c +++ b/hw/pcmcia/pxa2xx.c @@ -11,7 +11,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/sysbus.h" #include "qemu/module.h" diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 0451a4e338..3f0c3dea92 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -22,7 +22,6 @@ #include "e500-ccsr.h" #include "net/net.h" #include "qemu/config-file.h" -#include "hw/hw.h" #include "hw/char/serial.h" #include "hw/pci/pci.h" #include "hw/boards.h" diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index 0f9f351eb1..94a958e5e0 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -49,7 +49,6 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "qapi/error.h" -#include "hw/hw.h" #include "hw/ppc/ppc.h" #include "hw/ppc/mac.h" #include "hw/input/adb.h" diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c index 6640057473..aeeddd1d3b 100644 --- a/hw/ppc/mac_oldworld.c +++ b/hw/ppc/mac_oldworld.c @@ -28,7 +28,6 @@ #include "qemu-common.h" #include "qemu/units.h" #include "qapi/error.h" -#include "hw/hw.h" #include "hw/ppc/ppc.h" #include "mac.h" #include "hw/input/adb.h" diff --git a/hw/ppc/mpc8544_guts.c b/hw/ppc/mpc8544_guts.c index 2b7cc14060..ad9c219a8f 100644 --- a/hw/ppc/mpc8544_guts.c +++ b/hw/ppc/mpc8544_guts.c @@ -20,7 +20,6 @@ #include "qemu/osdep.h" #include "qemu/module.h" #include "cpu.h" -#include "hw/hw.h" #include "sysemu/sysemu.h" #include "hw/sysbus.h" diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index 96608883aa..114d5826df 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -26,7 +26,6 @@ #include "sysemu/reset.h" #include "sysemu/cpus.h" #include "sysemu/device_tree.h" -#include "hw/hw.h" #include "target/ppc/cpu.h" #include "qemu/log.h" #include "hw/ppc/fdt.h" diff --git a/hw/ppc/pnv_bmc.c b/hw/ppc/pnv_bmc.c index 4b76d34f0a..a27776aa99 100644 --- a/hw/ppc/pnv_bmc.c +++ b/hw/ppc/pnv_bmc.c @@ -17,7 +17,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "sysemu/sysemu.h" #include "target/ppc/cpu.h" #include "qemu/log.h" diff --git a/hw/ppc/pnv_occ.c b/hw/ppc/pnv_occ.c index 636f91f311..6120405379 100644 --- a/hw/ppc/pnv_occ.c +++ b/hw/ppc/pnv_occ.c @@ -17,7 +17,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "sysemu/sysemu.h" #include "target/ppc/cpu.h" #include "qapi/error.h" diff --git a/hw/ppc/pnv_psi.c b/hw/ppc/pnv_psi.c index e66aeec4aa..f10d519014 100644 --- a/hw/ppc/pnv_psi.c +++ b/hw/ppc/pnv_psi.c @@ -18,7 +18,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "target/ppc/cpu.h" #include "qemu/log.h" diff --git a/hw/ppc/pnv_xscom.c b/hw/ppc/pnv_xscom.c index 2b81c75f56..0e31c5786b 100644 --- a/hw/ppc/pnv_xscom.c +++ b/hw/ppc/pnv_xscom.c @@ -18,7 +18,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "qemu/log.h" #include "qemu/module.h" #include "sysemu/hw_accel.h" diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c index 5cc321828e..a1192d7889 100644 --- a/hw/ppc/ppc.c +++ b/hw/ppc/ppc.c @@ -24,7 +24,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/ppc/ppc.h" #include "hw/ppc/ppc_e500.h" diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c index 5b278e7791..388cae0b43 100644 --- a/hw/ppc/ppc405_boards.c +++ b/hw/ppc/ppc405_boards.c @@ -27,7 +27,6 @@ #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" -#include "hw/hw.h" #include "hw/ppc/ppc.h" #include "ppc405.h" #include "hw/timer/m48t59.h" diff --git a/hw/ppc/ppc405_uc.c b/hw/ppc/ppc405_uc.c index bb62714fd9..ba092f2931 100644 --- a/hw/ppc/ppc405_uc.c +++ b/hw/ppc/ppc405_uc.c @@ -26,7 +26,6 @@ #include "qemu/units.h" #include "qapi/error.h" #include "cpu.h" -#include "hw/hw.h" #include "hw/ppc/ppc.h" #include "hw/boards.h" #include "hw/i2c/ppc4xx_i2c.h" diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c index 1bd92aa749..4d95c0f8a8 100644 --- a/hw/ppc/ppc440_bamboo.c +++ b/hw/ppc/ppc440_bamboo.c @@ -17,7 +17,6 @@ #include "qemu-common.h" #include "qemu/error-report.h" #include "net/net.h" -#include "hw/hw.h" #include "hw/pci/pci.h" #include "hw/boards.h" #include "sysemu/kvm.h" diff --git a/hw/ppc/ppc440_pcix.c b/hw/ppc/ppc440_pcix.c index 77a78388c1..2ee2d4f4fc 100644 --- a/hw/ppc/ppc440_pcix.c +++ b/hw/ppc/ppc440_pcix.c @@ -23,7 +23,6 @@ #include "qemu/error-report.h" #include "qemu/log.h" #include "qemu/module.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/ppc/ppc.h" #include "hw/ppc/ppc4xx.h" diff --git a/hw/ppc/ppc440_uc.c b/hw/ppc/ppc440_uc.c index 6570c2d120..e7f42d78a1 100644 --- a/hw/ppc/ppc440_uc.c +++ b/hw/ppc/ppc440_uc.c @@ -15,7 +15,6 @@ #include "qemu/log.h" #include "qemu/module.h" #include "cpu.h" -#include "hw/hw.h" #include "hw/irq.h" #include "exec/address-spaces.h" #include "exec/memory.h" diff --git a/hw/ppc/ppc4xx_devs.c b/hw/ppc/ppc4xx_devs.c index 49d714756f..c2e50138aa 100644 --- a/hw/ppc/ppc4xx_devs.c +++ b/hw/ppc/ppc4xx_devs.c @@ -26,7 +26,6 @@ #include "qemu/units.h" #include "sysemu/reset.h" #include "cpu.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/ppc/ppc.h" #include "hw/ppc/ppc4xx.h" diff --git a/hw/ppc/ppc4xx_pci.c b/hw/ppc/ppc4xx_pci.c index 7334d75890..3ea47df71f 100644 --- a/hw/ppc/ppc4xx_pci.c +++ b/hw/ppc/ppc4xx_pci.c @@ -20,7 +20,6 @@ * 4xx SoCs, such as the 440EP. */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/ppc/ppc.h" #include "hw/ppc/ppc4xx.h" diff --git a/hw/ppc/ppc_booke.c b/hw/ppc/ppc_booke.c index ba5f513ca5..ce0e1406e1 100644 --- a/hw/ppc/ppc_booke.c +++ b/hw/ppc/ppc_booke.c @@ -24,7 +24,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "hw/hw.h" #include "hw/ppc/ppc.h" #include "qemu/timer.h" #include "sysemu/reset.h" diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index 01dc7e111b..4f3c6bf190 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "hw/hw.h" #include "hw/timer/m48t59.h" #include "hw/char/serial.h" #include "hw/block/fdc.h" diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c index c1d6f74d5b..7ed5518dbc 100644 --- a/hw/ppc/sam460ex.c +++ b/hw/ppc/sam460ex.c @@ -16,7 +16,6 @@ #include "qemu-common.h" #include "qemu/error-report.h" #include "qapi/error.h" -#include "hw/hw.h" #include "hw/boards.h" #include "sysemu/kvm.h" #include "kvm_ppc.h" diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 76e815ceee..4c02ce9a08 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -32,7 +32,6 @@ #include "sysemu/numa.h" #include "sysemu/qtest.h" #include "sysemu/reset.h" -#include "hw/hw.h" #include "qemu/log.h" #include "hw/fw-path-provider.h" #include "elf.h" diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c index 57834e6a39..8223bdb39f 100644 --- a/hw/ppc/spapr_iommu.c +++ b/hw/ppc/spapr_iommu.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" -#include "hw/hw.h" #include "qemu/log.h" #include "qemu/module.h" #include "sysemu/kvm.h" diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index e5f592322f..53b799fec7 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -26,7 +26,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "cpu.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c index 1095aa5f00..31ff0be189 100644 --- a/hw/ppc/spapr_vio.c +++ b/hw/ppc/spapr_vio.c @@ -23,7 +23,6 @@ #include "qemu/error-report.h" #include "qapi/error.h" #include "qapi/visitor.h" -#include "hw/hw.h" #include "hw/irq.h" #include "qemu/log.h" #include "sysemu/sysemu.h" diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c index 06f5a28601..099b94cc54 100644 --- a/hw/ppc/virtex_ml507.c +++ b/hw/ppc/virtex_ml507.c @@ -27,7 +27,6 @@ #include "qemu/units.h" #include "cpu.h" #include "hw/sysbus.h" -#include "hw/hw.h" #include "hw/char/serial.h" #include "hw/block/flash.h" #include "sysemu/sysemu.h" diff --git a/hw/rdma/vmw/pvrdma_cmd.c b/hw/rdma/vmw/pvrdma_cmd.c index 8d70c0d23d..692125ac26 100644 --- a/hw/rdma/vmw/pvrdma_cmd.c +++ b/hw/rdma/vmw/pvrdma_cmd.c @@ -15,7 +15,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "hw/hw.h" #include "hw/pci/pci.h" #include "hw/pci/pci_ids.h" diff --git a/hw/rdma/vmw/pvrdma_main.c b/hw/rdma/vmw/pvrdma_main.c index adcf79cd63..b924843367 100644 --- a/hw/rdma/vmw/pvrdma_main.c +++ b/hw/rdma/vmw/pvrdma_main.c @@ -16,7 +16,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/module.h" -#include "hw/hw.h" #include "hw/pci/pci.h" #include "hw/pci/pci_ids.h" #include "hw/pci/msi.h" diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c index 2a499d8ed2..862903d6b5 100644 --- a/hw/riscv/sifive_e.c +++ b/hw/riscv/sifive_e.c @@ -32,7 +32,6 @@ #include "qemu/log.h" #include "qemu/error-report.h" #include "qapi/error.h" -#include "hw/hw.h" #include "hw/boards.h" #include "hw/loader.h" #include "hw/sysbus.h" diff --git a/hw/riscv/sifive_prci.c b/hw/riscv/sifive_prci.c index f406682c91..562bc3dc4c 100644 --- a/hw/riscv/sifive_prci.c +++ b/hw/riscv/sifive_prci.c @@ -22,6 +22,7 @@ #include "hw/sysbus.h" #include "qemu/module.h" #include "target/riscv/cpu.h" +#include "hw/hw.h" #include "hw/riscv/sifive_prci.h" static uint64_t sifive_prci_read(void *opaque, hwaddr addr, unsigned int size) diff --git a/hw/riscv/sifive_test.c b/hw/riscv/sifive_test.c index 24a04d7b36..3a14f9f8b6 100644 --- a/hw/riscv/sifive_test.c +++ b/hw/riscv/sifive_test.c @@ -22,6 +22,7 @@ #include "hw/sysbus.h" #include "qemu/module.h" #include "target/riscv/cpu.h" +#include "hw/hw.h" #include "hw/riscv/sifive_test.h" static uint64_t sifive_test_read(void *opaque, hwaddr addr, unsigned int size) diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 71b8083c05..0b3c5dff97 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -29,7 +29,6 @@ #include "qemu/log.h" #include "qemu/error-report.h" #include "qapi/error.h" -#include "hw/hw.h" #include "hw/boards.h" #include "hw/loader.h" #include "hw/sysbus.h" diff --git a/hw/riscv/sifive_uart.c b/hw/riscv/sifive_uart.c index d18613fb33..9de42b1680 100644 --- a/hw/riscv/sifive_uart.c +++ b/hw/riscv/sifive_uart.c @@ -22,6 +22,7 @@ #include "chardev/char.h" #include "chardev/char-fe.h" #include "target/riscv/cpu.h" +#include "hw/hw.h" #include "hw/irq.h" #include "hw/riscv/sifive_uart.h" diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c index 2991b341a2..9cc786b6b6 100644 --- a/hw/riscv/spike.c +++ b/hw/riscv/spike.c @@ -27,7 +27,6 @@ #include "qemu/log.h" #include "qemu/error-report.h" #include "qapi/error.h" -#include "hw/hw.h" #include "hw/boards.h" #include "hw/loader.h" #include "hw/sysbus.h" diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 25faf3b417..c72198b720 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -23,7 +23,6 @@ #include "qemu/log.h" #include "qemu/error-report.h" #include "qapi/error.h" -#include "hw/hw.h" #include "hw/boards.h" #include "hw/loader.h" #include "hw/sysbus.h" diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index fa537bfba3..a371370221 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -12,7 +12,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/hw.h" #include "sysemu/sysemu.h" #include "sysemu/kvm.h" #include "net/net.h" diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c index 175eb79260..222a286d44 100644 --- a/hw/scsi/lsi53c895a.c +++ b/hw/scsi/lsi53c895a.c @@ -15,7 +15,6 @@ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/pci/pci.h" #include "hw/scsi/scsi.h" diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index 970b10048f..3706294a85 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -20,7 +20,6 @@ #include "qemu/osdep.h" #include "qemu-common.h" -#include "hw/hw.h" #include "hw/pci/pci.h" #include "sysemu/dma.h" #include "sysemu/block-backend.h" diff --git a/hw/scsi/mptconfig.c b/hw/scsi/mptconfig.c index 87a416a5cb..3b2a857b5c 100644 --- a/hw/scsi/mptconfig.c +++ b/hw/scsi/mptconfig.c @@ -16,7 +16,6 @@ * Lesser General Public License for more details. */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/pci/pci.h" #include "hw/scsi/scsi.h" diff --git a/hw/scsi/mptendian.c b/hw/scsi/mptendian.c index 79f99734d2..313f40edf9 100644 --- a/hw/scsi/mptendian.c +++ b/hw/scsi/mptendian.c @@ -21,7 +21,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/pci/pci.h" #include "sysemu/dma.h" #include "hw/pci/msi.h" diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c index 79501777d4..b32f4c0ca9 100644 --- a/hw/scsi/mptsas.c +++ b/hw/scsi/mptsas.c @@ -23,7 +23,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/pci/pci.h" #include "sysemu/dma.h" #include "hw/pci/msi.h" diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index 42928a6aec..1f9914739a 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -1,5 +1,4 @@ #include "qemu/osdep.h" -#include "hw/hw.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/module.h" diff --git a/hw/scsi/spapr_vscsi.c b/hw/scsi/spapr_vscsi.c index 5290f7569a..fedeec676d 100644 --- a/hw/scsi/spapr_vscsi.c +++ b/hw/scsi/spapr_vscsi.c @@ -35,7 +35,6 @@ #include "qemu/osdep.h" #include "qemu/module.h" #include "cpu.h" -#include "hw/hw.h" #include "hw/scsi/scsi.h" #include "migration/vmstate.h" #include "scsi/constants.h" diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c index dcb7169166..e3c7cf5b5f 100644 --- a/hw/sd/milkymist-memcard.c +++ b/hw/sd/milkymist-memcard.c @@ -24,7 +24,6 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "qemu/module.h" -#include "hw/hw.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "sysemu/sysemu.h" diff --git a/hw/sd/omap_mmc.c b/hw/sd/omap_mmc.c index 15a0bbe87d..c6e516b611 100644 --- a/hw/sd/omap_mmc.c +++ b/hw/sd/omap_mmc.c @@ -21,7 +21,6 @@ #include "qemu/osdep.h" #include "qemu/log.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/arm/omap.h" #include "hw/sd/sd.h" diff --git a/hw/sd/pxa2xx_mmci.c b/hw/sd/pxa2xx_mmci.c index 020cd5464c..db2f2adf58 100644 --- a/hw/sd/pxa2xx_mmci.c +++ b/hw/sd/pxa2xx_mmci.c @@ -12,7 +12,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 02924329bf..3f26b38786 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -33,7 +33,6 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "hw/qdev.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/registerfields.h" #include "sysemu/block-backend.h" diff --git a/hw/sd/sdhci-pci.c b/hw/sd/sdhci-pci.c index 9370181993..438cb30af5 100644 --- a/hw/sd/sdhci-pci.c +++ b/hw/sd/sdhci-pci.c @@ -18,7 +18,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/module.h" -#include "hw/hw.h" #include "hw/sd/sdhci.h" #include "sdhci-internal.h" diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index f9db39c834..1adc16e3e9 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -26,7 +26,6 @@ #include "qemu/units.h" #include "qemu/error-report.h" #include "qapi/error.h" -#include "hw/hw.h" #include "hw/irq.h" #include "sysemu/dma.h" #include "qemu/timer.h" diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c index 9838ea3323..571e594304 100644 --- a/hw/sh4/r2d.c +++ b/hw/sh4/r2d.c @@ -28,7 +28,6 @@ #include "qapi/error.h" #include "cpu.h" #include "hw/sysbus.h" -#include "hw/hw.h" #include "hw/sh4/sh.h" #include "sysemu/reset.h" #include "sysemu/sysemu.h" diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c index b35d07265d..d660714443 100644 --- a/hw/sh4/sh7750.c +++ b/hw/sh4/sh7750.c @@ -24,7 +24,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/sh4/sh.h" #include "sysemu/sysemu.h" diff --git a/hw/sh4/sh7750_regnames.c b/hw/sh4/sh7750_regnames.c index 34b4f99b86..0630fe3cf4 100644 --- a/hw/sh4/sh7750_regnames.c +++ b/hw/sh4/sh7750_regnames.c @@ -1,5 +1,4 @@ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/sh4/sh.h" #include "sh7750_regs.h" #include "sh7750_regnames.h" diff --git a/hw/sh4/shix.c b/hw/sh4/shix.c index 6a1c7238e9..2fc2915428 100644 --- a/hw/sh4/shix.c +++ b/hw/sh4/shix.c @@ -30,7 +30,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "cpu.h" -#include "hw/hw.h" #include "hw/sh4/sh.h" #include "sysemu/sysemu.h" #include "sysemu/qtest.h" diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c index 9c43806690..655939a3f1 100644 --- a/hw/sparc/leon3.c +++ b/hw/sparc/leon3.c @@ -28,7 +28,6 @@ #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" -#include "hw/hw.h" #include "hw/irq.h" #include "qemu/timer.h" #include "hw/ptimer.h" diff --git a/hw/sparc64/niagara.c b/hw/sparc64/niagara.c index dc0ce7eda4..1efcff628a 100644 --- a/hw/sparc64/niagara.c +++ b/hw/sparc64/niagara.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "cpu.h" -#include "hw/hw.h" #include "hw/boards.h" #include "hw/char/serial.h" #include "hw/misc/unimp.h" diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index c95ed94d2e..54a385970c 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -28,7 +28,6 @@ #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" -#include "hw/hw.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bridge.h" #include "hw/pci/pci_bus.h" diff --git a/hw/timer/a9gtimer.c b/hw/timer/a9gtimer.c index b310dfb1b3..0339b92cf8 100644 --- a/hw/timer/a9gtimer.c +++ b/hw/timer/a9gtimer.c @@ -21,6 +21,7 @@ */ #include "qemu/osdep.h" +#include "hw/hw.h" #include "hw/irq.h" #include "hw/timer/a9gtimer.h" #include "migration/vmstate.h" diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c index a13255d308..abfc5baa77 100644 --- a/hw/timer/arm_mptimer.c +++ b/hw/timer/arm_mptimer.c @@ -20,6 +20,7 @@ */ #include "qemu/osdep.h" +#include "hw/hw.h" #include "hw/irq.h" #include "hw/ptimer.h" #include "hw/timer/arm_mptimer.h" diff --git a/hw/timer/exynos4210_mct.c b/hw/timer/exynos4210_mct.c index 7f2af5287c..79b291863c 100644 --- a/hw/timer/exynos4210_mct.c +++ b/hw/timer/exynos4210_mct.c @@ -62,6 +62,7 @@ #include "hw/ptimer.h" #include "hw/arm/exynos4210.h" +#include "hw/hw.h" #include "hw/irq.h" //#define DEBUG_MCT diff --git a/hw/timer/exynos4210_rtc.c b/hw/timer/exynos4210_rtc.c index 561451059e..f79b970c5e 100644 --- a/hw/timer/exynos4210_rtc.c +++ b/hw/timer/exynos4210_rtc.c @@ -35,7 +35,6 @@ #include "qemu/bcd.h" #include "hw/ptimer.h" -#include "hw/hw.h" #include "hw/irq.h" #include "sysemu/sysemu.h" diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c index 305704a339..1ddae4e7d7 100644 --- a/hw/timer/hpet.c +++ b/hw/timer/hpet.c @@ -25,7 +25,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/i386/pc.h" #include "hw/irq.h" #include "ui/console.h" diff --git a/hw/timer/i8254.c b/hw/timer/i8254.c index 97258757b1..a4be7330ef 100644 --- a/hw/timer/i8254.c +++ b/hw/timer/i8254.c @@ -23,7 +23,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "qemu/module.h" #include "qemu/timer.h" diff --git a/hw/timer/i8254_common.c b/hw/timer/i8254_common.c index 062e8690c4..57bf10cc94 100644 --- a/hw/timer/i8254_common.c +++ b/hw/timer/i8254_common.c @@ -24,7 +24,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/isa/isa.h" #include "qemu/module.h" #include "qemu/timer.h" diff --git a/hw/timer/lm32_timer.c b/hw/timer/lm32_timer.c index bfa9de76ba..a381e39f0a 100644 --- a/hw/timer/lm32_timer.c +++ b/hw/timer/lm32_timer.c @@ -22,7 +22,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/timer/m48t59.c b/hw/timer/m48t59.c index 1240315206..199003030a 100644 --- a/hw/timer/m48t59.c +++ b/hw/timer/m48t59.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include "qemu-common.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/timer/m48t59.h" #include "qemu/timer.h" diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index b432662bc4..473935339d 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -27,7 +27,6 @@ #include "qemu/cutils.h" #include "qemu/module.h" #include "qemu/bcd.h" -#include "hw/hw.h" #include "hw/irq.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" diff --git a/hw/timer/milkymist-sysctl.c b/hw/timer/milkymist-sysctl.c index 7c56224710..900b0b62a9 100644 --- a/hw/timer/milkymist-sysctl.c +++ b/hw/timer/milkymist-sysctl.c @@ -22,7 +22,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/timer/mips_gictimer.c b/hw/timer/mips_gictimer.c index f5c5806724..bc44cd934e 100644 --- a/hw/timer/mips_gictimer.c +++ b/hw/timer/mips_gictimer.c @@ -7,7 +7,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/sysbus.h" #include "qemu/timer.h" #include "hw/timer/mips_gictimer.h" diff --git a/hw/timer/omap_gptimer.c b/hw/timer/omap_gptimer.c index c34f60b5d4..c407190138 100644 --- a/hw/timer/omap_gptimer.c +++ b/hw/timer/omap_gptimer.c @@ -19,7 +19,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "qemu/timer.h" #include "hw/arm/omap.h" diff --git a/hw/timer/omap_synctimer.c b/hw/timer/omap_synctimer.c index 0d75a90f3a..72b997939b 100644 --- a/hw/timer/omap_synctimer.c +++ b/hw/timer/omap_synctimer.c @@ -18,7 +18,6 @@ * with this program; if not, see . */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "qemu/timer.h" #include "hw/arm/omap.h" struct omap_synctimer_s { diff --git a/hw/timer/pxa2xx_timer.c b/hw/timer/pxa2xx_timer.c index f61053b3c6..99e6c1e250 100644 --- a/hw/timer/pxa2xx_timer.c +++ b/hw/timer/pxa2xx_timer.c @@ -8,7 +8,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" diff --git a/hw/timer/sun4v-rtc.c b/hw/timer/sun4v-rtc.c index ba62adc826..54272a822f 100644 --- a/hw/timer/sun4v-rtc.c +++ b/hw/timer/sun4v-rtc.c @@ -10,7 +10,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/sysbus.h" #include "qemu/module.h" #include "qemu/timer.h" diff --git a/hw/timer/twl92230.c b/hw/timer/twl92230.c index 6b2a25b9c9..63bd13d2ca 100644 --- a/hw/timer/twl92230.c +++ b/hw/timer/twl92230.c @@ -21,7 +21,6 @@ #include "qemu/osdep.h" #include "qemu-common.h" -#include "hw/hw.h" #include "qemu/timer.h" #include "hw/i2c/i2c.h" #include "hw/irq.h" diff --git a/hw/tpm/tpm_emulator.c b/hw/tpm/tpm_emulator.c index 8648644008..5206bd2c33 100644 --- a/hw/tpm/tpm_emulator.c +++ b/hw/tpm/tpm_emulator.c @@ -33,7 +33,6 @@ #include "io/channel-socket.h" #include "sysemu/tpm_backend.h" #include "tpm_int.h" -#include "hw/hw.h" #include "tpm_util.h" #include "tpm_ioctl.h" #include "migration/blocker.h" diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c index 897e3d5864..f67244b5d4 100644 --- a/hw/tpm/tpm_passthrough.c +++ b/hw/tpm/tpm_passthrough.c @@ -29,7 +29,6 @@ #include "qemu/sockets.h" #include "sysemu/tpm_backend.h" #include "tpm_int.h" -#include "hw/hw.h" #include "qapi/clone-visitor.h" #include "qapi/qapi-visit-tpm.h" #include "tpm_util.h" diff --git a/hw/tricore/tricore_testboard.c b/hw/tricore/tricore_testboard.c index be397ebf92..c6305dcdf1 100644 --- a/hw/tricore/tricore_testboard.c +++ b/hw/tricore/tricore_testboard.c @@ -22,7 +22,6 @@ #include "qemu/units.h" #include "qapi/error.h" #include "cpu.h" -#include "hw/hw.h" #include "net/net.h" #include "sysemu/sysemu.h" #include "hw/boards.h" diff --git a/hw/usb/bus.c b/hw/usb/bus.c index 6aff15e504..be18221ac6 100644 --- a/hw/usb/bus.c +++ b/hw/usb/bus.c @@ -1,5 +1,4 @@ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/usb.h" #include "hw/qdev.h" #include "qapi/error.h" diff --git a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c index d4074edfc3..c0f35c58d5 100644 --- a/hw/usb/dev-audio.c +++ b/hw/usb/dev-audio.c @@ -34,7 +34,6 @@ #include "hw/usb.h" #include "migration/vmstate.h" #include "desc.h" -#include "hw/hw.h" #include "audio/audio.h" #define USBAUDIO_VENDOR_NUM 0x46f4 /* CRC16() of "QEMU" */ diff --git a/hw/usb/dev-hid.c b/hw/usb/dev-hid.c index c7c65a8782..79b3be3c3f 100644 --- a/hw/usb/dev-hid.c +++ b/hw/usb/dev-hid.c @@ -24,7 +24,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "ui/console.h" #include "hw/usb.h" #include "migration/vmstate.h" diff --git a/hw/usb/dev-wacom.c b/hw/usb/dev-wacom.c index 9a8a2d3081..8ed57b3b44 100644 --- a/hw/usb/dev-wacom.c +++ b/hw/usb/dev-wacom.c @@ -27,7 +27,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "ui/console.h" #include "hw/usb.h" #include "migration/vmstate.h" diff --git a/hw/usb/hcd-ehci.h b/hw/usb/hcd-ehci.h index fedf82c611..fdbcfdcbeb 100644 --- a/hw/usb/hcd-ehci.h +++ b/hw/usb/hcd-ehci.h @@ -18,7 +18,6 @@ #ifndef HW_USB_HCD_EHCI_H #define HW_USB_HCD_EHCI_H -#include "hw/hw.h" #include "qemu/timer.h" #include "hw/usb.h" #include "sysemu/dma.h" diff --git a/hw/usb/hcd-ohci-pci.c b/hw/usb/hcd-ohci-pci.c index 67fcfc4d7c..25b0ced804 100644 --- a/hw/usb/hcd-ohci-pci.c +++ b/hw/usb/hcd-ohci-pci.c @@ -19,7 +19,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "qapi/error.h" #include "qemu/timer.h" #include "hw/usb.h" diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c index 438dfb4b83..94b3410d3c 100644 --- a/hw/usb/hcd-ohci.c +++ b/hw/usb/hcd-ohci.c @@ -26,7 +26,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c index 887885efa0..7c6edd17b4 100644 --- a/hw/usb/hcd-uhci.c +++ b/hw/usb/hcd-uhci.c @@ -27,7 +27,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/usb.h" #include "hw/usb/uhci-regs.h" #include "migration/vmstate.h" diff --git a/hw/usb/hcd-xhci-nec.c b/hw/usb/hcd-xhci-nec.c index e099382b24..aba3716875 100644 --- a/hw/usb/hcd-xhci-nec.c +++ b/hw/usb/hcd-xhci-nec.c @@ -20,7 +20,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/usb.h" #include "qemu/module.h" #include "hw/pci/pci.h" diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index fc67476100..d60ad895a3 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -20,7 +20,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "qemu/timer.h" #include "qemu/module.h" #include "qemu/queue.h" diff --git a/hw/usb/libhw.c b/hw/usb/libhw.c index adbee2f642..9c33a1640f 100644 --- a/hw/usb/libhw.c +++ b/hw/usb/libhw.c @@ -20,7 +20,6 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/usb.h" #include "sysemu/dma.h" diff --git a/hw/usb/tusb6010.c b/hw/usb/tusb6010.c index a61b0f6354..17580876c6 100644 --- a/hw/usb/tusb6010.c +++ b/hw/usb/tusb6010.c @@ -24,6 +24,7 @@ #include "qemu/timer.h" #include "hw/usb.h" #include "hw/arm/omap.h" +#include "hw/hw.h" #include "hw/irq.h" #include "hw/sysbus.h" diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c index b35a640030..62d765a4ea 100644 --- a/hw/vfio/pci-quirks.c +++ b/hw/vfio/pci-quirks.c @@ -19,6 +19,7 @@ #include "qapi/error.h" #include "qapi/visitor.h" #include +#include "hw/hw.h" #include "hw/nvram/fw_cfg.h" #include "pci.h" #include "trace.h" diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 8a58ad670c..48ac0f5a34 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -22,6 +22,7 @@ #include #include +#include "hw/hw.h" #include "hw/pci/msi.h" #include "hw/pci/msix.h" #include "hw/pci/pci_bridge.h" diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index ba1006ad96..34accdf615 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -16,7 +16,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/virtio/vhost.h" -#include "hw/hw.h" #include "qemu/atomic.h" #include "qemu/range.h" #include "qemu/error-report.h" diff --git a/hw/virtio/virtio-bus.c b/hw/virtio/virtio-bus.c index 1d29a631f3..207e955996 100644 --- a/hw/virtio/virtio-bus.c +++ b/hw/virtio/virtio-bus.c @@ -23,7 +23,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "qemu/error-report.h" #include "qemu/module.h" #include "qapi/error.h" diff --git a/hw/watchdog/wdt_i6300esb.c b/hw/watchdog/wdt_i6300esb.c index 288be8f73c..370cf92e85 100644 --- a/hw/watchdog/wdt_i6300esb.c +++ b/hw/watchdog/wdt_i6300esb.c @@ -24,7 +24,6 @@ #include "qemu/module.h" #include "qemu/timer.h" #include "sysemu/watchdog.h" -#include "hw/hw.h" #include "hw/pci/pci.h" #include "migration/vmstate.h" diff --git a/hw/watchdog/wdt_ib700.c b/hw/watchdog/wdt_ib700.c index e233945c2e..985944a84a 100644 --- a/hw/watchdog/wdt_ib700.c +++ b/hw/watchdog/wdt_ib700.c @@ -23,7 +23,6 @@ #include "qemu/module.h" #include "qemu/timer.h" #include "sysemu/watchdog.h" -#include "hw/hw.h" #include "hw/isa/isa.h" #include "migration/vmstate.h" diff --git a/hw/xen/xen-bus-helper.c b/hw/xen/xen-bus-helper.c index 5f7a4b2612..b459bb9396 100644 --- a/hw/xen/xen-bus-helper.c +++ b/hw/xen/xen-bus-helper.c @@ -6,7 +6,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/sysbus.h" #include "hw/xen/xen.h" #include "hw/xen/xen-bus.h" diff --git a/hw/xen/xen-bus.c b/hw/xen/xen-bus.c index 7503eea9e9..3f39a894da 100644 --- a/hw/xen/xen-bus.c +++ b/hw/xen/xen-bus.c @@ -9,7 +9,6 @@ #include "qemu/main-loop.h" #include "qemu/module.h" #include "qemu/uuid.h" -#include "hw/hw.h" #include "hw/sysbus.h" #include "hw/xen/xen.h" #include "hw/xen/xen-backend.h" diff --git a/hw/xen/xen-legacy-backend.c b/hw/xen/xen-legacy-backend.c index 3715c94fa6..2831940ae7 100644 --- a/hw/xen/xen-legacy-backend.c +++ b/hw/xen/xen-legacy-backend.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include -#include "hw/hw.h" #include "hw/sysbus.h" #include "hw/boards.h" #include "qemu/log.h" diff --git a/hw/xen/xen_pt_load_rom.c b/hw/xen/xen_pt_load_rom.c index e6a86ca818..d111ecaf7e 100644 --- a/hw/xen/xen_pt_load_rom.c +++ b/hw/xen/xen_pt_load_rom.c @@ -3,7 +3,6 @@ */ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/hw.h" #include "hw/i386/pc.h" #include "qemu/error-report.h" #include "ui/console.h" diff --git a/hw/xenpv/xen_machine_pv.c b/hw/xenpv/xen_machine_pv.c index dcaf2a01a3..524d608eab 100644 --- a/hw/xenpv/xen_machine_pv.c +++ b/hw/xenpv/xen_machine_pv.c @@ -24,7 +24,6 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" -#include "hw/hw.h" #include "hw/boards.h" #include "hw/xen/xen-legacy-backend.h" #include "hw/xen/xen-bus.h" diff --git a/hw/xtensa/mx_pic.c b/hw/xtensa/mx_pic.c index 912de66206..d889f953d1 100644 --- a/hw/xtensa/mx_pic.c +++ b/hw/xtensa/mx_pic.c @@ -26,7 +26,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/irq.h" #include "hw/xtensa/mx_pic.h" #include "qemu/log.h" diff --git a/hw/xtensa/pic_cpu.c b/hw/xtensa/pic_cpu.c index b708290d7b..edd53c9241 100644 --- a/hw/xtensa/pic_cpu.c +++ b/hw/xtensa/pic_cpu.c @@ -27,7 +27,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "hw/hw.h" #include "hw/irq.h" #include "qemu/log.h" #include "qemu/timer.h" diff --git a/include/hw/audio/pcspk.h b/include/hw/audio/pcspk.h index 172afbf146..0f5d4f9919 100644 --- a/include/hw/audio/pcspk.h +++ b/include/hw/audio/pcspk.h @@ -25,7 +25,6 @@ #ifndef HW_PCSPK_H #define HW_PCSPK_H -#include "hw/hw.h" #include "hw/isa/isa.h" #define TYPE_PC_SPEAKER "isa-pcspk" diff --git a/include/hw/audio/wm8750.h b/include/hw/audio/wm8750.h index e12cb886d1..f7bafd5e38 100644 --- a/include/hw/audio/wm8750.h +++ b/include/hw/audio/wm8750.h @@ -14,7 +14,6 @@ #ifndef HW_DAC_WM8750_H #define HW_DAC_WM8750_H -#include "hw/hw.h" #define TYPE_WM8750 "wm8750" #define TYPE_MV88W8618_AUDIO "mv88w8618_audio" diff --git a/include/hw/char/serial.h b/include/hw/char/serial.h index abd5cf71a9..bfcbbb6e19 100644 --- a/include/hw/char/serial.h +++ b/include/hw/char/serial.h @@ -26,7 +26,6 @@ #ifndef HW_SERIAL_H #define HW_SERIAL_H -#include "hw/hw.h" #include "sysemu/sysemu.h" #include "chardev/char-fe.h" #include "exec/memory.h" diff --git a/include/hw/char/stm32f2xx_usart.h b/include/hw/char/stm32f2xx_usart.h index 84c4029777..8e112671e3 100644 --- a/include/hw/char/stm32f2xx_usart.h +++ b/include/hw/char/stm32f2xx_usart.h @@ -27,7 +27,6 @@ #include "hw/sysbus.h" #include "chardev/char-fe.h" -#include "hw/hw.h" #define USART_SR 0x00 #define USART_DR 0x04 diff --git a/include/hw/dma/i8257.h b/include/hw/dma/i8257.h index 2cab50bb6c..03e2c166be 100644 --- a/include/hw/dma/i8257.h +++ b/include/hw/dma/i8257.h @@ -1,7 +1,6 @@ #ifndef HW_I8257_H #define HW_I8257_H -#include "hw/hw.h" #include "hw/isa/isa.h" #include "exec/ioport.h" diff --git a/include/hw/hw.h b/include/hw/hw.h index 8079b911fa..fc5301f293 100644 --- a/include/hw/hw.h +++ b/include/hw/hw.h @@ -1,4 +1,3 @@ -/* Declarations for use by hardware emulation. */ #ifndef QEMU_HW_H #define QEMU_HW_H diff --git a/include/hw/i386/ich9.h b/include/hw/i386/ich9.h index 046bcf33be..72e803f6e2 100644 --- a/include/hw/i386/ich9.h +++ b/include/hw/i386/ich9.h @@ -1,7 +1,6 @@ #ifndef HW_ICH9_H #define HW_ICH9_H -#include "hw/hw.h" #include "hw/isa/isa.h" #include "hw/sysbus.h" #include "hw/i386/pc.h" diff --git a/include/hw/i386/ioapic_internal.h b/include/hw/i386/ioapic_internal.h index 3d2eec2aa7..d46c87c510 100644 --- a/include/hw/i386/ioapic_internal.h +++ b/include/hw/i386/ioapic_internal.h @@ -22,7 +22,6 @@ #ifndef QEMU_IOAPIC_INTERNAL_H #define QEMU_IOAPIC_INTERNAL_H -#include "hw/hw.h" #include "exec/memory.h" #include "hw/i386/ioapic.h" #include "hw/sysbus.h" diff --git a/include/hw/input/i8042.h b/include/hw/input/i8042.h index f6ff146364..246e6f3335 100644 --- a/include/hw/input/i8042.h +++ b/include/hw/input/i8042.h @@ -8,7 +8,6 @@ #ifndef HW_INPUT_I8042_H #define HW_INPUT_I8042_H -#include "hw/hw.h" #include "hw/isa/isa.h" #define TYPE_I8042 "i8042" diff --git a/include/hw/isa/apm.h b/include/hw/isa/apm.h index 0f93602936..b6e070c00e 100644 --- a/include/hw/isa/apm.h +++ b/include/hw/isa/apm.h @@ -1,7 +1,6 @@ #ifndef APM_H #define APM_H -#include "hw/hw.h" #include "exec/memory.h" #define APM_CNT_IOPORT 0xb2 diff --git a/include/hw/isa/i8259_internal.h b/include/hw/isa/i8259_internal.h index f742c2a726..ee189e4a77 100644 --- a/include/hw/isa/i8259_internal.h +++ b/include/hw/isa/i8259_internal.h @@ -25,7 +25,6 @@ #ifndef QEMU_I8259_INTERNAL_H #define QEMU_I8259_INTERNAL_H -#include "hw/hw.h" #include "hw/i386/pc.h" #include "hw/isa/isa.h" #include "hw/intc/intc.h" diff --git a/include/hw/misc/stm32f2xx_syscfg.h b/include/hw/misc/stm32f2xx_syscfg.h index 69e6a30fc5..84e06fdecf 100644 --- a/include/hw/misc/stm32f2xx_syscfg.h +++ b/include/hw/misc/stm32f2xx_syscfg.h @@ -26,7 +26,6 @@ #define HW_STM32F2XX_SYSCFG_H #include "hw/sysbus.h" -#include "hw/hw.h" #define SYSCFG_MEMRMP 0x00 #define SYSCFG_PMC 0x04 diff --git a/include/hw/net/ne2000-isa.h b/include/hw/net/ne2000-isa.h index 5acf4a494e..1233928a34 100644 --- a/include/hw/net/ne2000-isa.h +++ b/include/hw/net/ne2000-isa.h @@ -10,7 +10,6 @@ #ifndef HW_NET_NE2000_ISA_H #define HW_NET_NE2000_ISA_H -#include "hw/hw.h" #include "hw/qdev.h" #include "hw/isa/isa.h" #include "net/net.h" diff --git a/include/hw/pci-host/designware.h b/include/hw/pci-host/designware.h index 186bb36238..31c41231b1 100644 --- a/include/hw/pci-host/designware.h +++ b/include/hw/pci-host/designware.h @@ -21,7 +21,6 @@ #ifndef DESIGNWARE_H #define DESIGNWARE_H -#include "hw/hw.h" #include "hw/sysbus.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bus.h" diff --git a/include/hw/pci-host/gpex.h b/include/hw/pci-host/gpex.h index 2af1c4a37e..faea040a93 100644 --- a/include/hw/pci-host/gpex.h +++ b/include/hw/pci-host/gpex.h @@ -20,7 +20,6 @@ #ifndef HW_GPEX_H #define HW_GPEX_H -#include "hw/hw.h" #include "hw/sysbus.h" #include "hw/pci/pci.h" #include "hw/pci/pcie_host.h" diff --git a/include/hw/pci-host/q35.h b/include/hw/pci-host/q35.h index 5ed77facd0..b3bcf2e632 100644 --- a/include/hw/pci-host/q35.h +++ b/include/hw/pci-host/q35.h @@ -22,7 +22,6 @@ #ifndef HW_Q35_H #define HW_Q35_H -#include "hw/hw.h" #include "hw/isa/isa.h" #include "hw/sysbus.h" #include "hw/i386/pc.h" diff --git a/include/hw/pci-host/uninorth.h b/include/hw/pci-host/uninorth.h index 9a5cabd4c5..72d2a97355 100644 --- a/include/hw/pci-host/uninorth.h +++ b/include/hw/pci-host/uninorth.h @@ -25,7 +25,6 @@ #ifndef UNINORTH_H #define UNINORTH_H -#include "hw/hw.h" #include "hw/pci/pci_host.h" #include "hw/ppc/openpic.h" diff --git a/include/hw/pci-host/xilinx-pcie.h b/include/hw/pci-host/xilinx-pcie.h index 74c04dc9bb..c0f15314be 100644 --- a/include/hw/pci-host/xilinx-pcie.h +++ b/include/hw/pci-host/xilinx-pcie.h @@ -20,7 +20,6 @@ #ifndef HW_XILINX_PCIE_H #define HW_XILINX_PCIE_H -#include "hw/hw.h" #include "hw/sysbus.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bridge.h" diff --git a/include/hw/pci/pcie.h b/include/hw/pci/pcie.h index 8cf3361fc4..7064875835 100644 --- a/include/hw/pci/pcie.h +++ b/include/hw/pci/pcie.h @@ -21,7 +21,6 @@ #ifndef QEMU_PCIE_H #define QEMU_PCIE_H -#include "hw/hw.h" #include "hw/pci/pci_regs.h" #include "hw/pci/pcie_regs.h" #include "hw/pci/pcie_aer.h" diff --git a/include/hw/pci/pcie_aer.h b/include/hw/pci/pcie_aer.h index 502dcd7eba..65e71d98fe 100644 --- a/include/hw/pci/pcie_aer.h +++ b/include/hw/pci/pcie_aer.h @@ -21,7 +21,6 @@ #ifndef QEMU_PCIE_AER_H #define QEMU_PCIE_AER_H -#include "hw/hw.h" #include "hw/pci/pci_regs.h" /* definitions which PCIExpressDevice uses */ diff --git a/include/hw/qdev.h b/include/hw/qdev.h index 5cb8b080a6..d68991ae87 100644 --- a/include/hw/qdev.h +++ b/include/hw/qdev.h @@ -1,7 +1,6 @@ #ifndef QDEV_H #define QDEV_H -#include "hw/hw.h" #include "hw/qdev-core.h" #include "hw/qdev-properties.h" diff --git a/include/hw/riscv/riscv_htif.h b/include/hw/riscv/riscv_htif.h index fb5f88129e..aabc059f32 100644 --- a/include/hw/riscv/riscv_htif.h +++ b/include/hw/riscv/riscv_htif.h @@ -20,7 +20,6 @@ #ifndef HW_RISCV_HTIF_H #define HW_RISCV_HTIF_H -#include "hw/hw.h" #include "chardev/char.h" #include "chardev/char-fe.h" #include "sysemu/sysemu.h" diff --git a/include/hw/ssi/stm32f2xx_spi.h b/include/hw/ssi/stm32f2xx_spi.h index 1cd73e4cd4..e24b007abf 100644 --- a/include/hw/ssi/stm32f2xx_spi.h +++ b/include/hw/ssi/stm32f2xx_spi.h @@ -26,7 +26,6 @@ #define HW_STM32F2XX_SPI_H #include "hw/sysbus.h" -#include "hw/hw.h" #include "hw/ssi/ssi.h" #define STM_SPI_CR1 0x00 diff --git a/include/hw/timer/aspeed_rtc.h b/include/hw/timer/aspeed_rtc.h index 1f1155a676..15ba42912b 100644 --- a/include/hw/timer/aspeed_rtc.h +++ b/include/hw/timer/aspeed_rtc.h @@ -10,7 +10,6 @@ #include -#include "hw/hw.h" #include "hw/irq.h" #include "hw/sysbus.h" diff --git a/include/hw/timer/i8254.h b/include/hw/timer/i8254.h index 5b12eb918e..608b116fcf 100644 --- a/include/hw/timer/i8254.h +++ b/include/hw/timer/i8254.h @@ -25,7 +25,6 @@ #ifndef HW_I8254_H #define HW_I8254_H -#include "hw/hw.h" #include "hw/qdev.h" #include "hw/isa/isa.h" diff --git a/include/hw/timer/i8254_internal.h b/include/hw/timer/i8254_internal.h index e611c6f227..3db462aecd 100644 --- a/include/hw/timer/i8254_internal.h +++ b/include/hw/timer/i8254_internal.h @@ -25,7 +25,6 @@ #ifndef QEMU_I8254_INTERNAL_H #define QEMU_I8254_INTERNAL_H -#include "hw/hw.h" #include "hw/isa/isa.h" #include "hw/timer/i8254.h" #include "qemu/timer.h" diff --git a/include/hw/virtio/vhost.h b/include/hw/virtio/vhost.h index 619498c8f4..085450c6f8 100644 --- a/include/hw/virtio/vhost.h +++ b/include/hw/virtio/vhost.h @@ -1,7 +1,6 @@ #ifndef VHOST_H #define VHOST_H -#include "hw/hw.h" #include "hw/virtio/vhost-backend.h" #include "hw/virtio/virtio.h" #include "exec/memory.h" diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h index e6a2a0a6e0..7bae09e3ae 100644 --- a/include/hw/virtio/virtio.h +++ b/include/hw/virtio/virtio.h @@ -15,7 +15,6 @@ #define QEMU_VIRTIO_H #include "exec/memory.h" -#include "hw/hw.h" #include "net/net.h" #include "hw/qdev.h" #include "sysemu/sysemu.h" diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h index 0504b43659..1e3ec4e16e 100644 --- a/include/hw/xen/xen_common.h +++ b/include/hw/xen/xen_common.h @@ -14,7 +14,6 @@ #include #include "hw/xen/interface/io/xenbus.h" -#include "hw/hw.h" #include "hw/xen/xen.h" #include "hw/pci/pci.h" #include "qemu/queue.h" diff --git a/include/sysemu/dma.h b/include/sysemu/dma.h index 5da3c4e3c5..80c5bc3e02 100644 --- a/include/sysemu/dma.h +++ b/include/sysemu/dma.h @@ -12,7 +12,6 @@ #include "exec/memory.h" #include "exec/address-spaces.h" -#include "hw/hw.h" #include "block/block.h" #include "block/accounting.h" diff --git a/include/sysemu/hax.h b/include/sysemu/hax.h index f005995c50..9b27e65cc7 100644 --- a/include/sysemu/hax.h +++ b/include/sysemu/hax.h @@ -37,7 +37,6 @@ void hax_cpu_synchronize_pre_loadvm(CPUState *cpu); int hax_enabled(void); -#include "hw/hw.h" #include "qemu/bitops.h" #include "exec/memory.h" int hax_vcpu_destroy(CPUState *cpu); diff --git a/include/sysemu/hvf.h b/include/sysemu/hvf.h index dd1722f2df..d211e808e9 100644 --- a/include/sysemu/hvf.h +++ b/include/sysemu/hvf.h @@ -24,7 +24,6 @@ extern bool hvf_allowed; #include #include #include "target/i386/cpu.h" -#include "hw/hw.h" uint32_t hvf_get_supported_cpuid(uint32_t func, uint32_t idx, int reg); #define hvf_enabled() (hvf_allowed) diff --git a/monitor/misc.c b/monitor/misc.c index 00338c002a..117a172928 100644 --- a/monitor/misc.c +++ b/monitor/misc.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include "monitor-internal.h" #include "cpu.h" -#include "hw/hw.h" #include "monitor/qdev.h" #include "hw/usb.h" #include "hw/pci/pci.h" diff --git a/target/alpha/machine.c b/target/alpha/machine.c index 5688df6996..c288be89f7 100644 --- a/target/alpha/machine.c +++ b/target/alpha/machine.c @@ -1,6 +1,5 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "hw/hw.h" #include "hw/boards.h" #include "migration/cpu.h" #include "migration/vmstate.h" diff --git a/target/arm/machine.c b/target/arm/machine.c index fe1c7db783..60e0627b89 100644 --- a/target/arm/machine.c +++ b/target/arm/machine.c @@ -1,6 +1,5 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "hw/hw.h" #include "hw/boards.h" #include "qemu/error-report.h" #include "sysemu/kvm.h" diff --git a/target/cris/machine.c b/target/cris/machine.c index f9c764bf2e..66f6227c3e 100644 --- a/target/cris/machine.c +++ b/target/cris/machine.c @@ -20,7 +20,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "hw/hw.h" #include "migration/cpu.h" #include "migration/vmstate.h" diff --git a/target/hppa/machine.c b/target/hppa/machine.c index 140eaa95d8..092f8b5bfd 100644 --- a/target/hppa/machine.c +++ b/target/hppa/machine.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "hw/hw.h" #include "hw/boards.h" #include "migration/cpu.h" #include "migration/vmstate.h" diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 97405186ba..cb765e05fb 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -54,7 +54,6 @@ #include "hw/i386/topology.h" #ifndef CONFIG_USER_ONLY #include "exec/address-spaces.h" -#include "hw/hw.h" #include "hw/xen/xen.h" #include "hw/i386/apic_internal.h" #include "hw/boards.h" diff --git a/target/i386/machine.c b/target/i386/machine.c index d564eb55b0..dd5a72ba00 100644 --- a/target/i386/machine.c +++ b/target/i386/machine.c @@ -1,7 +1,6 @@ #include "qemu/osdep.h" #include "cpu.h" #include "exec/exec-all.h" -#include "hw/hw.h" #include "hw/boards.h" #include "hw/i386/pc.h" #include "hw/isa/isa.h" diff --git a/target/lm32/machine.c b/target/lm32/machine.c index 4a72887f60..18a1820f22 100644 --- a/target/lm32/machine.c +++ b/target/lm32/machine.c @@ -1,6 +1,5 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "hw/hw.h" #include "hw/boards.h" #include "migration/cpu.h" #include "migration/vmstate.h" diff --git a/target/mips/machine.c b/target/mips/machine.c index ff85542571..b304a64d95 100644 --- a/target/mips/machine.c +++ b/target/mips/machine.c @@ -1,7 +1,6 @@ #include "qemu/osdep.h" #include "cpu.h" #include "internal.h" -#include "hw/hw.h" #include "migration/cpu.h" #include "migration/vmstate.h" diff --git a/target/moxie/machine.c b/target/moxie/machine.c index 0d6012603e..e6f639ee97 100644 --- a/target/moxie/machine.c +++ b/target/moxie/machine.c @@ -1,6 +1,5 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "hw/hw.h" #include "hw/boards.h" #include "machine.h" #include "migration/cpu.h" diff --git a/target/openrisc/machine.c b/target/openrisc/machine.c index 1332a2c0ee..a7bfbbe3b2 100644 --- a/target/openrisc/machine.c +++ b/target/openrisc/machine.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "hw/hw.h" #include "hw/boards.h" #include "migration/cpu.h" #include "migration/vmstate.h" diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index 8a06d3171e..dbe125bd31 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -37,6 +37,7 @@ #include "hw/sysbus.h" #include "hw/ppc/spapr.h" #include "hw/ppc/spapr_cpu_core.h" +#include "hw/hw.h" #include "hw/ppc/ppc.h" #include "sysemu/watchdog.h" #include "trace.h" diff --git a/target/ppc/machine.c b/target/ppc/machine.c index f1cd41aeb4..afaaab9db9 100644 --- a/target/ppc/machine.c +++ b/target/ppc/machine.c @@ -1,7 +1,6 @@ #include "qemu/osdep.h" #include "cpu.h" #include "exec/exec-all.h" -#include "hw/hw.h" #include "hw/boards.h" #include "sysemu/kvm.h" #include "helper_regs.h" diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index 3caba8d5e1..9466cd832d 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -37,7 +37,6 @@ #include "sysemu/hw_accel.h" #include "hw/qdev-properties.h" #ifndef CONFIG_USER_ONLY -#include "hw/hw.h" #include "hw/boards.h" #include "sysemu/arch_init.h" #include "sysemu/sysemu.h" diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c index 6e814c230b..b465bb599e 100644 --- a/target/s390x/kvm.c +++ b/target/s390x/kvm.c @@ -36,7 +36,6 @@ #include "qemu/log.h" #include "sysemu/sysemu.h" #include "sysemu/hw_accel.h" -#include "hw/hw.h" #include "sysemu/device_tree.h" #include "exec/gdbstub.h" #include "exec/ram_addr.h" diff --git a/target/s390x/machine.c b/target/s390x/machine.c index 12a2cd65b0..549bb6c280 100644 --- a/target/s390x/machine.c +++ b/target/s390x/machine.c @@ -15,7 +15,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "cpu.h" #include "internal.h" #include "kvm_s390x.h" diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c index 6e9c4d6151..7a563110f0 100644 --- a/target/s390x/mmu_helper.c +++ b/target/s390x/mmu_helper.c @@ -25,6 +25,7 @@ #include "sysemu/tcg.h" #include "exec/exec-all.h" #include "trace.h" +#include "hw/hw.h" #include "hw/s390x/storage-keys.h" /* #define DEBUG_S390 */ diff --git a/target/sparc/machine.c b/target/sparc/machine.c index f7dabea326..aeeca69a2d 100644 --- a/target/sparc/machine.c +++ b/target/sparc/machine.c @@ -1,7 +1,6 @@ #include "qemu/osdep.h" #include "cpu.h" #include "exec/exec-all.h" -#include "hw/hw.h" #include "hw/boards.h" #include "qemu/timer.h" diff --git a/ui/spice-core.c b/ui/spice-core.c index 2ffc3335f0..16478ecd45 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -34,7 +34,6 @@ #include "qemu/notify.h" #include "qemu/option.h" #include "migration/misc.h" -#include "hw/hw.h" #include "hw/pci/pci_bus.h" #include "ui/spice-display.h" diff --git a/vl.c b/vl.c index ed2589817e..64b483ed6b 100644 --- a/vl.c +++ b/vl.c @@ -55,7 +55,6 @@ int main(int argc, char **argv) #include "qemu/error-report.h" #include "qemu/sockets.h" -#include "hw/hw.h" #include "sysemu/accel.h" #include "hw/usb.h" #include "hw/isa/isa.h" From patchwork Fri Jul 26 12:05:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 11060911 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DEDE5746 for ; Fri, 26 Jul 2019 12:09:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CDEA528812 for ; Fri, 26 Jul 2019 12:09:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C0F0B28AA8; Fri, 26 Jul 2019 12:09:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1FA0128AA5 for ; Fri, 26 Jul 2019 12:09:26 +0000 (UTC) Received: from localhost ([::1]:39326 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqz2L-0003Fk-Eo for patchwork-qemu-devel@patchwork.kernel.org; Fri, 26 Jul 2019 08:09:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58625) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqyyw-0005Vt-RV for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:06:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqyyq-0007yC-UU for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56924) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqyyq-0007tY-IY for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:48 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C097283F4C for ; Fri, 26 Jul 2019 12:05:47 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 629F04145 for ; Fri, 26 Jul 2019 12:05:47 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 0060211326F1; Fri, 26 Jul 2019 14:05:42 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 26 Jul 2019 14:05:33 +0200 Message-Id: <20190726120542.9894-20-armbru@redhat.com> In-Reply-To: <20190726120542.9894-1-armbru@redhat.com> References: <20190726120542.9894-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Fri, 26 Jul 2019 12:05:47 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 19/28] Include qemu/queue.h slightly less X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Markus Armbruster --- hw/scsi/vhost-scsi.c | 1 - hw/vfio/ap.c | 1 - include/exec/cpu-defs.h | 1 - include/hw/xen/xen_common.h | 1 - include/net/can_emu.h | 1 + include/net/filter.h | 1 + include/qemu/range.h | 2 -- include/qom/object.h | 1 - include/sysemu/cryptodev.h | 1 + include/sysemu/rng.h | 1 + include/sysemu/sysemu.h | 1 - linux-user/elfload.c | 1 + linux-user/main.c | 1 + linux-user/qemu.h | 1 - linux-user/syscall.c | 1 + nbd/client.c | 1 + nbd/nbd-internal.h | 1 - nbd/server.c | 1 + qapi/qapi-dealloc-visitor.c | 1 - target/i386/whpx-all.c | 1 - ui/kbd-state.c | 1 - util/vfio-helpers.c | 1 - 22 files changed, 9 insertions(+), 14 deletions(-) diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c index 4090f99ee4..1fe6c9caef 100644 --- a/hw/scsi/vhost-scsi.c +++ b/hw/scsi/vhost-scsi.c @@ -20,7 +20,6 @@ #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/module.h" -#include "qemu/queue.h" #include "monitor/monitor.h" #include "migration/blocker.h" #include "hw/virtio/vhost-scsi.h" diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c index d1c86abb76..2bfc402037 100644 --- a/hw/vfio/ap.c +++ b/hw/vfio/ap.c @@ -20,7 +20,6 @@ #include "hw/s390x/ap-device.h" #include "qemu/error-report.h" #include "qemu/module.h" -#include "qemu/queue.h" #include "qemu/option.h" #include "qemu/config-file.h" #include "cpu.h" diff --git a/include/exec/cpu-defs.h b/include/exec/cpu-defs.h index 9bc713a70b..57a9a4ffd9 100644 --- a/include/exec/cpu-defs.h +++ b/include/exec/cpu-defs.h @@ -25,7 +25,6 @@ #include "qemu/host-utils.h" #include "qemu/thread.h" -#include "qemu/queue.h" #ifdef CONFIG_TCG #include "tcg-target.h" #endif diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h index 1e3ec4e16e..82e56339dd 100644 --- a/include/hw/xen/xen_common.h +++ b/include/hw/xen/xen_common.h @@ -16,7 +16,6 @@ #include "hw/xen/xen.h" #include "hw/pci/pci.h" -#include "qemu/queue.h" #include "hw/xen/trace.h" extern xc_interface *xen_xc; diff --git a/include/net/can_emu.h b/include/net/can_emu.h index 1da4d01b95..d4fc51b57d 100644 --- a/include/net/can_emu.h +++ b/include/net/can_emu.h @@ -28,6 +28,7 @@ #ifndef NET_CAN_EMU_H #define NET_CAN_EMU_H +#include "qemu/queue.h" #include "qom/object.h" /* NOTE: the following two structures is copied from . */ diff --git a/include/net/filter.h b/include/net/filter.h index 9bc6fa3cc6..e8fb6259db 100644 --- a/include/net/filter.h +++ b/include/net/filter.h @@ -10,6 +10,7 @@ #define QEMU_NET_FILTER_H #include "qapi/qapi-types-net.h" +#include "qemu/queue.h" #include "qom/object.h" #include "net/queue.h" diff --git a/include/qemu/range.h b/include/qemu/range.h index 71b8b215c6..f62b363e0d 100644 --- a/include/qemu/range.h +++ b/include/qemu/range.h @@ -20,8 +20,6 @@ #ifndef QEMU_RANGE_H #define QEMU_RANGE_H -#include "qemu/queue.h" - /* * Operations on 64 bit address ranges. * Notes: diff --git a/include/qom/object.h b/include/qom/object.h index 7bb82a7f56..128d00c77f 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -15,7 +15,6 @@ #define QEMU_OBJECT_H #include "qapi/qapi-builtin-types.h" -#include "qemu/queue.h" #include "qemu/module.h" struct TypeImpl; diff --git a/include/sysemu/cryptodev.h b/include/sysemu/cryptodev.h index 92bbb79131..a9afb7e5b5 100644 --- a/include/sysemu/cryptodev.h +++ b/include/sysemu/cryptodev.h @@ -23,6 +23,7 @@ #ifndef CRYPTODEV_H #define CRYPTODEV_H +#include "qemu/queue.h" #include "qom/object.h" /** diff --git a/include/sysemu/rng.h b/include/sysemu/rng.h index 2a02f47771..9b22c156f8 100644 --- a/include/sysemu/rng.h +++ b/include/sysemu/rng.h @@ -13,6 +13,7 @@ #ifndef QEMU_RNG_H #define QEMU_RNG_H +#include "qemu/queue.h" #include "qom/object.h" #define TYPE_RNG_BACKEND "rng-backend" diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 984c439ac9..77f5df59b0 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -3,7 +3,6 @@ /* Misc. things related to the system emulator. */ #include "qapi/qapi-types-run-state.h" -#include "qemu/queue.h" #include "qemu/timer.h" #include "qemu/notify.h" #include "qemu/main-loop.h" diff --git a/linux-user/elfload.c b/linux-user/elfload.c index bd43c4817d..3365e192eb 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -8,6 +8,7 @@ #include "qemu.h" #include "disas/disas.h" #include "qemu/path.h" +#include "qemu/queue.h" #include "qemu/guest-random.h" #ifdef _ARCH_PPC64 diff --git a/linux-user/main.c b/linux-user/main.c index a59ae9439d..8dde620db7 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -28,6 +28,7 @@ #include "qapi/error.h" #include "qemu.h" #include "qemu/path.h" +#include "qemu/queue.h" #include "qemu/config-file.h" #include "qemu/cutils.h" #include "qemu/error-report.h" diff --git a/linux-user/qemu.h b/linux-user/qemu.h index 4258e4162d..29ad1d7cb0 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -16,7 +16,6 @@ #include "syscall_defs.h" #include "target_syscall.h" #include "exec/gdbstub.h" -#include "qemu/queue.h" /* This is the size of the host kernel's sigset_t, needed where we make * direct system calls that take a sigset_t pointer and a size. diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 8367cb138d..8b41a03901 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "qemu/cutils.h" #include "qemu/path.h" +#include "qemu/queue.h" #include #include #include diff --git a/nbd/client.c b/nbd/client.c index 4de30630c7..d554ae353d 100644 --- a/nbd/client.c +++ b/nbd/client.c @@ -19,6 +19,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/queue.h" #include "trace.h" #include "nbd-internal.h" #include "qemu/cutils.h" diff --git a/nbd/nbd-internal.h b/nbd/nbd-internal.h index 049f83df77..ec3d2e2ebc 100644 --- a/nbd/nbd-internal.h +++ b/nbd/nbd-internal.h @@ -28,7 +28,6 @@ #endif #include "qemu/bswap.h" -#include "qemu/queue.h" #include "qemu/main-loop.h" /* This is all part of the "official" NBD API. diff --git a/nbd/server.c b/nbd/server.c index 10faedcfc5..dbd2ff8555 100644 --- a/nbd/server.c +++ b/nbd/server.c @@ -19,6 +19,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/queue.h" #include "trace.h" #include "nbd-internal.h" #include "qemu/units.h" diff --git a/qapi/qapi-dealloc-visitor.c b/qapi/qapi-dealloc-visitor.c index 89ccd905ec..d192724b13 100644 --- a/qapi/qapi-dealloc-visitor.c +++ b/qapi/qapi-dealloc-visitor.c @@ -15,7 +15,6 @@ #include "qemu/osdep.h" #include "qapi/dealloc-visitor.h" #include "qapi/qmp/qnull.h" -#include "qemu/queue.h" #include "qapi/visitor-impl.h" struct QapiDeallocVisitor diff --git a/target/i386/whpx-all.c b/target/i386/whpx-all.c index ed95105eae..2cf66f7804 100644 --- a/target/i386/whpx-all.c +++ b/target/i386/whpx-all.c @@ -20,7 +20,6 @@ #include "qemu/main-loop.h" #include "hw/boards.h" #include "qemu/error-report.h" -#include "qemu/queue.h" #include "qapi/error.h" #include "migration/blocker.h" #include "whp-dispatch.h" diff --git a/ui/kbd-state.c b/ui/kbd-state.c index 1668d17dda..62d42a7a22 100644 --- a/ui/kbd-state.c +++ b/ui/kbd-state.c @@ -5,7 +5,6 @@ */ #include "qemu/osdep.h" #include "qemu/bitmap.h" -#include "qemu/queue.h" #include "ui/console.h" #include "ui/input.h" #include "ui/kbd-state.h" diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c index 2367fe8f7f..26ffd0d6b5 100644 --- a/util/vfio-helpers.c +++ b/util/vfio-helpers.c @@ -17,7 +17,6 @@ #include "exec/ramlist.h" #include "exec/cpu-common.h" #include "trace.h" -#include "qemu/queue.h" #include "qemu/error-report.h" #include "standard-headers/linux/pci_regs.h" #include "qemu/event_notifier.h" From patchwork Fri Jul 26 12:05:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 11060939 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1F65D13A0 for ; Fri, 26 Jul 2019 12:12:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 09C0628AAA for ; Fri, 26 Jul 2019 12:12:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F1C6028AAF; Fri, 26 Jul 2019 12:12:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3353828AAA for ; Fri, 26 Jul 2019 12:12:21 +0000 (UTC) Received: from localhost ([::1]:39422 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqz5A-0005ea-HG for patchwork-qemu-devel@patchwork.kernel.org; Fri, 26 Jul 2019 08:12:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59089) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqyz8-00060a-3i for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:06:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqyyt-0008Cu-SL for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:06:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42954) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqyyt-0007vc-7R for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:51 -0400 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 28D1A3083363 for ; Fri, 26 Jul 2019 12:05:48 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 70CE95F9D2 for ; Fri, 26 Jul 2019 12:05:47 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 0902D11326AE; Fri, 26 Jul 2019 14:05:43 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 26 Jul 2019 14:05:34 +0200 Message-Id: <20190726120542.9894-21-armbru@redhat.com> In-Reply-To: <20190726120542.9894-1-armbru@redhat.com> References: <20190726120542.9894-1-armbru@redhat.com> MIME-Version: 1.0 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.44]); Fri, 26 Jul 2019 12:05:48 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 20/28] Include qemu/main-loop.h less X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP In my "build everything" tree, changing qemu/main-loop.h triggers a recompile of some 5600 out of 6600 objects (not counting tests and objects that don't depend on qemu/osdep.h). It includes block/aio.h, which in turn includes qemu/event_notifier.h, qemu/notify.h, qemu/processor.h, qemu/qsp.h, qemu/queue.h, qemu/thread-posix.h, qemu/thread.h, qemu/timer.h, and a few more. Include qemu/main-loop.h only where it's needed. Touching it now recompiles only some 1700 objects. For block/aio.h and qemu/event_notifier.h, these numbers drop from 5600 to 2800. For the others, they shrink only slightly. Signed-off-by: Markus Armbruster --- accel/kvm/kvm-all.c | 1 + block.c | 1 + block/block-backend.c | 1 + block/create.c | 1 + block/io.c | 1 + block/nbd.c | 1 + block/nfs.c | 1 + block/nvme.c | 1 + block/qcow2.c | 1 + block/qed.c | 1 + block/sheepdog.c | 1 + block/throttle-groups.c | 1 + blockdev.c | 1 + blockjob.c | 1 + chardev/baum.c | 1 + chardev/char-pipe.c | 1 + chardev/char-win-stdio.c | 1 + chardev/char-win.c | 1 + dump/dump.c | 1 + fsdev/qemu-fsdev-throttle.c | 1 + fsdev/qemu-fsdev-throttle.h | 1 - hw/9pfs/9p.c | 1 + hw/9pfs/codir.c | 1 + hw/9pfs/cofile.c | 1 + hw/9pfs/cofs.c | 1 + hw/9pfs/coth.c | 1 + hw/9pfs/coth.h | 1 - hw/9pfs/coxattr.c | 1 + hw/9pfs/xen-9p-backend.c | 1 + hw/arm/omap1.c | 1 + hw/block/dataplane/virtio-blk.c | 1 + hw/block/dataplane/xen-block.c | 1 + hw/block/fdc.c | 1 + hw/block/xen-block.c | 1 + hw/char/virtio-serial-bus.c | 1 + hw/core/machine-qmp-cmds.c | 1 + hw/display/qxl.c | 1 + hw/dma/etraxfs_dma.c | 1 + hw/i386/intel_iommu.c | 1 + hw/i386/xen/xen-hvm.c | 1 + hw/ide/ahci.c | 1 + hw/ide/core.c | 1 + hw/ide/qdev.c | 1 + hw/intc/s390_flic.c | 1 + hw/m68k/mcf5206.c | 1 + hw/m68k/mcf5208.c | 1 + hw/misc/imx6_src.c | 1 + hw/net/fsl_etsec/etsec.c | 1 + hw/net/lan9118.c | 1 + hw/net/vhost_net.c | 2 +- hw/net/virtio-net.c | 1 + hw/ppc/ppc.c | 1 + hw/ppc/ppc440_uc.c | 1 + hw/ppc/spapr_hcall.c | 1 + hw/ppc/spapr_rng.c | 1 + hw/scsi/mptsas.c | 1 + hw/scsi/scsi-disk.c | 1 + hw/scsi/vmw_pvscsi.c | 1 + hw/timer/allwinner-a10-pit.c | 1 + hw/timer/altera_timer.c | 1 + hw/timer/etraxfs_timer.c | 1 + hw/timer/exynos4210_rtc.c | 1 + hw/timer/milkymist-sysctl.c | 1 + hw/usb/dev-uas.c | 1 + hw/usb/hcd-ehci.c | 1 + hw/usb/host-libusb.c | 1 + hw/usb/xen-usb.c | 1 + hw/vfio/ccw.c | 1 + hw/vfio/common.c | 1 + hw/vfio/pci.c | 1 + hw/vfio/platform.c | 1 + hw/virtio/vhost-backend.c | 1 + hw/virtio/vhost-user.c | 1 + hw/virtio/virtio-crypto.c | 1 + hw/virtio/virtio-pmem.c | 1 + hw/virtio/virtio.c | 1 + hw/xen/xen-legacy-backend.c | 1 + hw/xen/xen_pvdev.c | 1 + include/block/block_int.h | 1 - include/chardev/char-fe.h | 1 + include/chardev/char-io.h | 1 + include/chardev/char.h | 2 +- include/hw/scsi/scsi.h | 1 + include/sysemu/sysemu.h | 1 - memory.c | 1 + migration/block.c | 1 + migration/colo.c | 1 + migration/migration.c | 1 + migration/savevm.c | 1 + nbd/nbd-internal.h | 1 - net/can/can_socketcan.c | 1 + net/tap-win32.c | 1 + net/tap.c | 1 + qemu-img.c | 1 + qom/cpu.c | 1 + replay/replay-internal.c | 1 + target/arm/helper-a64.c | 1 + target/arm/helper.c | 2 ++ target/arm/m_helper.c | 2 ++ target/arm/psci.c | 2 ++ target/i386/kvm.c | 1 + target/lm32/op_helper.c | 1 + target/ppc/int_helper.c | 2 ++ target/ppc/machine.c | 1 + target/ppc/mem_helper.c | 2 ++ target/ppc/misc_helper.c | 2 ++ target/ppc/mmu_helper.c | 2 ++ target/ppc/translate.c | 1 + tcg/tcg-op-gvec.c | 1 + tests/test-bdrv-drain.c | 1 + tests/test-bdrv-graph-mod.c | 1 + tests/test-block-backend.c | 1 + tests/test-block-iothread.c | 1 + tests/test-image-locking.c | 1 + tests/test-replication.c | 1 + tests/test-throttle.c | 1 + ui/input-linux.c | 1 + ui/spice-core.c | 1 + ui/spice-display.c | 1 + ui/vnc-auth-sasl.h | 1 - ui/vnc.c | 1 + util/oslib-posix.c | 1 + 122 files changed, 123 insertions(+), 8 deletions(-) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 2673952694..db4d215e0c 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -34,6 +34,7 @@ #include "exec/ram_addr.h" #include "exec/address-spaces.h" #include "qemu/event_notifier.h" +#include "qemu/main-loop.h" #include "trace.h" #include "hw/irq.h" #include "sysemu/sev.h" diff --git a/block.c b/block.c index 9c94f7f28a..b538067c52 100644 --- a/block.c +++ b/block.c @@ -30,6 +30,7 @@ #include "block/qdict.h" #include "qemu/error-report.h" #include "module_block.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "qapi/error.h" #include "qapi/qmp/qdict.h" diff --git a/block/block-backend.c b/block/block-backend.c index 6aed80bf0b..4991ab5574 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -21,6 +21,7 @@ #include "qapi/error.h" #include "qapi/qapi-events-block.h" #include "qemu/id.h" +#include "qemu/main-loop.h" #include "qemu/option.h" #include "trace.h" #include "migration/misc.h" diff --git a/block/create.c b/block/create.c index 95341219ef..1bd00ed5f8 100644 --- a/block/create.c +++ b/block/create.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "block/block_int.h" #include "qemu/job.h" +#include "qemu/main-loop.h" #include "qapi/qapi-commands-block-core.h" #include "qapi/qapi-visit-block-core.h" #include "qapi/clone-visitor.h" diff --git a/block/io.c b/block/io.c index b89e155d21..74f02e83c5 100644 --- a/block/io.c +++ b/block/io.c @@ -32,6 +32,7 @@ #include "qemu/cutils.h" #include "qapi/error.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #define NOT_DONE 0x7fffffff /* used while emulated sync operation in progress */ diff --git a/block/nbd.c b/block/nbd.c index 81edabbf35..7d95f290a8 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -33,6 +33,7 @@ #include "qemu/uri.h" #include "qemu/option.h" #include "qemu/cutils.h" +#include "qemu/main-loop.h" #include "qapi/qapi-visit-sockets.h" #include "qapi/qmp/qstring.h" diff --git a/block/nfs.c b/block/nfs.c index d93241b3bb..a1fe004c61 100644 --- a/block/nfs.c +++ b/block/nfs.c @@ -32,6 +32,7 @@ #include "block/qdict.h" #include "trace.h" #include "qemu/iov.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "qemu/option.h" #include "qemu/uri.h" diff --git a/block/nvme.c b/block/nvme.c index 9896b7f7c6..60ac1d94ba 100644 --- a/block/nvme.c +++ b/block/nvme.c @@ -17,6 +17,7 @@ #include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "qemu/cutils.h" #include "qemu/option.h" diff --git a/block/qcow2.c b/block/qcow2.c index 039bdc2f7e..59cff1d4cb 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -26,6 +26,7 @@ #include "block/qdict.h" #include "sysemu/block-backend.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "qcow2.h" #include "qemu/error-report.h" diff --git a/block/qed.c b/block/qed.c index 77c7cef175..d0dcc5f14d 100644 --- a/block/qed.c +++ b/block/qed.c @@ -17,6 +17,7 @@ #include "qapi/error.h" #include "qemu/timer.h" #include "qemu/bswap.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "qemu/option.h" #include "trace.h" diff --git a/block/sheepdog.c b/block/sheepdog.c index 6f402e5d4d..31b0a820c2 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -22,6 +22,7 @@ #include "qapi/qobject-output-visitor.h" #include "qemu/uri.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "qemu/option.h" #include "qemu/sockets.h" diff --git a/block/throttle-groups.c b/block/throttle-groups.c index a5a2037924..77014c741b 100644 --- a/block/throttle-groups.c +++ b/block/throttle-groups.c @@ -26,6 +26,7 @@ #include "sysemu/block-backend.h" #include "block/throttle-groups.h" #include "qemu/throttle-options.h" +#include "qemu/main-loop.h" #include "qemu/queue.h" #include "qemu/thread.h" #include "sysemu/qtest.h" diff --git a/blockdev.c b/blockdev.c index 4d141e9a1f..64eab33ae9 100644 --- a/blockdev.c +++ b/blockdev.c @@ -60,6 +60,7 @@ #include "sysemu/qtest.h" #include "qemu/cutils.h" #include "qemu/help_option.h" +#include "qemu/main-loop.h" #include "qemu/throttle-options.h" static QTAILQ_HEAD(, BlockDriverState) monitor_bdrv_states = diff --git a/blockjob.c b/blockjob.c index 20b7f557da..45877c8bdd 100644 --- a/blockjob.c +++ b/blockjob.c @@ -33,6 +33,7 @@ #include "qapi/qapi-events-block-core.h" #include "qapi/qmp/qerror.h" #include "qemu/coroutine.h" +#include "qemu/main-loop.h" #include "qemu/timer.h" /* diff --git a/chardev/baum.c b/chardev/baum.c index 3dc81d5c6c..9c95e7bc79 100644 --- a/chardev/baum.c +++ b/chardev/baum.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "chardev/char.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "qemu/timer.h" #include "hw/usb.h" diff --git a/chardev/char-pipe.c b/chardev/char-pipe.c index b200f9365c..94d714ffcd 100644 --- a/chardev/char-pipe.c +++ b/chardev/char-pipe.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "qapi/error.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "qemu/option.h" #include "chardev/char.h" diff --git a/chardev/char-win-stdio.c b/chardev/char-win-stdio.c index 92d34e85aa..99afda353c 100644 --- a/chardev/char-win-stdio.c +++ b/chardev/char-win-stdio.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "chardev/char-win.h" #include "chardev/char-win-stdio.h" diff --git a/chardev/char-win.c b/chardev/char-win.c index 0b8181339d..34825f683d 100644 --- a/chardev/char-win.c +++ b/chardev/char-win.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "qapi/error.h" #include "chardev/char-win.h" diff --git a/dump/dump.c b/dump/dump.c index c7b2301652..d430f5e929 100644 --- a/dump/dump.c +++ b/dump/dump.c @@ -28,6 +28,7 @@ #include "qapi/qapi-events-dump.h" #include "qapi/qmp/qerror.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #include "hw/misc/vmcoreinfo.h" #ifdef TARGET_X86_64 diff --git a/fsdev/qemu-fsdev-throttle.c b/fsdev/qemu-fsdev-throttle.c index cfd86418ac..fe1d76dc76 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/main-loop.h" #include "qemu/option.h" static void fsdev_throttle_read_timer_cb(void *opaque) diff --git a/fsdev/qemu-fsdev-throttle.h b/fsdev/qemu-fsdev-throttle.h index 7d6211d499..c98e2feab5 100644 --- a/fsdev/qemu-fsdev-throttle.h +++ b/fsdev/qemu-fsdev-throttle.h @@ -16,7 +16,6 @@ #define QEMU_FSDEV_THROTTLE_H #include "block/aio.h" -#include "qemu/main-loop.h" #include "qemu/coroutine.h" #include "qemu/throttle.h" diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c index 55821343e5..cce2366219 100644 --- a/hw/9pfs/9p.c +++ b/hw/9pfs/9p.c @@ -17,6 +17,7 @@ #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/iov.h" +#include "qemu/main-loop.h" #include "qemu/sockets.h" #include "virtio-9p.h" #include "fsdev/qemu-fsdev.h" diff --git a/hw/9pfs/codir.c b/hw/9pfs/codir.c index 7cd6fce1ad..73f9a751e1 100644 --- a/hw/9pfs/codir.c +++ b/hw/9pfs/codir.c @@ -15,6 +15,7 @@ #include "fsdev/qemu-fsdev.h" #include "qemu/thread.h" #include "qemu/coroutine.h" +#include "qemu/main-loop.h" #include "coth.h" int coroutine_fn v9fs_co_readdir(V9fsPDU *pdu, V9fsFidState *fidp, diff --git a/hw/9pfs/cofile.c b/hw/9pfs/cofile.c index 9c22837cda..83bb6c14e0 100644 --- a/hw/9pfs/cofile.c +++ b/hw/9pfs/cofile.c @@ -15,6 +15,7 @@ #include "fsdev/qemu-fsdev.h" #include "qemu/thread.h" #include "qemu/coroutine.h" +#include "qemu/main-loop.h" #include "coth.h" int coroutine_fn v9fs_co_st_gen(V9fsPDU *pdu, V9fsPath *path, mode_t st_mode, diff --git a/hw/9pfs/cofs.c b/hw/9pfs/cofs.c index c62103221d..55991916ec 100644 --- a/hw/9pfs/cofs.c +++ b/hw/9pfs/cofs.c @@ -15,6 +15,7 @@ #include "fsdev/qemu-fsdev.h" #include "qemu/thread.h" #include "qemu/coroutine.h" +#include "qemu/main-loop.h" #include "coth.h" static ssize_t __readlink(V9fsState *s, V9fsPath *path, V9fsString *buf) diff --git a/hw/9pfs/coth.c b/hw/9pfs/coth.c index c3b43368f8..9778f24b00 100644 --- a/hw/9pfs/coth.c +++ b/hw/9pfs/coth.c @@ -15,6 +15,7 @@ #include "qemu/osdep.h" #include "block/thread-pool.h" #include "qemu/coroutine.h" +#include "qemu/main-loop.h" #include "coth.h" /* Called from QEMU I/O thread. */ diff --git a/hw/9pfs/coth.h b/hw/9pfs/coth.h index 19e4d9287e..c2cdc7a9ea 100644 --- a/hw/9pfs/coth.h +++ b/hw/9pfs/coth.h @@ -17,7 +17,6 @@ #include "qemu/thread.h" #include "qemu/coroutine.h" -#include "qemu/main-loop.h" #include "9p.h" /* diff --git a/hw/9pfs/coxattr.c b/hw/9pfs/coxattr.c index 154392eade..0e00ffaa0d 100644 --- a/hw/9pfs/coxattr.c +++ b/hw/9pfs/coxattr.c @@ -15,6 +15,7 @@ #include "fsdev/qemu-fsdev.h" #include "qemu/thread.h" #include "qemu/coroutine.h" +#include "qemu/main-loop.h" #include "coth.h" int coroutine_fn v9fs_co_llistxattr(V9fsPDU *pdu, V9fsPath *path, void *value, diff --git a/hw/9pfs/xen-9p-backend.c b/hw/9pfs/xen-9p-backend.c index c50b1961d3..71eebe12dd 100644 --- a/hw/9pfs/xen-9p-backend.c +++ b/hw/9pfs/xen-9p-backend.c @@ -15,6 +15,7 @@ #include "hw/9pfs/xen-9pfs.h" #include "qapi/error.h" #include "qemu/config-file.h" +#include "qemu/main-loop.h" #include "qemu/option.h" #include "fsdev/qemu-fsdev.h" diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c index cce671014b..ce9247118e 100644 --- a/hw/arm/omap1.c +++ b/hw/arm/omap1.c @@ -19,6 +19,7 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-blk.c index 158c78f852..9299a1a7c2 100644 --- a/hw/block/dataplane/virtio-blk.c +++ b/hw/block/dataplane/virtio-blk.c @@ -16,6 +16,7 @@ #include "qapi/error.h" #include "trace.h" #include "qemu/iov.h" +#include "qemu/main-loop.h" #include "qemu/thread.h" #include "qemu/error-report.h" #include "hw/virtio/virtio-access.h" diff --git a/hw/block/dataplane/xen-block.c b/hw/block/dataplane/xen-block.c index 71c63330ac..3b9caeb2fa 100644 --- a/hw/block/dataplane/xen-block.c +++ b/hw/block/dataplane/xen-block.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #include "qapi/error.h" #include "hw/xen/xen_common.h" #include "hw/block/xen_blkif.h" diff --git a/hw/block/fdc.c b/hw/block/fdc.c index acb19800fe..c11247ccdd 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -41,6 +41,7 @@ #include "sysemu/blockdev.h" #include "sysemu/sysemu.h" #include "qemu/log.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "trace.h" diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c index 848a0ad0ea..aef39536ac 100644 --- a/hw/block/xen-block.c +++ b/hw/block/xen-block.c @@ -7,6 +7,7 @@ #include "qemu/osdep.h" #include "qemu/cutils.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "qemu/option.h" #include "qapi/error.h" diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c index b868e54d72..272cfb6049 100644 --- a/hw/char/virtio-serial-bus.c +++ b/hw/char/virtio-serial-bus.c @@ -21,6 +21,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/iov.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "migration/qemu-file-types.h" #include "monitor/monitor.h" diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c index 5bd95b8ab0..d8284671f0 100644 --- a/hw/core/machine-qmp-cmds.c +++ b/hw/core/machine-qmp-cmds.c @@ -13,6 +13,7 @@ #include "qapi/error.h" #include "qapi/qapi-commands-machine.h" #include "qapi/qmp/qerror.h" +#include "qemu/main-loop.h" #include "sysemu/hostmem.h" #include "sysemu/hw_accel.h" #include "sysemu/numa.h" diff --git a/hw/display/qxl.c b/hw/display/qxl.c index 4a44712fde..539ede12c0 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -26,6 +26,7 @@ #include "qemu/timer.h" #include "qemu/queue.h" #include "qemu/atomic.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "sysemu/sysemu.h" #include "migration/blocker.h" diff --git a/hw/dma/etraxfs_dma.c b/hw/dma/etraxfs_dma.c index 4285443c81..36da22fa90 100644 --- a/hw/dma/etraxfs_dma.c +++ b/hw/dma/etraxfs_dma.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/irq.h" +#include "qemu/main-loop.h" #include "exec/address-spaces.h" #include "sysemu/sysemu.h" diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index 000de6b9ce..50fe5cc1a9 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -21,6 +21,7 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #include "qapi/error.h" #include "hw/sysbus.h" #include "exec/address-spaces.h" diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c index 63abace70a..3e15ffc828 100644 --- a/hw/i386/xen/xen-hvm.c +++ b/hw/i386/xen/xen-hvm.c @@ -23,6 +23,7 @@ #include "qapi/error.h" #include "qapi/qapi-commands-misc.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #include "qemu/range.h" #include "sysemu/xen-mapcache.h" #include "trace.h" diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 1d5a54b29e..378c1f360f 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -28,6 +28,7 @@ #include "qemu/error-report.h" #include "qemu/log.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "sysemu/block-backend.h" #include "sysemu/dma.h" diff --git a/hw/ide/core.c b/hw/ide/core.c index 005b4d5ef4..61cb3b26ab 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -27,6 +27,7 @@ #include "hw/isa/isa.h" #include "migration/vmstate.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" #include "sysemu/blockdev.h" diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c index d85c31a0ee..d30bdd70ee 100644 --- a/hw/ide/qdev.c +++ b/hw/ide/qdev.c @@ -22,6 +22,7 @@ #include "qapi/error.h" #include "qapi/qapi-types-block.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "hw/ide/internal.h" #include "sysemu/block-backend.h" diff --git a/hw/intc/s390_flic.c b/hw/intc/s390_flic.c index d0be755c82..a1b28e755f 100644 --- a/hw/intc/s390_flic.c +++ b/hw/intc/s390_flic.c @@ -12,6 +12,7 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "hw/sysbus.h" #include "hw/s390x/ioinst.h" diff --git a/hw/m68k/mcf5206.c b/hw/m68k/mcf5206.c index 5ee1498f48..a9c2c95b0d 100644 --- a/hw/m68k/mcf5206.c +++ b/hw/m68k/mcf5206.c @@ -8,6 +8,7 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #include "cpu.h" #include "hw/hw.h" #include "hw/irq.h" diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c index 3a21c62809..012710d057 100644 --- a/hw/m68k/mcf5208.c +++ b/hw/m68k/mcf5208.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" diff --git a/hw/misc/imx6_src.c b/hw/misc/imx6_src.c index 0be683de06..b9d86fe530 100644 --- a/hw/misc/imx6_src.c +++ b/hw/misc/imx6_src.c @@ -14,6 +14,7 @@ #include "sysemu/sysemu.h" #include "qemu/bitops.h" #include "qemu/log.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "arm-powerctl.h" #include "qom/cpu.h" diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c index e217238296..e5c902ada4 100644 --- a/hw/net/fsl_etsec/etsec.c +++ b/hw/net/fsl_etsec/etsec.c @@ -34,6 +34,7 @@ #include "etsec.h" #include "registers.h" #include "qemu/log.h" +#include "qemu/main-loop.h" #include "qemu/module.h" /* #define HEX_DUMP */ diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c index 1d32cb79e2..ea20a92cda 100644 --- a/hw/net/lan9118.c +++ b/hw/net/lan9118.c @@ -21,6 +21,7 @@ #include "sysemu/sysemu.h" #include "hw/ptimer.h" #include "qemu/log.h" +#include "qemu/main-loop.h" #include "qemu/module.h" /* For crc32 */ #include diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c index a6b719035c..e975700f95 100644 --- a/hw/net/vhost_net.c +++ b/hw/net/vhost_net.c @@ -22,7 +22,7 @@ #include "hw/virtio/virtio-net.h" #include "net/vhost_net.h" #include "qemu/error-report.h" - +#include "qemu/main-loop.h" #include #include diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index b9e1cd71cf..cdf4d774da 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "qemu/iov.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "hw/virtio/virtio.h" #include "net/net.h" diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c index a1192d7889..a28aca453d 100644 --- a/hw/ppc/ppc.c +++ b/hw/ppc/ppc.c @@ -31,6 +31,7 @@ #include "sysemu/sysemu.h" #include "sysemu/cpus.h" #include "qemu/log.h" +#include "qemu/main-loop.h" #include "qemu/error-report.h" #include "sysemu/kvm.h" #include "kvm_ppc.h" diff --git a/hw/ppc/ppc440_uc.c b/hw/ppc/ppc440_uc.c index e7f42d78a1..761d551967 100644 --- a/hw/ppc/ppc440_uc.c +++ b/hw/ppc/ppc440_uc.c @@ -13,6 +13,7 @@ #include "qemu/error-report.h" #include "qapi/error.h" #include "qemu/log.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "cpu.h" #include "hw/irq.h" diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index 6808d4cda8..0f4e6b7120 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -3,6 +3,7 @@ #include "sysemu/hw_accel.h" #include "sysemu/sysemu.h" #include "qemu/log.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "qemu/error-report.h" #include "cpu.h" diff --git a/hw/ppc/spapr_rng.c b/hw/ppc/spapr_rng.c index 0e1c7ebcf8..cfe43eaae9 100644 --- a/hw/ppc/spapr_rng.c +++ b/hw/ppc/spapr_rng.c @@ -21,6 +21,7 @@ #include "qapi/error.h" #include "cpu.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "sysemu/sysemu.h" #include "sysemu/device_tree.h" diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c index b32f4c0ca9..efa54a30c5 100644 --- a/hw/scsi/mptsas.c +++ b/hw/scsi/mptsas.c @@ -27,6 +27,7 @@ #include "sysemu/dma.h" #include "hw/pci/msi.h" #include "qemu/iov.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "hw/scsi/scsi.h" #include "scsi/constants.h" diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index 8f4f69374b..3a2ef2ddc3 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -23,6 +23,7 @@ #include "qemu/units.h" #include "qapi/error.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "hw/scsi/scsi.h" #include "migration/qemu-file-types.h" diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c index 85af638bc7..7e27bce43e 100644 --- a/hw/scsi/vmw_pvscsi.c +++ b/hw/scsi/vmw_pvscsi.c @@ -27,6 +27,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "hw/scsi/scsi.h" #include "migration/vmstate.h" diff --git a/hw/timer/allwinner-a10-pit.c b/hw/timer/allwinner-a10-pit.c index b9d057df5d..904da4fc88 100644 --- a/hw/timer/allwinner-a10-pit.c +++ b/hw/timer/allwinner-a10-pit.c @@ -22,6 +22,7 @@ #include "hw/timer/allwinner-a10-pit.h" #include "migration/vmstate.h" #include "qemu/log.h" +#include "qemu/main-loop.h" #include "qemu/module.h" static void a10_pit_update_irq(AwA10PITState *s) diff --git a/hw/timer/altera_timer.c b/hw/timer/altera_timer.c index 0dd4f321f7..51971e44ca 100644 --- a/hw/timer/altera_timer.c +++ b/hw/timer/altera_timer.c @@ -19,6 +19,7 @@ */ #include "qemu/osdep.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "qapi/error.h" diff --git a/hw/timer/etraxfs_timer.c b/hw/timer/etraxfs_timer.c index 2fd54ad4dc..739276ecb8 100644 --- a/hw/timer/etraxfs_timer.c +++ b/hw/timer/etraxfs_timer.c @@ -26,6 +26,7 @@ #include "hw/sysbus.h" #include "sysemu/reset.h" #include "sysemu/sysemu.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "qemu/timer.h" #include "hw/irq.h" diff --git a/hw/timer/exynos4210_rtc.c b/hw/timer/exynos4210_rtc.c index f79b970c5e..5c954cfa01 100644 --- a/hw/timer/exynos4210_rtc.c +++ b/hw/timer/exynos4210_rtc.c @@ -28,6 +28,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/log.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/timer/milkymist-sysctl.c b/hw/timer/milkymist-sysctl.c index 900b0b62a9..4d75d73a93 100644 --- a/hw/timer/milkymist-sysctl.c +++ b/hw/timer/milkymist-sysctl.c @@ -30,6 +30,7 @@ #include "qemu/timer.h" #include "hw/ptimer.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #include "qemu/module.h" enum { diff --git a/hw/usb/dev-uas.c b/hw/usb/dev-uas.c index 525bc1e590..c7d215d4ef 100644 --- a/hw/usb/dev-uas.c +++ b/hw/usb/dev-uas.c @@ -14,6 +14,7 @@ #include "qemu/config-file.h" #include "trace.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "hw/usb.h" diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c index 45ff4f4115..d7d1ecd45d 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -34,6 +34,7 @@ #include "migration/vmstate.h" #include "trace.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #define FRAME_TIMER_FREQ 1000 #define FRAME_TIMER_NS (NANOSECONDS_PER_SECOND / FRAME_TIMER_FREQ) diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c index 6f5338832a..c043487298 100644 --- a/hw/usb/host-libusb.c +++ b/hw/usb/host-libusb.c @@ -43,6 +43,7 @@ #include "migration/vmstate.h" #include "monitor/monitor.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "sysemu/sysemu.h" #include "trace.h" diff --git a/hw/usb/xen-usb.c b/hw/usb/xen-usb.c index dfbb418e77..1fc2f32ce9 100644 --- a/hw/usb/xen-usb.c +++ b/hw/usb/xen-usb.c @@ -24,6 +24,7 @@ #include #include "qemu/config-file.h" +#include "qemu/main-loop.h" #include "qemu/option.h" #include "hw/sysbus.h" #include "hw/usb.h" diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c index 16f200e6fe..c78a85a864 100644 --- a/hw/vfio/ccw.c +++ b/hw/vfio/ccw.c @@ -28,6 +28,7 @@ #include "hw/s390x/ccw-device.h" #include "exec/address-spaces.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #include "qemu/module.h" struct VFIOCCWDevice { diff --git a/hw/vfio/common.c b/hw/vfio/common.c index a363b4495f..3e03c495d8 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -31,6 +31,7 @@ #include "exec/memory.h" #include "hw/hw.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #include "qemu/range.h" #include "sysemu/balloon.h" #include "sysemu/kvm.h" diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 48ac0f5a34..ab3ee2ca7a 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -28,6 +28,7 @@ #include "hw/pci/pci_bridge.h" #include "migration/vmstate.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "qemu/option.h" #include "qemu/range.h" diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c index 2ec9c9f49b..ff5f805d68 100644 --- a/hw/vfio/platform.c +++ b/hw/vfio/platform.c @@ -22,6 +22,7 @@ #include "hw/vfio/vfio-platform.h" #include "migration/vmstate.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "qemu/range.h" #include "sysemu/sysemu.h" diff --git a/hw/virtio/vhost-backend.c b/hw/virtio/vhost-backend.c index 96b8d3c95d..48905383f8 100644 --- a/hw/virtio/vhost-backend.c +++ b/hw/virtio/vhost-backend.c @@ -12,6 +12,7 @@ #include "hw/virtio/vhost.h" #include "hw/virtio/vhost-backend.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #include "standard-headers/linux/vhost_types.h" #ifdef CONFIG_VHOST_KERNEL diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index 4ca5b2551e..02a9b25199 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -18,6 +18,7 @@ #include "chardev/char-fe.h" #include "sysemu/kvm.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #include "qemu/sockets.h" #include "sysemu/cryptodev.h" #include "migration/migration.h" diff --git a/hw/virtio/virtio-crypto.c b/hw/virtio/virtio-crypto.c index 45187d3344..dbfaee6d7c 100644 --- a/hw/virtio/virtio-crypto.c +++ b/hw/virtio/virtio-crypto.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "qemu/iov.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "hw/qdev.h" #include "qapi/error.h" diff --git a/hw/virtio/virtio-pmem.c b/hw/virtio/virtio-pmem.c index 17c196d107..ca487f63d2 100644 --- a/hw/virtio/virtio-pmem.c +++ b/hw/virtio/virtio-pmem.c @@ -15,6 +15,7 @@ #include "qapi/error.h" #include "qemu-common.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #include "hw/virtio/virtio-pmem.h" #include "hw/virtio/virtio-access.h" #include "standard-headers/linux/virtio_ids.h" diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 79c7a910cc..f4c8337930 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -17,6 +17,7 @@ #include "trace.h" #include "exec/address-spaces.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "hw/virtio/virtio.h" #include "migration/qemu-file-types.h" diff --git a/hw/xen/xen-legacy-backend.c b/hw/xen/xen-legacy-backend.c index 2831940ae7..47a7c9760a 100644 --- a/hw/xen/xen-legacy-backend.c +++ b/hw/xen/xen-legacy-backend.c @@ -28,6 +28,7 @@ #include "hw/sysbus.h" #include "hw/boards.h" #include "qemu/log.h" +#include "qemu/main-loop.h" #include "qapi/error.h" #include "hw/xen/xen-legacy-backend.h" #include "hw/xen/xen_pvdev.h" diff --git a/hw/xen/xen_pvdev.c b/hw/xen/xen_pvdev.c index 6ef09cbf9d..43a336aabf 100644 --- a/hw/xen/xen_pvdev.c +++ b/hw/xen/xen_pvdev.c @@ -19,6 +19,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" +#include "qemu/main-loop.h" #include "hw/qdev-core.h" #include "hw/xen/xen-legacy-backend.h" #include "hw/xen/xen_pvdev.h" diff --git a/include/block/block_int.h b/include/block/block_int.h index 3aa1e832a8..6207a105ff 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -33,7 +33,6 @@ #include "qemu/timer.h" #include "qemu/hbitmap.h" #include "block/snapshot.h" -#include "qemu/main-loop.h" #include "qemu/throttle.h" #define BLOCK_FLAG_LAZY_REFCOUNTS 8 diff --git a/include/chardev/char-fe.h b/include/chardev/char-fe.h index aa1b864ccd..67601dc9a4 100644 --- a/include/chardev/char-fe.h +++ b/include/chardev/char-fe.h @@ -2,6 +2,7 @@ #define QEMU_CHAR_FE_H #include "chardev/char.h" +#include "qemu/main-loop.h" typedef void IOEventHandler(void *opaque, int event); typedef int BackendChangeHandler(void *opaque); diff --git a/include/chardev/char-io.h b/include/chardev/char-io.h index 1709b59c9f..ac379ea70e 100644 --- a/include/chardev/char-io.h +++ b/include/chardev/char-io.h @@ -26,6 +26,7 @@ #include "io/channel.h" #include "chardev/char.h" +#include "qemu/main-loop.h" /* Can only be used for read */ GSource *io_add_watch_poll(Chardev *chr, diff --git a/include/chardev/char.h b/include/chardev/char.h index c0b57f7685..087b202b62 100644 --- a/include/chardev/char.h +++ b/include/chardev/char.h @@ -2,8 +2,8 @@ #define QEMU_CHAR_H #include "qapi/qapi-types-char.h" -#include "qemu/main-loop.h" #include "qemu/bitmap.h" +#include "qemu/thread.h" #include "qom/object.h" #define IAC_EOR 239 diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h index 426566a5c6..15a763dc18 100644 --- a/include/hw/scsi/scsi.h +++ b/include/hw/scsi/scsi.h @@ -2,6 +2,7 @@ #define QEMU_HW_SCSI_H #include "hw/qdev.h" +#include "block/aio.h" #include "hw/block/block.h" #include "sysemu/sysemu.h" #include "scsi/utils.h" diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 77f5df59b0..ac18a1184a 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -5,7 +5,6 @@ #include "qapi/qapi-types-run-state.h" #include "qemu/timer.h" #include "qemu/notify.h" -#include "qemu/main-loop.h" #include "qemu/bitmap.h" #include "qemu/uuid.h" #include "qom/object.h" diff --git a/memory.c b/memory.c index bf108b596e..9be7e4cb56 100644 --- a/memory.c +++ b/memory.c @@ -21,6 +21,7 @@ #include "qapi/visitor.h" #include "qemu/bitops.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #include "qemu/qemu-print.h" #include "qom/object.h" #include "trace-root.h" diff --git a/migration/block.c b/migration/block.c index 91f98ef44a..e81fd7e14f 100644 --- a/migration/block.c +++ b/migration/block.c @@ -16,6 +16,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #include "qemu/cutils.h" #include "qemu/queue.h" #include "block.h" diff --git a/migration/colo.c b/migration/colo.c index 0b5b620391..0602e6bbe4 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -23,6 +23,7 @@ #include "io/channel-buffer.h" #include "trace.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #include "qemu/rcu.h" #include "migration/failover.h" #ifdef CONFIG_REPLICATION diff --git a/migration/migration.c b/migration/migration.c index 8a607fe1e2..85e5d22e32 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -16,6 +16,7 @@ #include "qemu/osdep.h" #include "qemu/cutils.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #include "migration/blocker.h" #include "exec.h" #include "fd.h" diff --git a/migration/savevm.c b/migration/savevm.c index 89e8f4c180..b8f734537a 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -51,6 +51,7 @@ #include "exec/target_page.h" #include "trace.h" #include "qemu/iov.h" +#include "qemu/main-loop.h" #include "block/snapshot.h" #include "qemu/cutils.h" #include "io/channel-buffer.h" diff --git a/nbd/nbd-internal.h b/nbd/nbd-internal.h index ec3d2e2ebc..60629ef160 100644 --- a/nbd/nbd-internal.h +++ b/nbd/nbd-internal.h @@ -28,7 +28,6 @@ #endif #include "qemu/bswap.h" -#include "qemu/main-loop.h" /* This is all part of the "official" NBD API. * diff --git a/net/can/can_socketcan.c b/net/can/can_socketcan.c index 3dec108684..8a6ffad40c 100644 --- a/net/can/can_socketcan.c +++ b/net/can/can_socketcan.c @@ -27,6 +27,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "qapi/error.h" #include "chardev/char.h" diff --git a/net/tap-win32.c b/net/tap-win32.c index 662f9b63e1..9cdef47286 100644 --- a/net/tap-win32.c +++ b/net/tap-win32.c @@ -35,6 +35,7 @@ #include "net/tap.h" /* tap_has_ufo, ... */ #include "sysemu/sysemu.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #include #include diff --git a/net/tap.c b/net/tap.c index e8aadd8d4b..06af8fb8ad 100644 --- a/net/tap.c +++ b/net/tap.c @@ -40,6 +40,7 @@ #include "qemu-common.h" #include "qemu/cutils.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #include "qemu/sockets.h" #include "net/tap.h" diff --git a/qemu-img.c b/qemu-img.c index 79983772de..a398fd44d6 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -38,6 +38,7 @@ #include "qemu/option.h" #include "qemu/error-report.h" #include "qemu/log.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "qemu/units.h" #include "qom/object_interfaces.h" diff --git a/qom/cpu.c b/qom/cpu.c index fdc1af8f40..cdb8c71b6b 100644 --- a/qom/cpu.c +++ b/qom/cpu.c @@ -24,6 +24,7 @@ #include "sysemu/hw_accel.h" #include "qemu/notify.h" #include "qemu/log.h" +#include "qemu/main-loop.h" #include "exec/log.h" #include "qemu/error-report.h" #include "qemu/qemu-print.h" diff --git a/replay/replay-internal.c b/replay/replay-internal.c index 9e41ed1dcf..9f7a76ca32 100644 --- a/replay/replay-internal.c +++ b/replay/replay-internal.c @@ -13,6 +13,7 @@ #include "sysemu/replay.h" #include "replay-internal.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #include "sysemu/sysemu.h" /* Mutex to protect reading and writing events to the log. diff --git a/target/arm/helper-a64.c b/target/arm/helper-a64.c index 060699b901..616d62c7fc 100644 --- a/target/arm/helper-a64.c +++ b/target/arm/helper-a64.c @@ -23,6 +23,7 @@ #include "exec/helper-proto.h" #include "qemu/host-utils.h" #include "qemu/log.h" +#include "qemu/main-loop.h" #include "sysemu/sysemu.h" #include "qemu/bitops.h" #include "internals.h" diff --git a/target/arm/helper.c b/target/arm/helper.c index 1084b618ee..ffe56696dd 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -5,6 +5,7 @@ * * SPDX-License-Identifier: GPL-2.0-or-later */ + #include "qemu/osdep.h" #include "qemu/units.h" #include "target/arm/idau.h" @@ -14,6 +15,7 @@ #include "exec/gdbstub.h" #include "exec/helper-proto.h" #include "qemu/host-utils.h" +#include "qemu/main-loop.h" #include "sysemu/sysemu.h" #include "qemu/bitops.h" #include "qemu/crc32c.h" diff --git a/target/arm/m_helper.c b/target/arm/m_helper.c index 84609f446e..cde5195d28 100644 --- a/target/arm/m_helper.c +++ b/target/arm/m_helper.c @@ -5,6 +5,7 @@ * * SPDX-License-Identifier: GPL-2.0-or-later */ + #include "qemu/osdep.h" #include "qemu/units.h" #include "target/arm/idau.h" @@ -14,6 +15,7 @@ #include "exec/gdbstub.h" #include "exec/helper-proto.h" #include "qemu/host-utils.h" +#include "qemu/main-loop.h" #include "sysemu/sysemu.h" #include "qemu/bitops.h" #include "qemu/crc32c.h" diff --git a/target/arm/psci.c b/target/arm/psci.c index a74d78802a..af1d5a551e 100644 --- a/target/arm/psci.c +++ b/target/arm/psci.c @@ -15,10 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ + #include "qemu/osdep.h" #include "cpu.h" #include "exec/helper-proto.h" #include "kvm-consts.h" +#include "qemu/main-loop.h" #include "sysemu/sysemu.h" #include "internals.h" #include "arm-powerctl.h" diff --git a/target/i386/kvm.c b/target/i386/kvm.c index 38be57f2da..e568ff6671 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -31,6 +31,7 @@ #include "exec/gdbstub.h" #include "qemu/host-utils.h" +#include "qemu/main-loop.h" #include "qemu/config-file.h" #include "qemu/error-report.h" #include "hw/i386/pc.h" diff --git a/target/lm32/op_helper.c b/target/lm32/op_helper.c index d184550a7b..99ca76c04f 100644 --- a/target/lm32/op_helper.c +++ b/target/lm32/op_helper.c @@ -2,6 +2,7 @@ #include "cpu.h" #include "exec/helper-proto.h" #include "qemu/host-utils.h" +#include "qemu/main-loop.h" #include "hw/lm32/lm32_pic.h" #include "hw/char/lm32_juart.h" diff --git a/target/ppc/int_helper.c b/target/ppc/int_helper.c index 5c07ef3e4d..8f037af956 100644 --- a/target/ppc/int_helper.c +++ b/target/ppc/int_helper.c @@ -16,10 +16,12 @@ * 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 "cpu.h" #include "internal.h" #include "qemu/host-utils.h" +#include "qemu/main-loop.h" #include "exec/helper-proto.h" #include "crypto/aes.h" #include "fpu/softfloat.h" diff --git a/target/ppc/machine.c b/target/ppc/machine.c index afaaab9db9..74e003cf46 100644 --- a/target/ppc/machine.c +++ b/target/ppc/machine.c @@ -8,6 +8,7 @@ #include "migration/cpu.h" #include "migration/vmstate.h" #include "qapi/error.h" +#include "qemu/main-loop.h" #include "kvm_ppc.h" #include "exec/helper-proto.h" diff --git a/target/ppc/mem_helper.c b/target/ppc/mem_helper.c index 6f4ffa3661..1351b53f28 100644 --- a/target/ppc/mem_helper.c +++ b/target/ppc/mem_helper.c @@ -16,10 +16,12 @@ * 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 "cpu.h" #include "exec/exec-all.h" #include "qemu/host-utils.h" +#include "qemu/main-loop.h" #include "exec/helper-proto.h" #include "helper_regs.h" #include "exec/cpu_ldst.h" diff --git a/target/ppc/misc_helper.c b/target/ppc/misc_helper.c index 49a8a02363..2318f3ab45 100644 --- a/target/ppc/misc_helper.c +++ b/target/ppc/misc_helper.c @@ -16,11 +16,13 @@ * 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 "cpu.h" #include "exec/exec-all.h" #include "exec/helper-proto.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #include "helper_regs.h" diff --git a/target/ppc/mmu_helper.c b/target/ppc/mmu_helper.c index 261a8fe707..55f7a7f16a 100644 --- a/target/ppc/mmu_helper.c +++ b/target/ppc/mmu_helper.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/units.h" #include "cpu.h" @@ -29,6 +30,7 @@ #include "exec/log.h" #include "helper_regs.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #include "qemu/qemu-print.h" #include "mmu-book3s-v3.h" #include "mmu-radix64.h" diff --git a/target/ppc/translate.c b/target/ppc/translate.c index 4a5de28036..9f9553afb4 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -26,6 +26,7 @@ #include "tcg-op.h" #include "tcg-op-gvec.h" #include "qemu/host-utils.h" +#include "qemu/main-loop.h" #include "exec/cpu_ldst.h" #include "exec/helper-proto.h" diff --git a/tcg/tcg-op-gvec.c b/tcg/tcg-op-gvec.c index 17679b6e2f..5c95ecd51c 100644 --- a/tcg/tcg-op-gvec.c +++ b/tcg/tcg-op-gvec.c @@ -21,6 +21,7 @@ #include "tcg.h" #include "tcg-op.h" #include "tcg-op-gvec.h" +#include "qemu/main-loop.h" #include "tcg-gvec-desc.h" #define MAX_UNROLL 4 diff --git a/tests/test-bdrv-drain.c b/tests/test-bdrv-drain.c index 03fa1142a1..481b7508df 100644 --- a/tests/test-bdrv-drain.c +++ b/tests/test-bdrv-drain.c @@ -27,6 +27,7 @@ #include "block/blockjob_int.h" #include "sysemu/block-backend.h" #include "qapi/error.h" +#include "qemu/main-loop.h" #include "iothread.h" static QemuEvent done_event; diff --git a/tests/test-bdrv-graph-mod.c b/tests/test-bdrv-graph-mod.c index cfeec36566..a007754d9e 100644 --- a/tests/test-bdrv-graph-mod.c +++ b/tests/test-bdrv-graph-mod.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/main-loop.h" #include "block/block_int.h" #include "sysemu/block-backend.h" diff --git a/tests/test-block-backend.c b/tests/test-block-backend.c index 5b5d6845c0..2fb1a444bd 100644 --- a/tests/test-block-backend.c +++ b/tests/test-block-backend.c @@ -26,6 +26,7 @@ #include "block/block.h" #include "sysemu/block-backend.h" #include "qapi/error.h" +#include "qemu/main-loop.h" static void test_drain_aio_error_flush_cb(void *opaque, int ret) { diff --git a/tests/test-block-iothread.c b/tests/test-block-iothread.c index 1949d5e61a..e81b5b8dc4 100644 --- a/tests/test-block-iothread.c +++ b/tests/test-block-iothread.c @@ -28,6 +28,7 @@ #include "sysemu/block-backend.h" #include "qapi/error.h" #include "qapi/qmp/qdict.h" +#include "qemu/main-loop.h" #include "iothread.h" static int coroutine_fn bdrv_test_co_prwv(BlockDriverState *bs, diff --git a/tests/test-image-locking.c b/tests/test-image-locking.c index 7614cbf90c..ba057bd66c 100644 --- a/tests/test-image-locking.c +++ b/tests/test-image-locking.c @@ -29,6 +29,7 @@ #include "sysemu/block-backend.h" #include "qapi/error.h" #include "qapi/qmp/qdict.h" +#include "qemu/main-loop.h" static BlockBackend *open_image(const char *path, uint64_t perm, uint64_t shared_perm, diff --git a/tests/test-replication.c b/tests/test-replication.c index f085d1993a..4747d8a6be 100644 --- a/tests/test-replication.c +++ b/tests/test-replication.c @@ -13,6 +13,7 @@ #include "qapi/error.h" #include "qapi/qmp/qdict.h" #include "qemu/option.h" +#include "qemu/main-loop.h" #include "replication.h" #include "block/block_int.h" #include "block/qdict.h" diff --git a/tests/test-throttle.c b/tests/test-throttle.c index a28812260e..083e1f9ba8 100644 --- a/tests/test-throttle.c +++ b/tests/test-throttle.c @@ -18,6 +18,7 @@ #include "qapi/error.h" #include "qemu/throttle.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "block/throttle-groups.h" #include "sysemu/block-backend.h" diff --git a/ui/input-linux.c b/ui/input-linux.c index c8d22f99d9..e3fa799c34 100644 --- a/ui/input-linux.c +++ b/ui/input-linux.c @@ -7,6 +7,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/config-file.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "qemu/sockets.h" #include "sysemu/sysemu.h" diff --git a/ui/spice-core.c b/ui/spice-core.c index 16478ecd45..a395d7ccd4 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -22,6 +22,7 @@ #include "ui/qemu-spice.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "qemu/thread.h" #include "qemu/timer.h" diff --git a/ui/spice-display.c b/ui/spice-display.c index 104df23025..0c65ae2fe3 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -18,6 +18,7 @@ #include "qemu/osdep.h" #include "ui/qemu-spice.h" #include "qemu/timer.h" +#include "qemu/main-loop.h" #include "qemu/option.h" #include "qemu/queue.h" #include "ui/console.h" diff --git a/ui/vnc-auth-sasl.h b/ui/vnc-auth-sasl.h index fb55fe04ca..1bfb86c6f5 100644 --- a/ui/vnc-auth-sasl.h +++ b/ui/vnc-auth-sasl.h @@ -30,7 +30,6 @@ typedef struct VncStateSASL VncStateSASL; typedef struct VncDisplaySASL VncDisplaySASL; -#include "qemu/main-loop.h" #include "authz/base.h" struct VncStateSASL { diff --git a/ui/vnc.c b/ui/vnc.c index f47f726681..4812ed29d0 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -31,6 +31,7 @@ #include "hw/qdev-core.h" #include "sysemu/sysemu.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "qemu/option.h" #include "qemu/sockets.h" diff --git a/util/oslib-posix.c b/util/oslib-posix.c index fe0309ce7a..5fda67dedf 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -36,6 +36,7 @@ #include "trace.h" #include "qapi/error.h" #include "qemu/sockets.h" +#include "qemu/thread.h" #include #include #include "qemu/cutils.h" From patchwork Fri Jul 26 12:05:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 11060937 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 397F0746 for ; Fri, 26 Jul 2019 12:12:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1590528AA5 for ; Fri, 26 Jul 2019 12:12:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 077D328AAB; Fri, 26 Jul 2019 12:12:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E62CA28AA5 for ; Fri, 26 Jul 2019 12:11:50 +0000 (UTC) Received: from localhost ([::1]:39406 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqz4e-00048f-U6 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 26 Jul 2019 08:11:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59101) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqyz6-00062l-MT for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:06:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqyyu-0008Dj-1Y for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:06:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:28343) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqyyt-0007yl-2O for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:51 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E10C6C057F31 for ; Fri, 26 Jul 2019 12:05:48 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A7CED19D7E; Fri, 26 Jul 2019 12:05:47 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 14E9711326BD; Fri, 26 Jul 2019 14:05:43 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 26 Jul 2019 14:05:35 +0200 Message-Id: <20190726120542.9894-22-armbru@redhat.com> In-Reply-To: <20190726120542.9894-1-armbru@redhat.com> References: <20190726120542.9894-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 26 Jul 2019 12:05:48 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 21/28] Include hw/qdev-properties.h less X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP In my "build everything" tree, changing hw/qdev-properties.h triggers a recompile of some 2700 out of 6600 objects (not counting tests and objects that don't depend on qemu/osdep.h). Many places including hw/qdev-properties.h (directly or via hw/qdev.h) actually need only hw/qdev-core.h. Include hw/qdev-core.h there instead. hw/qdev.h is actually pointless: all it does is include hw/qdev-core.h and hw/qdev-properties.h, which in turn includes hw/qdev-core.h. Replace the remaining uses of hw/qdev.h by hw/qdev-properties.h. While there, delete a few superfluous inclusions of hw/qdev-core.h. Touching hw/qdev-properties.h now recompiles some 1200 objects. Cc: Paolo Bonzini Cc: "Daniel P. Berrangé" Cc: Eduardo Habkost Signed-off-by: Markus Armbruster Reviewed-by: Eduardo Habkost --- backends/vhost-user.c | 1 - hw/9pfs/virtio-9p-device.c | 1 + hw/acpi/piix4.c | 1 + hw/acpi/vmgenid.c | 1 + hw/arm/armv7m.c | 1 + hw/arm/aspeed.c | 1 + hw/arm/digic.c | 1 + hw/arm/exynos4210.c | 1 + hw/arm/exynos4_boards.c | 1 + hw/arm/fsl-imx25.c | 1 + hw/arm/fsl-imx31.c | 1 + hw/arm/fsl-imx6.c | 1 + hw/arm/mcimx6ul-evk.c | 1 + hw/arm/mcimx7d-sabre.c | 1 + hw/arm/microbit.c | 1 + hw/arm/msf2-som.c | 1 + hw/arm/musicpal.c | 1 + hw/arm/netduino2.c | 1 + hw/arm/nseries.c | 1 + hw/arm/omap1.c | 1 + hw/arm/omap2.c | 1 + hw/arm/pxa2xx.c | 1 + hw/arm/pxa2xx_gpio.c | 1 + hw/arm/sabrelite.c | 1 + hw/arm/sbsa-ref.c | 1 + hw/arm/spitz.c | 1 + hw/arm/stm32f205_soc.c | 1 + hw/arm/strongarm.c | 1 + hw/arm/virt.c | 1 + hw/audio/ac97.c | 1 + hw/audio/adlib.c | 1 + hw/audio/cs4231a.c | 2 +- hw/audio/gus.c | 1 + hw/audio/hda-codec.c | 1 + hw/audio/intel-hda.c | 1 + hw/audio/intel-hda.h | 2 +- hw/audio/marvell_88w8618.c | 1 + hw/audio/pl041.c | 1 + hw/audio/sb16.c | 2 +- hw/block/fdc.c | 1 + hw/block/m25p80.c | 1 + hw/block/nand.c | 2 +- hw/block/nvme.c | 1 + hw/block/onenand.c | 1 + hw/block/pflash_cfi01.c | 1 + hw/block/pflash_cfi02.c | 1 + hw/block/vhost-user-blk.c | 1 + hw/block/virtio-blk.c | 1 + hw/block/xen-block.c | 1 + hw/char/bcm2835_aux.c | 1 + hw/char/debugcon.c | 1 + hw/char/digic-uart.c | 1 + hw/char/escc.c | 1 + hw/char/etraxfs_ser.c | 1 + hw/char/exynos4210_uart.c | 1 + hw/char/grlib_apbuart.c | 1 + hw/char/imx_serial.c | 1 + hw/char/ipoctal232.c | 1 + hw/char/lm32_juart.c | 1 + hw/char/lm32_uart.c | 1 + hw/char/mcf_uart.c | 1 + hw/char/milkymist-uart.c | 1 + hw/char/nrf51_uart.c | 1 + hw/char/parallel-isa.c | 2 ++ hw/char/parallel.c | 1 + hw/char/sclpconsole-lm.c | 2 +- hw/char/sclpconsole.c | 2 +- hw/char/serial-isa.c | 1 + hw/char/serial-pci-multi.c | 1 + hw/char/serial-pci.c | 1 + hw/char/spapr_vty.c | 2 +- hw/char/stm32f2xx_usart.c | 1 + hw/char/terminal3270.c | 1 + hw/char/virtio-console.c | 1 + hw/char/virtio-serial-bus.c | 1 + hw/char/xilinx_uartlite.c | 1 + hw/core/bus.c | 2 +- hw/core/generic-loader.c | 1 + hw/core/or-irq.c | 1 + hw/core/platform-bus.c | 1 + hw/core/qdev-fw.c | 2 +- hw/core/qdev-properties-system.c | 2 +- hw/core/qdev-properties.c | 2 +- hw/core/qdev.c | 2 +- hw/core/register.c | 1 - hw/core/split-irq.c | 1 + hw/core/vm-change-state-handler.c | 2 +- hw/cpu/a15mpcore.c | 1 + hw/cpu/a9mpcore.c | 1 + hw/cpu/arm11mpcore.c | 1 + hw/cpu/cluster.c | 1 + hw/cpu/realview_mpcore.c | 1 + hw/display/ati.c | 1 + hw/display/bcm2835_fb.c | 1 + hw/display/bochs-display.c | 1 + hw/display/cg3.c | 1 + hw/display/cirrus_vga.c | 1 + hw/display/cirrus_vga_isa.c | 1 + hw/display/g364fb.c | 1 + hw/display/i2c-ddc.c | 1 + hw/display/milkymist-vgafb.c | 1 + hw/display/qxl.c | 1 + hw/display/ramfb-standalone.c | 1 + hw/display/sm501.c | 1 + hw/display/tcx.c | 1 + hw/display/vga-isa.c | 1 + hw/display/vga-pci.c | 1 + hw/display/vhost-user-gpu.c | 1 + hw/display/virtio-gpu-pci.c | 1 + hw/display/virtio-gpu.c | 1 + hw/display/virtio-vga.c | 1 + hw/display/vmware_vga.c | 1 + hw/dma/i82374.c | 1 + hw/dma/i8257.c | 1 + hw/dma/pl080.c | 1 + hw/dma/pl330.c | 1 + hw/dma/pxa2xx_dma.c | 1 + hw/dma/sparc32_dma.c | 1 + hw/dma/xilinx_axidma.c | 1 + hw/dma/xlnx-zdma.c | 1 + hw/gpio/imx_gpio.c | 1 + hw/gpio/max7310.c | 1 + hw/gpio/omap_gpio.c | 1 + hw/hyperv/hyperv_testdev.c | 1 - hw/i2c/core.c | 1 + hw/i2c/omap_i2c.c | 1 + hw/i2c/smbus_eeprom.c | 1 + hw/i386/intel_iommu.c | 1 + hw/i386/kvm/clock.c | 1 + hw/i386/kvm/ioapic.c | 1 + hw/i386/pc_q35.c | 1 + hw/i386/pc_sysfw.c | 1 + hw/i386/vmmouse.c | 2 +- hw/i386/vmport.c | 1 - hw/i386/x86-iommu.c | 1 + hw/i386/xen/xen_pvdevice.c | 1 + hw/ide/ahci.c | 1 + hw/ide/cmd646.c | 1 + hw/ide/isa.c | 1 + hw/ide/macio.c | 1 + hw/ide/mmio.c | 1 + hw/ide/qdev.c | 1 + hw/input/adb.c | 1 + hw/input/milkymist-softusb.c | 1 + hw/input/vhost-user-input.c | 1 - hw/input/virtio-input-hid.c | 2 +- hw/input/virtio-input-host.c | 2 +- hw/input/virtio-input.c | 2 +- hw/intc/apic_common.c | 2 +- hw/intc/arm_gic_common.c | 1 + hw/intc/arm_gicv2m.c | 1 + hw/intc/arm_gicv3_common.c | 1 + hw/intc/armv7m_nvic.c | 1 + hw/intc/etraxfs_pic.c | 1 + hw/intc/exynos4210_combiner.c | 1 + hw/intc/exynos4210_gic.c | 1 + hw/intc/grlib_irqmp.c | 1 + hw/intc/i8259_common.c | 1 + hw/intc/ioapic.c | 1 + hw/intc/mips_gic.c | 1 + hw/intc/omap_intc.c | 1 + hw/intc/ompic.c | 1 + hw/intc/openpic.c | 1 + hw/intc/pnv_xive.c | 1 + hw/intc/realview_gic.c | 1 + hw/intc/s390_flic.c | 2 +- hw/intc/spapr_xive.c | 1 + hw/intc/xics.c | 1 + hw/intc/xilinx_intc.c | 1 + hw/intc/xlnx-pmu-iomod-intc.c | 1 + hw/ipack/ipack.c | 1 + hw/ipmi/ipmi.c | 1 + hw/ipmi/ipmi_bmc_extern.c | 1 + hw/ipmi/ipmi_bmc_sim.c | 1 + hw/ipmi/isa_ipmi_bt.c | 1 + hw/ipmi/isa_ipmi_kcs.c | 1 + hw/isa/isa-superio.c | 1 + hw/isa/lpc_ich9.c | 1 + hw/isa/pc87312.c | 1 + hw/isa/vt82c686.c | 1 + hw/lm32/lm32.h | 1 + hw/lm32/milkymist-hw.h | 2 +- hw/lm32/milkymist.c | 1 + hw/mem/memory-device.c | 1 - hw/mem/nvdimm.c | 1 + hw/mem/pc-dimm.c | 1 + hw/microblaze/petalogix_ml605_mmu.c | 1 + hw/microblaze/xlnx-zynqmp-pmu.c | 1 - hw/mips/boston.c | 1 + hw/mips/cps.c | 1 + hw/misc/a9scu.c | 1 + hw/misc/applesmc.c | 1 + hw/misc/arm11scu.c | 1 + hw/misc/arm_l2x0.c | 1 + hw/misc/arm_sysctl.c | 1 + hw/misc/armsse-cpuid.c | 1 + hw/misc/bcm2835_property.c | 1 + hw/misc/debugexit.c | 1 + hw/misc/eccmemctl.c | 1 + hw/misc/iotkit-sysctl.c | 1 + hw/misc/iotkit-sysinfo.c | 1 + hw/misc/ivshmem.c | 1 + hw/misc/macio/cuda.c | 1 + hw/misc/macio/gpio.c | 1 + hw/misc/macio/macio.c | 1 + hw/misc/macio/pmu.c | 1 + hw/misc/mips_cmgcr.c | 1 + hw/misc/mips_cpc.c | 1 + hw/misc/mips_itu.c | 1 + hw/misc/mos6522.c | 1 + hw/misc/mps2-fpgaio.c | 1 + hw/misc/mps2-scc.c | 1 + hw/misc/msf2-sysreg.c | 1 + hw/misc/nrf51_rng.c | 1 + hw/misc/pc-testdev.c | 1 - hw/misc/pci-testdev.c | 1 + hw/misc/pvpanic.c | 1 + hw/misc/tz-mpc.c | 1 + hw/misc/tz-msc.c | 1 + hw/misc/tz-ppc.c | 1 + hw/net/allwinner_emac.c | 1 + hw/net/cadence_gem.c | 1 + hw/net/can/can_kvaser_pci.c | 1 + hw/net/can/can_mioe3680_pci.c | 1 + hw/net/can/can_pcm3680_pci.c | 1 + hw/net/dp8393x.c | 1 + hw/net/e1000.c | 1 + hw/net/e1000e.c | 1 + hw/net/eepro100.c | 1 + hw/net/fsl_etsec/etsec.c | 1 + hw/net/fsl_etsec/etsec.h | 1 - hw/net/ftgmac100.c | 1 + hw/net/imx_fec.c | 1 + hw/net/lan9118.c | 1 + hw/net/lance.c | 1 + hw/net/mcf_fec.c | 1 + hw/net/milkymist-minimac2.c | 1 + hw/net/mipsnet.c | 1 + hw/net/ne2000-isa.c | 1 - hw/net/ne2000-pci.c | 1 + hw/net/opencores_eth.c | 1 + hw/net/pcnet-pci.c | 1 + hw/net/pcnet.c | 2 +- hw/net/rocker/rocker.c | 1 + hw/net/rtl8139.c | 1 + hw/net/smc91c111.c | 1 + hw/net/spapr_llan.c | 2 +- hw/net/stellaris_enet.c | 1 + hw/net/sungem.c | 1 + hw/net/sunhme.c | 1 + hw/net/virtio-net.c | 1 + hw/net/vmxnet3.c | 1 + hw/net/xgmac.c | 1 + hw/net/xilinx_axienet.c | 2 ++ hw/net/xilinx_ethlite.c | 1 + hw/nios2/10m50_devboard.c | 1 + hw/nvram/ds1225y.c | 1 + hw/nvram/eeprom_at24c.c | 1 + hw/nvram/fw_cfg.c | 1 + hw/nvram/mac_nvram.c | 1 + hw/nvram/nrf51_nvm.c | 1 + hw/nvram/spapr_nvram.c | 1 + hw/openrisc/openrisc_sim.c | 1 + hw/pci-bridge/gen_pcie_root_port.c | 1 + hw/pci-bridge/pci_bridge_dev.c | 1 + hw/pci-bridge/pci_expander_bridge.c | 1 + hw/pci-bridge/pcie_pci_bridge.c | 1 + hw/pci-bridge/pcie_root_port.c | 1 + hw/pci-bridge/xio3130_downstream.c | 1 + hw/pci-host/designware.c | 1 + hw/pci-host/gpex.c | 1 + hw/pci-host/grackle.c | 1 + hw/pci-host/piix.c | 1 + hw/pci-host/ppce500.c | 1 + hw/pci-host/prep.c | 1 + hw/pci-host/q35.c | 1 + hw/pci-host/sabre.c | 1 + hw/pci-host/uninorth.c | 1 + hw/pci-host/versatile.c | 1 + hw/pci-host/xilinx-pcie.c | 1 + hw/pci/pci.c | 1 + hw/pci/pcie_port.c | 1 + hw/ppc/e500.c | 1 + hw/ppc/mac_newworld.c | 1 + hw/ppc/mac_oldworld.c | 1 + hw/ppc/pnv.c | 1 + hw/ppc/pnv_core.c | 1 + hw/ppc/pnv_psi.c | 1 + hw/ppc/ppc440_uc.c | 1 + hw/ppc/prep_systemio.c | 1 + hw/ppc/rs6000_mc.c | 1 + hw/ppc/sam460ex.c | 1 + hw/ppc/spapr.c | 1 + hw/ppc/spapr_cpu_core.c | 1 + hw/ppc/spapr_drc.c | 1 - hw/ppc/spapr_events.c | 1 - hw/ppc/spapr_iommu.c | 1 - hw/ppc/spapr_irq.c | 1 + hw/ppc/spapr_pci.c | 1 + hw/ppc/spapr_rng.c | 1 + hw/ppc/spapr_rtas.c | 1 - hw/ppc/virtex_ml507.c | 1 + hw/rdma/vmw/pvrdma_main.c | 1 - hw/riscv/riscv_hart.c | 1 + hw/riscv/sifive_clint.c | 1 + hw/riscv/sifive_plic.c | 1 + hw/riscv/sifive_prci.c | 1 + hw/riscv/sifive_test.c | 1 + hw/s390x/3270-ccw.c | 2 ++ hw/s390x/ap-device.c | 1 - hw/s390x/ccw-device.c | 1 + hw/s390x/css-bridge.c | 1 + hw/s390x/css.c | 2 +- hw/s390x/ipl.c | 1 + hw/s390x/ipl.h | 2 +- hw/s390x/s390-pci-bus.c | 1 + hw/s390x/s390-virtio-ccw.c | 1 + hw/s390x/sclpquiesce.c | 1 - hw/s390x/vhost-vsock-ccw.c | 1 + hw/s390x/virtio-ccw-9p.c | 1 + hw/s390x/virtio-ccw-balloon.c | 1 + hw/s390x/virtio-ccw-blk.c | 1 + hw/s390x/virtio-ccw-crypto.c | 1 + hw/s390x/virtio-ccw-gpu.c | 1 + hw/s390x/virtio-ccw-input.c | 1 + hw/s390x/virtio-ccw-net.c | 1 + hw/s390x/virtio-ccw-rng.c | 1 + hw/s390x/virtio-ccw-scsi.c | 1 + hw/s390x/virtio-ccw-serial.c | 1 + hw/scsi/megasas.c | 1 + hw/scsi/mptsas.c | 1 + hw/scsi/scsi-bus.c | 2 +- hw/scsi/scsi-disk.c | 1 + hw/scsi/scsi-generic.c | 1 + hw/scsi/spapr_vscsi.c | 2 +- hw/scsi/vhost-scsi.c | 1 + hw/scsi/vhost-user-scsi.c | 1 + hw/scsi/virtio-scsi.c | 1 + hw/scsi/vmw_pvscsi.c | 1 + hw/sd/milkymist-memcard.c | 1 + hw/sd/pxa2xx_mmci.c | 1 - hw/sd/sd.c | 1 - hw/sd/sdhci-internal.h | 1 + hw/sd/sdhci-pci.c | 1 + hw/sd/sdhci.c | 1 + hw/sd/ssi-sd.c | 1 + hw/sh4/r2d.c | 1 + hw/sparc/leon3.c | 1 + hw/sparc/sun4m.c | 1 + hw/sparc/sun4m_iommu.c | 1 + hw/sparc64/sun4u.c | 1 + hw/ssi/aspeed_smc.c | 1 + hw/ssi/xilinx_spi.c | 1 + hw/ssi/xilinx_spips.c | 1 + hw/timer/a9gtimer.c | 1 + hw/timer/allwinner-a10-pit.c | 1 + hw/timer/altera_timer.c | 1 + hw/timer/arm_mptimer.c | 1 + hw/timer/arm_timer.c | 2 +- hw/timer/cmsdk-apb-dualtimer.c | 1 + hw/timer/exynos4210_mct.c | 1 + hw/timer/grlib_gptimer.c | 1 + hw/timer/lm32_timer.c | 1 + hw/timer/m48t59-isa.c | 1 + hw/timer/m48t59.c | 1 + hw/timer/mc146818rtc.c | 1 + hw/timer/milkymist-sysctl.c | 1 + hw/timer/mss-timer.c | 1 + hw/timer/pl031.c | 1 + hw/timer/pxa2xx_timer.c | 1 + hw/timer/slavio_timer.c | 1 + hw/timer/stm32f2xx_timer.c | 1 + hw/timer/xilinx_timer.c | 1 + hw/tpm/tpm_crb.c | 2 -- hw/tpm/tpm_tis.c | 1 + hw/tpm/tpm_util.c | 2 +- hw/usb/bus.c | 2 +- hw/usb/ccid-card-emulated.c | 1 + hw/usb/ccid-card-passthru.c | 1 + hw/usb/ccid.h | 2 +- hw/usb/dev-audio.c | 1 + hw/usb/dev-hid.c | 1 + hw/usb/dev-hub.c | 1 + hw/usb/dev-mtp.c | 1 + hw/usb/dev-network.c | 1 + hw/usb/dev-serial.c | 1 + hw/usb/dev-smartcard-reader.c | 1 + hw/usb/dev-storage.c | 1 + hw/usb/dev-uas.c | 1 + hw/usb/hcd-ehci-pci.c | 1 + hw/usb/hcd-ehci-sysbus.c | 1 + hw/usb/hcd-ohci-pci.c | 1 + hw/usb/hcd-ohci.c | 1 + hw/usb/hcd-uhci.c | 1 + hw/usb/hcd-xhci-nec.c | 1 + hw/usb/hcd-xhci.c | 1 + hw/usb/host-libusb.c | 1 + hw/usb/redirect.c | 1 + hw/vfio/ap.c | 1 + hw/vfio/ccw.c | 1 + hw/vfio/pci-quirks.c | 1 + hw/vfio/pci.c | 1 + hw/vfio/platform.c | 1 + hw/virtio/vhost-scsi-pci.c | 1 + hw/virtio/vhost-user-blk-pci.c | 1 + hw/virtio/vhost-user-scsi-pci.c | 1 + hw/virtio/vhost-vsock-pci.c | 1 + hw/virtio/vhost-vsock.c | 1 + hw/virtio/virtio-9p-pci.c | 1 + hw/virtio/virtio-balloon-pci.c | 1 + hw/virtio/virtio-balloon.c | 1 + hw/virtio/virtio-blk-pci.c | 1 + hw/virtio/virtio-bus.c | 1 - hw/virtio/virtio-crypto-pci.c | 1 + hw/virtio/virtio-crypto.c | 2 +- hw/virtio/virtio-input-pci.c | 1 + hw/virtio/virtio-mmio.c | 1 + hw/virtio/virtio-net-pci.c | 1 + hw/virtio/virtio-pci.c | 1 + hw/virtio/virtio-pmem.c | 1 + hw/virtio/virtio-rng.c | 2 +- hw/virtio/virtio-scsi-pci.c | 1 + hw/virtio/virtio-serial-pci.c | 1 + hw/virtio/virtio.c | 1 + hw/watchdog/cmsdk-apb-watchdog.c | 1 + hw/watchdog/wdt_aspeed.c | 1 + hw/xen/xen-bus.c | 1 + hw/xen/xen-legacy-backend.c | 1 + hw/xen/xen_pt.c | 1 + hw/xtensa/xtfpga.c | 1 + include/hw/acpi/acpi_dev_interface.h | 1 + include/hw/acpi/vmgenid.h | 2 +- include/hw/audio/pcspk.h | 1 + include/hw/boards.h | 1 - include/hw/char/cadence_uart.h | 1 + include/hw/char/cmsdk-apb-uart.h | 1 + include/hw/char/lm32_juart.h | 2 +- include/hw/char/pl011.h | 1 + include/hw/char/xilinx_uartlite.h | 1 + include/hw/cpu/cluster.h | 2 +- include/hw/cpu/core.h | 2 +- include/hw/cris/etraxfs.h | 1 + include/hw/display/milkymist_tmu2.h | 2 +- include/hw/i2c/i2c.h | 2 +- include/hw/i386/intel_iommu.h | 2 +- include/hw/input/adb.h | 2 +- include/hw/ipack/ipack.h | 2 +- include/hw/ipmi/ipmi.h | 2 +- include/hw/isa/isa.h | 2 +- include/hw/mem/memory-device.h | 2 +- include/hw/mem/pc-dimm.h | 2 +- include/hw/misc/auxbus.h | 2 +- include/hw/misc/unimp.h | 1 + include/hw/misc/vmcoreinfo.h | 2 +- include/hw/net/ne2000-isa.h | 2 +- include/hw/pci/pci.h | 1 - include/hw/pcmcia.h | 2 +- include/hw/ppc/openpic.h | 1 - include/hw/ppc/spapr_cpu_core.h | 2 +- include/hw/ppc/spapr_drc.h | 2 +- include/hw/ppc/xics.h | 2 +- include/hw/ppc/xive.h | 1 - include/hw/qdev-dma.h | 1 + include/hw/qdev.h | 7 ------- include/hw/s390x/event-facility.h | 2 +- include/hw/s390x/sclp.h | 1 - include/hw/s390x/storage-attributes.h | 2 +- include/hw/s390x/storage-keys.h | 2 +- include/hw/s390x/tod.h | 2 +- include/hw/scsi/scsi.h | 2 +- include/hw/sd/sd.h | 2 +- include/hw/sparc/grlib.h | 1 - include/hw/ssi/ssi.h | 2 +- include/hw/sysbus.h | 2 +- include/hw/timer/cmsdk-apb-timer.h | 1 + include/hw/timer/i8254.h | 2 +- include/hw/usb.h | 2 +- include/hw/virtio/vhost-scsi-common.h | 1 - include/hw/virtio/vhost-scsi.h | 1 - include/hw/virtio/vhost-user-blk.h | 1 - include/hw/virtio/vhost-user-scsi.h | 1 - include/hw/virtio/virtio-bus.h | 2 +- include/hw/virtio/virtio-serial.h | 1 - include/hw/virtio/virtio.h | 2 +- include/hw/watchdog/wdt_diag288.h | 2 +- include/monitor/qdev.h | 2 -- include/sysemu/accel.h | 1 - memory.c | 1 - migration/migration.c | 1 + migration/migration.h | 2 +- net/net.c | 2 +- qdev-monitor.c | 1 - qom/qom-qmp-cmds.c | 2 +- qtest.c | 1 - target/tilegx/cpu.c | 1 - tests/test-qdev-global-props.c | 2 +- vl.c | 2 +- 497 files changed, 461 insertions(+), 117 deletions(-) delete mode 100644 include/hw/qdev.h diff --git a/backends/vhost-user.c b/backends/vhost-user.c index 2b055544a7..0a13506c98 100644 --- a/backends/vhost-user.c +++ b/backends/vhost-user.c @@ -12,7 +12,6 @@ #include "qemu/osdep.h" -#include "hw/qdev.h" #include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qemu/error-report.h" diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c index a3288cbe56..b5a7c03f26 100644 --- a/hw/9pfs/virtio-9p-device.c +++ b/hw/9pfs/virtio-9p-device.c @@ -17,6 +17,7 @@ #include "virtio-9p.h" #include "fsdev/qemu-fsdev.h" #include "coth.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio-access.h" #include "qemu/iov.h" #include "qemu/module.h" diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index ec47a9143b..3ff35a49e4 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -25,6 +25,7 @@ #include "hw/isa/apm.h" #include "hw/i2c/pm_smbus.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "hw/acpi/acpi.h" #include "sysemu/reset.h" #include "sysemu/sysemu.h" diff --git a/hw/acpi/vmgenid.c b/hw/acpi/vmgenid.c index 1e38e21cb7..4eae426969 100644 --- a/hw/acpi/vmgenid.c +++ b/hw/acpi/vmgenid.c @@ -18,6 +18,7 @@ #include "hw/acpi/aml-build.h" #include "hw/acpi/vmgenid.h" #include "hw/nvram/fw_cfg.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "sysemu/reset.h" #include "sysemu/sysemu.h" diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c index 4b2d8b6574..7a3c48f002 100644 --- a/hw/arm/armv7m.c +++ b/hw/arm/armv7m.c @@ -14,6 +14,7 @@ #include "hw/sysbus.h" #include "hw/arm/boot.h" #include "hw/loader.h" +#include "hw/qdev-properties.h" #include "elf.h" #include "sysemu/qtest.h" #include "sysemu/reset.h" diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index 843b708247..7a2e885e0b 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -20,6 +20,7 @@ #include "hw/i2c/smbus_eeprom.h" #include "hw/misc/pca9552.h" #include "hw/misc/tmp105.h" +#include "hw/qdev-properties.h" #include "qemu/log.h" #include "sysemu/block-backend.h" #include "sysemu/sysemu.h" diff --git a/hw/arm/digic.c b/hw/arm/digic.c index 9015b60c23..4f52465875 100644 --- a/hw/arm/digic.c +++ b/hw/arm/digic.c @@ -24,6 +24,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/arm/digic.h" +#include "hw/qdev-properties.h" #include "sysemu/sysemu.h" #define DIGIC4_TIMER_BASE(n) (0xc0210000 + (n) * 0x100) diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c index 9aa5ec3f5d..0e403f3e78 100644 --- a/hw/arm/exynos4210.c +++ b/hw/arm/exynos4210.c @@ -32,6 +32,7 @@ #include "hw/sysbus.h" #include "hw/arm/boot.h" #include "hw/loader.h" +#include "hw/qdev-properties.h" #include "hw/arm/exynos4210.h" #include "hw/sd/sdhci.h" #include "hw/usb/hcd-ehci.h" diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c index 7624e16084..f69358a5ba 100644 --- a/hw/arm/exynos4_boards.c +++ b/hw/arm/exynos4_boards.c @@ -33,6 +33,7 @@ #include "exec/address-spaces.h" #include "hw/arm/exynos4210.h" #include "hw/net/lan9118.h" +#include "hw/qdev-properties.h" #include "hw/boards.h" #include "hw/irq.h" diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c index 869ee89b15..098e84c84d 100644 --- a/hw/arm/fsl-imx25.c +++ b/hw/arm/fsl-imx25.c @@ -29,6 +29,7 @@ #include "sysemu/sysemu.h" #include "exec/address-spaces.h" #include "hw/boards.h" +#include "hw/qdev-properties.h" #include "chardev/char.h" static void fsl_imx25_init(Object *obj) diff --git a/hw/arm/fsl-imx31.c b/hw/arm/fsl-imx31.c index 662fe78f1b..093ad40984 100644 --- a/hw/arm/fsl-imx31.c +++ b/hw/arm/fsl-imx31.c @@ -26,6 +26,7 @@ #include "sysemu/sysemu.h" #include "exec/address-spaces.h" #include "hw/boards.h" +#include "hw/qdev-properties.h" #include "chardev/char.h" static void fsl_imx31_init(Object *obj) diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c index de45833097..8c397ef04b 100644 --- a/hw/arm/fsl-imx6.c +++ b/hw/arm/fsl-imx6.c @@ -23,6 +23,7 @@ #include "qapi/error.h" #include "hw/arm/fsl-imx6.h" #include "hw/boards.h" +#include "hw/qdev-properties.h" #include "sysemu/sysemu.h" #include "chardev/char.h" #include "qemu/error-report.h" diff --git a/hw/arm/mcimx6ul-evk.c b/hw/arm/mcimx6ul-evk.c index bbffb11c2a..e5209cea2a 100644 --- a/hw/arm/mcimx6ul-evk.c +++ b/hw/arm/mcimx6ul-evk.c @@ -14,6 +14,7 @@ #include "qapi/error.h" #include "hw/arm/fsl-imx6ul.h" #include "hw/boards.h" +#include "hw/qdev-properties.h" #include "sysemu/sysemu.h" #include "qemu/error-report.h" #include "sysemu/qtest.h" diff --git a/hw/arm/mcimx7d-sabre.c b/hw/arm/mcimx7d-sabre.c index 72eab03a0c..97b8bb788a 100644 --- a/hw/arm/mcimx7d-sabre.c +++ b/hw/arm/mcimx7d-sabre.c @@ -16,6 +16,7 @@ #include "qapi/error.h" #include "hw/arm/fsl-imx7.h" #include "hw/boards.h" +#include "hw/qdev-properties.h" #include "sysemu/sysemu.h" #include "qemu/error-report.h" #include "sysemu/qtest.h" diff --git a/hw/arm/microbit.c b/hw/arm/microbit.c index e9a891f7d3..ef213695bd 100644 --- a/hw/arm/microbit.c +++ b/hw/arm/microbit.c @@ -17,6 +17,7 @@ #include "hw/arm/nrf51_soc.h" #include "hw/i2c/microbit_i2c.h" +#include "hw/qdev-properties.h" typedef struct { MachineState parent; diff --git a/hw/arm/msf2-som.c b/hw/arm/msf2-som.c index 2c9984bb3b..dbd35b6def 100644 --- a/hw/arm/msf2-som.c +++ b/hw/arm/msf2-som.c @@ -27,6 +27,7 @@ #include "qapi/error.h" #include "qemu/error-report.h" #include "hw/boards.h" +#include "hw/qdev-properties.h" #include "hw/arm/boot.h" #include "exec/address-spaces.h" #include "hw/arm/msf2-soc.h" diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index a3cfdc3077..92fbe74d74 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -22,6 +22,7 @@ #include "hw/hw.h" #include "qemu/timer.h" #include "hw/ptimer.h" +#include "hw/qdev-properties.h" #include "hw/block/flash.h" #include "ui/console.h" #include "hw/i2c/i2c.h" diff --git a/hw/arm/netduino2.c b/hw/arm/netduino2.c index f57fc38f92..e770d9cac8 100644 --- a/hw/arm/netduino2.c +++ b/hw/arm/netduino2.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/boards.h" +#include "hw/qdev-properties.h" #include "qemu/error-report.h" #include "hw/arm/stm32f205_soc.h" #include "hw/arm/boot.h" diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c index 3f3eca52e2..af99ff4522 100644 --- a/hw/arm/nseries.c +++ b/hw/arm/nseries.c @@ -35,6 +35,7 @@ #include "hw/input/tsc2xxx.h" #include "hw/misc/cbus.h" #include "hw/misc/tmp105.h" +#include "hw/qdev-properties.h" #include "hw/block/flash.h" #include "hw/hw.h" #include "hw/bt.h" diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c index ce9247118e..19fca4159a 100644 --- a/hw/arm/omap1.c +++ b/hw/arm/omap1.c @@ -26,6 +26,7 @@ #include "hw/boards.h" #include "hw/hw.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/arm/boot.h" #include "hw/arm/omap.h" #include "sysemu/sysemu.h" diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c index af5e3d0ba7..dccb5707f8 100644 --- a/hw/arm/omap2.c +++ b/hw/arm/omap2.c @@ -26,6 +26,7 @@ #include "sysemu/reset.h" #include "hw/boards.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/arm/boot.h" #include "hw/arm/omap.h" #include "sysemu/sysemu.h" diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c index 4e99c30e11..cdafde2f76 100644 --- a/hw/arm/pxa2xx.c +++ b/hw/arm/pxa2xx.c @@ -20,6 +20,7 @@ #include "hw/char/serial.h" #include "hw/i2c/i2c.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/ssi/ssi.h" #include "chardev/char-fe.h" #include "sysemu/blockdev.h" diff --git a/hw/arm/pxa2xx_gpio.c b/hw/arm/pxa2xx_gpio.c index aa2c89dcf9..86a0e86c4c 100644 --- a/hw/arm/pxa2xx_gpio.c +++ b/hw/arm/pxa2xx_gpio.c @@ -11,6 +11,7 @@ #include "cpu.h" #include "hw/hw.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "hw/arm/pxa.h" diff --git a/hw/arm/sabrelite.c b/hw/arm/sabrelite.c index 934f4c9261..a6185c169e 100644 --- a/hw/arm/sabrelite.c +++ b/hw/arm/sabrelite.c @@ -14,6 +14,7 @@ #include "qapi/error.h" #include "hw/arm/fsl-imx6.h" #include "hw/boards.h" +#include "hw/qdev-properties.h" #include "sysemu/sysemu.h" #include "qemu/error-report.h" #include "sysemu/qtest.h" diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index 9c67d5c6f9..2a0e2ed1d0 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -36,6 +36,7 @@ #include "hw/intc/arm_gicv3_common.h" #include "hw/loader.h" #include "hw/pci-host/gpex.h" +#include "hw/qdev-properties.h" #include "hw/usb.h" #include "net/net.h" diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c index 2eabb9c814..ee010c48b2 100644 --- a/hw/arm/spitz.c +++ b/hw/arm/spitz.c @@ -16,6 +16,7 @@ #include "hw/arm/boot.h" #include "sysemu/sysemu.h" #include "hw/pcmcia.h" +#include "hw/qdev-properties.h" #include "hw/i2c/i2c.h" #include "hw/irq.h" #include "hw/ssi/ssi.h" diff --git a/hw/arm/stm32f205_soc.c b/hw/arm/stm32f205_soc.c index c08041a1c5..be8b7df679 100644 --- a/hw/arm/stm32f205_soc.c +++ b/hw/arm/stm32f205_soc.c @@ -28,6 +28,7 @@ #include "hw/arm/boot.h" #include "exec/address-spaces.h" #include "hw/arm/stm32f205_soc.h" +#include "hw/qdev-properties.h" /* At the moment only Timer 2 to 5 are modelled */ static const uint32_t timer_addr[STM_NUM_TIMERS] = { 0x40000000, 0x40000400, diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c index ca377df9e3..dc65d88a65 100644 --- a/hw/arm/strongarm.c +++ b/hw/arm/strongarm.c @@ -32,6 +32,7 @@ #include "cpu.h" #include "hw/boards.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "strongarm.h" diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 0e5152ed3b..e9fddec058 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -54,6 +54,7 @@ #include "hw/pci-host/gpex.h" #include "hw/arm/sysbus-fdt.h" #include "hw/platform-bus.h" +#include "hw/qdev-properties.h" #include "hw/arm/fdt.h" #include "hw/intc/arm_gic.h" #include "hw/intc/arm_gicv3_common.h" diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c index 9af584fb12..115ee51c7c 100644 --- a/hw/audio/ac97.c +++ b/hw/audio/ac97.c @@ -21,6 +21,7 @@ #include "hw/audio/soundhw.h" #include "audio/audio.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "sysemu/dma.h" diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c index 62e59ccee6..2f4aacbf43 100644 --- a/hw/audio/adlib.c +++ b/hw/audio/adlib.c @@ -28,6 +28,7 @@ #include "hw/audio/soundhw.h" #include "audio/audio.h" #include "hw/isa/isa.h" +#include "hw/qdev-properties.h" //#define DEBUG diff --git a/hw/audio/cs4231a.c b/hw/audio/cs4231a.c index 383200e1e2..d77a4e713e 100644 --- a/hw/audio/cs4231a.c +++ b/hw/audio/cs4231a.c @@ -27,7 +27,7 @@ #include "audio/audio.h" #include "hw/irq.h" #include "hw/isa/isa.h" -#include "hw/qdev.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "qemu/timer.h" diff --git a/hw/audio/gus.c b/hw/audio/gus.c index 787e04774a..dbfe7cf634 100644 --- a/hw/audio/gus.c +++ b/hw/audio/gus.c @@ -29,6 +29,7 @@ #include "audio/audio.h" #include "hw/irq.h" #include "hw/isa/isa.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "gusemu.h" #include "gustate.h" diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c index 4c33c477e1..4fee0673d9 100644 --- a/hw/audio/hda-codec.c +++ b/hw/audio/hda-codec.c @@ -19,6 +19,7 @@ #include "qemu/osdep.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "intel-hda.h" #include "migration/vmstate.h" #include "qemu/module.h" diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c index 5a1fcded55..6ecd383540 100644 --- a/hw/audio/intel-hda.c +++ b/hw/audio/intel-hda.c @@ -19,6 +19,7 @@ #include "qemu/osdep.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "hw/pci/msi.h" #include "qemu/timer.h" #include "qemu/bitops.h" diff --git a/hw/audio/intel-hda.h b/hw/audio/intel-hda.h index 53b78da4df..eee6fee5af 100644 --- a/hw/audio/intel-hda.h +++ b/hw/audio/intel-hda.h @@ -1,7 +1,7 @@ #ifndef HW_INTEL_HDA_H #define HW_INTEL_HDA_H -#include "hw/qdev.h" +#include "hw/qdev-core.h" /* --------------------------------------------------------------------- */ /* hda bus */ diff --git a/hw/audio/marvell_88w8618.c b/hw/audio/marvell_88w8618.c index 158a456a41..883ef74c8b 100644 --- a/hw/audio/marvell_88w8618.c +++ b/hw/audio/marvell_88w8618.c @@ -14,6 +14,7 @@ #include "hw/sysbus.h" #include "migration/vmstate.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/audio/wm8750.h" #include "audio/audio.h" #include "qapi/error.h" diff --git a/hw/audio/pl041.c b/hw/audio/pl041.c index 3c371397de..ca91399078 100644 --- a/hw/audio/pl041.c +++ b/hw/audio/pl041.c @@ -22,6 +22,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/audio/sb16.c b/hw/audio/sb16.c index 818659546f..3ad01f3599 100644 --- a/hw/audio/sb16.c +++ b/hw/audio/sb16.c @@ -27,7 +27,7 @@ #include "audio/audio.h" #include "hw/irq.h" #include "hw/isa/isa.h" -#include "hw/qdev.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/timer.h" #include "qemu/host-utils.h" diff --git a/hw/block/fdc.c b/hw/block/fdc.c index c11247ccdd..ced459da34 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -34,6 +34,7 @@ #include "qemu/timer.h" #include "hw/irq.h" #include "hw/isa/isa.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "hw/block/block.h" diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index c213e2ed7b..47159de3a4 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "sysemu/block-backend.h" +#include "hw/qdev-properties.h" #include "hw/ssi/ssi.h" #include "migration/vmstate.h" #include "qemu/bitops.h" diff --git a/hw/block/nand.c b/hw/block/nand.c index 4a0d4677c3..e396004315 100644 --- a/hw/block/nand.c +++ b/hw/block/nand.c @@ -20,9 +20,9 @@ #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/qdev-properties.h" #include "hw/block/flash.h" #include "sysemu/block-backend.h" -#include "hw/qdev.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/error-report.h" diff --git a/hw/block/nvme.c b/hw/block/nvme.c index e08853fe5e..12d8254250 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -30,6 +30,7 @@ #include "hw/block/block.h" #include "hw/pci/msix.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "sysemu/sysemu.h" #include "qapi/error.h" diff --git a/hw/block/onenand.c b/hw/block/onenand.c index 18123f0499..fcc5a69b90 100644 --- a/hw/block/onenand.c +++ b/hw/block/onenand.c @@ -23,6 +23,7 @@ #include "hw/hw.h" #include "hw/block/flash.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "sysemu/block-backend.h" #include "exec/memory.h" #include "hw/sysbus.h" diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index 17920790ec..a406e75242 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -39,6 +39,7 @@ #include "qemu/osdep.h" #include "hw/block/block.h" #include "hw/block/flash.h" +#include "hw/qdev-properties.h" #include "sysemu/block-backend.h" #include "qapi/error.h" #include "qemu/timer.h" diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index e9f7e499b1..ba8ed5076d 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -35,6 +35,7 @@ #include "qemu/osdep.h" #include "hw/block/block.h" #include "hw/block/flash.h" +#include "hw/qdev-properties.h" #include "qapi/error.h" #include "qemu/bitmap.h" #include "qemu/timer.h" diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c index 85bc4017e7..7b44cca6d9 100644 --- a/hw/block/vhost-user-blk.c +++ b/hw/block/vhost-user-blk.c @@ -22,6 +22,7 @@ #include "qemu/cutils.h" #include "qom/object.h" #include "hw/qdev-core.h" +#include "hw/qdev-properties.h" #include "hw/virtio/vhost.h" #include "hw/virtio/vhost-user-blk.h" #include "hw/virtio/virtio.h" diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index 1f40834d27..8cc2a232e0 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -18,6 +18,7 @@ #include "qemu/error-report.h" #include "trace.h" #include "hw/block/block.h" +#include "hw/qdev-properties.h" #include "sysemu/blockdev.h" #include "hw/virtio/virtio-blk.h" #include "dataplane/virtio-blk.h" diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c index aef39536ac..f77343db60 100644 --- a/hw/block/xen-block.c +++ b/hw/block/xen-block.c @@ -20,6 +20,7 @@ #include "qapi/qmp/qstring.h" #include "hw/xen/xen_common.h" #include "hw/block/xen_blkif.h" +#include "hw/qdev-properties.h" #include "hw/xen/xen-block.h" #include "hw/xen/xen-backend.h" #include "sysemu/blockdev.h" diff --git a/hw/char/bcm2835_aux.c b/hw/char/bcm2835_aux.c index 45fc34d92d..3f855196e3 100644 --- a/hw/char/bcm2835_aux.c +++ b/hw/char/bcm2835_aux.c @@ -23,6 +23,7 @@ #include "qemu/osdep.h" #include "hw/char/bcm2835_aux.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/char/debugcon.c b/hw/char/debugcon.c index b38d82891f..5c592e091b 100644 --- a/hw/char/debugcon.c +++ b/hw/char/debugcon.c @@ -29,6 +29,7 @@ #include "qemu/module.h" #include "chardev/char-fe.h" #include "hw/isa/isa.h" +#include "hw/qdev-properties.h" #define TYPE_ISA_DEBUGCON_DEVICE "isa-debugcon" #define ISA_DEBUGCON_DEVICE(obj) \ diff --git a/hw/char/digic-uart.c b/hw/char/digic-uart.c index cc501678ce..974a2619dd 100644 --- a/hw/char/digic-uart.c +++ b/hw/char/digic-uart.c @@ -34,6 +34,7 @@ #include "qemu/module.h" #include "hw/char/digic-uart.h" +#include "hw/qdev-properties.h" enum { ST_RX_RDY = (1 << 0), diff --git a/hw/char/escc.c b/hw/char/escc.c index 35c6952bbd..e185522e27 100644 --- a/hw/char/escc.c +++ b/hw/char/escc.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "qemu/module.h" diff --git a/hw/char/etraxfs_ser.c b/hw/char/etraxfs_ser.c index e93f31c76a..15ac12ef22 100644 --- a/hw/char/etraxfs_ser.c +++ b/hw/char/etraxfs_ser.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "chardev/char-fe.h" #include "qemu/log.h" diff --git a/hw/char/exynos4210_uart.c b/hw/char/exynos4210_uart.c index 9bd826b33d..49e279d5df 100644 --- a/hw/char/exynos4210_uart.c +++ b/hw/char/exynos4210_uart.c @@ -30,6 +30,7 @@ #include "hw/arm/exynos4210.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #undef DEBUG_UART #undef DEBUG_UART_EXTEND diff --git a/hw/char/grlib_apbuart.c b/hw/char/grlib_apbuart.c index 13013e8a1c..fe3cbf41a3 100644 --- a/hw/char/grlib_apbuart.c +++ b/hw/char/grlib_apbuart.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/sparc/grlib.h" #include "hw/sysbus.h" #include "qemu/module.h" diff --git a/hw/char/imx_serial.c b/hw/char/imx_serial.c index bf3f07d760..e49baa994c 100644 --- a/hw/char/imx_serial.c +++ b/hw/char/imx_serial.c @@ -21,6 +21,7 @@ #include "qemu/osdep.h" #include "hw/char/imx_serial.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "sysemu/sysemu.h" #include "qemu/log.h" diff --git a/hw/char/ipoctal232.c b/hw/char/ipoctal232.c index 1171dc20cf..66c163ba26 100644 --- a/hw/char/ipoctal232.c +++ b/hw/char/ipoctal232.c @@ -11,6 +11,7 @@ #include "qemu/osdep.h" #include "hw/ipack/ipack.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/bitops.h" #include "qemu/module.h" diff --git a/hw/char/lm32_juart.c b/hw/char/lm32_juart.c index 69dd7ac72b..e0b1bd6555 100644 --- a/hw/char/lm32_juart.c +++ b/hw/char/lm32_juart.c @@ -25,6 +25,7 @@ #include "chardev/char-fe.h" #include "hw/char/lm32_juart.h" +#include "hw/qdev-properties.h" enum { LM32_JUART_MIN_SAVE_VERSION = 0, diff --git a/hw/char/lm32_uart.c b/hw/char/lm32_uart.c index 00832fba86..32f29c44cf 100644 --- a/hw/char/lm32_uart.c +++ b/hw/char/lm32_uart.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "trace.h" diff --git a/hw/char/mcf_uart.c b/hw/char/mcf_uart.c index 1712b2296e..58323baf43 100644 --- a/hw/char/mcf_uart.c +++ b/hw/char/mcf_uart.c @@ -11,6 +11,7 @@ #include "hw/sysbus.h" #include "qemu/module.h" #include "hw/m68k/mcf.h" +#include "hw/qdev-properties.h" #include "chardev/char-fe.h" typedef struct { diff --git a/hw/char/milkymist-uart.c b/hw/char/milkymist-uart.c index e90f84d53e..c358ca07f3 100644 --- a/hw/char/milkymist-uart.c +++ b/hw/char/milkymist-uart.c @@ -23,6 +23,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "trace.h" diff --git a/hw/char/nrf51_uart.c b/hw/char/nrf51_uart.c index bb886f12aa..2777afe366 100644 --- a/hw/char/nrf51_uart.c +++ b/hw/char/nrf51_uart.c @@ -17,6 +17,7 @@ #include "qemu/module.h" #include "hw/char/nrf51_uart.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "trace.h" diff --git a/hw/char/parallel-isa.c b/hw/char/parallel-isa.c index a043832e72..bcc577f61c 100644 --- a/hw/char/parallel-isa.c +++ b/hw/char/parallel-isa.c @@ -8,9 +8,11 @@ * * SPDX-License-Identifier: MIT */ + #include "qemu/osdep.h" #include "sysemu/sysemu.h" #include "hw/isa/isa.h" +#include "hw/qdev-properties.h" #include "hw/char/parallel.h" static void parallel_init(ISABus *bus, int index, Chardev *chr) diff --git a/hw/char/parallel.c b/hw/char/parallel.c index 3980eb5909..40174eeda1 100644 --- a/hw/char/parallel.c +++ b/hw/char/parallel.c @@ -30,6 +30,7 @@ #include "chardev/char-fe.h" #include "hw/irq.h" #include "hw/isa/isa.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "hw/char/parallel.h" #include "sysemu/reset.h" diff --git a/hw/char/sclpconsole-lm.c b/hw/char/sclpconsole-lm.c index d904265cda..392606259d 100644 --- a/hw/char/sclpconsole-lm.c +++ b/hw/char/sclpconsole-lm.c @@ -14,7 +14,6 @@ */ #include "qemu/osdep.h" -#include "hw/qdev.h" #include "qemu/thread.h" #include "qemu/error-report.h" #include "qemu/module.h" @@ -23,6 +22,7 @@ #include "hw/s390x/sclp.h" #include "migration/vmstate.h" #include "hw/s390x/event-facility.h" +#include "hw/qdev-properties.h" #include "hw/s390x/ebcdic.h" #define SIZE_BUFFER 4096 diff --git a/hw/char/sclpconsole.c b/hw/char/sclpconsole.c index f3669766bf..da126f0133 100644 --- a/hw/char/sclpconsole.c +++ b/hw/char/sclpconsole.c @@ -13,13 +13,13 @@ */ #include "qemu/osdep.h" -#include "hw/qdev.h" #include "qemu/thread.h" #include "qemu/error-report.h" #include "qemu/module.h" #include "hw/s390x/sclp.h" #include "migration/vmstate.h" +#include "hw/qdev-properties.h" #include "hw/s390x/event-facility.h" #include "chardev/char-fe.h" diff --git a/hw/char/serial-isa.c b/hw/char/serial-isa.c index d3080b76e4..5a0ae02ee7 100644 --- a/hw/char/serial-isa.c +++ b/hw/char/serial-isa.c @@ -28,6 +28,7 @@ #include "qemu/module.h" #include "hw/char/serial.h" #include "hw/isa/isa.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #define ISA_SERIAL(obj) OBJECT_CHECK(ISASerialState, (obj), TYPE_ISA_SERIAL) diff --git a/hw/char/serial-pci-multi.c b/hw/char/serial-pci-multi.c index 867e7840b4..5f13b5663b 100644 --- a/hw/char/serial-pci-multi.c +++ b/hw/char/serial-pci-multi.c @@ -32,6 +32,7 @@ #include "hw/char/serial.h" #include "hw/irq.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #define PCI_SERIAL_MAX_PORTS 4 diff --git a/hw/char/serial-pci.c b/hw/char/serial-pci.c index ee537890c2..cb9b76e22b 100644 --- a/hw/char/serial-pci.c +++ b/hw/char/serial-pci.c @@ -31,6 +31,7 @@ #include "hw/char/serial.h" #include "hw/irq.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" typedef struct PCISerialState { diff --git a/hw/char/spapr_vty.c b/hw/char/spapr_vty.c index b3995a9e0c..7f860fcce7 100644 --- a/hw/char/spapr_vty.c +++ b/hw/char/spapr_vty.c @@ -3,12 +3,12 @@ #include "qemu/module.h" #include "qapi/error.h" #include "cpu.h" -#include "hw/qdev.h" #include "migration/vmstate.h" #include "chardev/char-fe.h" #include "hw/irq.h" #include "hw/ppc/spapr.h" #include "hw/ppc/spapr_vio.h" +#include "hw/qdev-properties.h" #define VTERM_BUFSIZE 16 diff --git a/hw/char/stm32f2xx_usart.c b/hw/char/stm32f2xx_usart.c index f43eb74fb1..4ec843de38 100644 --- a/hw/char/stm32f2xx_usart.c +++ b/hw/char/stm32f2xx_usart.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/char/stm32f2xx_usart.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/char/terminal3270.c b/hw/char/terminal3270.c index 3785886c25..6859c1bcb2 100644 --- a/hw/char/terminal3270.c +++ b/hw/char/terminal3270.c @@ -15,6 +15,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "chardev/char-fe.h" +#include "hw/qdev-properties.h" #include "hw/s390x/3270-ccw.h" /* Enough spaces for different window sizes. */ diff --git a/hw/char/virtio-console.c b/hw/char/virtio-console.c index 1bbeb00fae..c13649f1ef 100644 --- a/hw/char/virtio-console.c +++ b/hw/char/virtio-console.c @@ -15,6 +15,7 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "trace.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio-serial.h" #include "qapi/error.h" #include "qapi/qapi-events-char.h" diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c index 272cfb6049..4e0ed829ae 100644 --- a/hw/char/virtio-serial-bus.c +++ b/hw/char/virtio-serial-bus.c @@ -27,6 +27,7 @@ #include "monitor/monitor.h" #include "qemu/error-report.h" #include "qemu/queue.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "trace.h" #include "hw/virtio/virtio-serial.h" diff --git a/hw/char/xilinx_uartlite.c b/hw/char/xilinx_uartlite.c index fa7451fd67..2c47275068 100644 --- a/hw/char/xilinx_uartlite.c +++ b/hw/char/xilinx_uartlite.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "qemu/module.h" #include "chardev/char-fe.h" diff --git a/hw/core/bus.c b/hw/core/bus.c index 17bc1edcde..7f3d2a3dbd 100644 --- a/hw/core/bus.c +++ b/hw/core/bus.c @@ -18,9 +18,9 @@ */ #include "qemu/osdep.h" +#include "hw/qdev-properties.h" #include "qemu/ctype.h" #include "qemu/module.h" -#include "hw/qdev.h" #include "qapi/error.h" void qbus_set_hotplug_handler(BusState *bus, Object *handler, Error **errp) diff --git a/hw/core/generic-loader.c b/hw/core/generic-loader.c index 579fe5ed32..06d8d6466e 100644 --- a/hw/core/generic-loader.c +++ b/hw/core/generic-loader.c @@ -36,6 +36,7 @@ #include "sysemu/dma.h" #include "sysemu/reset.h" #include "hw/loader.h" +#include "hw/qdev-properties.h" #include "qapi/error.h" #include "qemu/module.h" #include "hw/core/generic-loader.h" diff --git a/hw/core/or-irq.c b/hw/core/or-irq.c index 02949dae1a..18d63831cd 100644 --- a/hw/core/or-irq.c +++ b/hw/core/or-irq.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" #include "hw/or-irq.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/module.h" diff --git a/hw/core/platform-bus.c b/hw/core/platform-bus.c index 5fecb29239..9c9a9c271f 100644 --- a/hw/core/platform-bus.c +++ b/hw/core/platform-bus.c @@ -21,6 +21,7 @@ #include "qemu/osdep.h" #include "hw/platform-bus.h" +#include "hw/qdev-properties.h" #include "qemu/error-report.h" #include "qemu/module.h" #include "sysemu/sysemu.h" diff --git a/hw/core/qdev-fw.c b/hw/core/qdev-fw.c index aa35e9d0ac..a31958355f 100644 --- a/hw/core/qdev-fw.c +++ b/hw/core/qdev-fw.c @@ -16,8 +16,8 @@ */ #include "qemu/osdep.h" -#include "hw/qdev.h" #include "hw/fw-path-provider.h" +#include "hw/qdev-core.h" const char *qdev_fw_name(DeviceState *dev) { diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c index ba412dd2ca..fceab9afd5 100644 --- a/hw/core/qdev-properties-system.c +++ b/hw/core/qdev-properties-system.c @@ -12,7 +12,7 @@ #include "qemu/osdep.h" #include "net/net.h" -#include "hw/qdev.h" +#include "hw/qdev-properties.h" #include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "sysemu/block-backend.h" diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index 8510ad14b0..ac28890e5a 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -1,6 +1,6 @@ #include "qemu/osdep.h" #include "net/net.h" -#include "hw/qdev.h" +#include "hw/qdev-properties.h" #include "qapi/error.h" #include "hw/pci/pci.h" #include "qapi/qapi-types-block.h" diff --git a/hw/core/qdev.c b/hw/core/qdev.c index b1fe40d20d..8c055df1cb 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -26,7 +26,6 @@ this API directly. */ #include "qemu/osdep.h" -#include "hw/qdev.h" #include "sysemu/sysemu.h" #include "qapi/error.h" #include "qapi/qapi-events-qdev.h" @@ -36,6 +35,7 @@ #include "qemu/option.h" #include "hw/hotplug.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/boards.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/core/register.c b/hw/core/register.c index bb5ab9d479..3c77396587 100644 --- a/hw/core/register.c +++ b/hw/core/register.c @@ -17,7 +17,6 @@ #include "qemu/osdep.h" #include "hw/register.h" -#include "hw/qdev.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/core/split-irq.c b/hw/core/split-irq.c index 6808e812b5..b5acc669fb 100644 --- a/hw/core/split-irq.c +++ b/hw/core/split-irq.c @@ -26,6 +26,7 @@ #include "qemu/osdep.h" #include "hw/core/split-irq.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/core/vm-change-state-handler.c b/hw/core/vm-change-state-handler.c index f814813bdd..e27ea45977 100644 --- a/hw/core/vm-change-state-handler.c +++ b/hw/core/vm-change-state-handler.c @@ -16,7 +16,7 @@ */ #include "qemu/osdep.h" -#include "hw/qdev.h" +#include "hw/qdev-core.h" static int qdev_get_dev_tree_depth(DeviceState *dev) { diff --git a/hw/cpu/a15mpcore.c b/hw/cpu/a15mpcore.c index fc19ed0214..7e9983aa19 100644 --- a/hw/cpu/a15mpcore.c +++ b/hw/cpu/a15mpcore.c @@ -23,6 +23,7 @@ #include "qemu/module.h" #include "hw/cpu/a15mpcore.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "sysemu/kvm.h" #include "kvm_arm.h" diff --git a/hw/cpu/a9mpcore.c b/hw/cpu/a9mpcore.c index 9dda4d8888..cd1e165faf 100644 --- a/hw/cpu/a9mpcore.c +++ b/hw/cpu/a9mpcore.c @@ -13,6 +13,7 @@ #include "qemu/module.h" #include "hw/cpu/a9mpcore.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "qom/cpu.h" static void a9mp_priv_set_irq(void *opaque, int irq, int level) diff --git a/hw/cpu/arm11mpcore.c b/hw/cpu/arm11mpcore.c index c611a6ff32..e78f5d080c 100644 --- a/hw/cpu/arm11mpcore.c +++ b/hw/cpu/arm11mpcore.c @@ -13,6 +13,7 @@ #include "hw/cpu/arm11mpcore.h" #include "hw/intc/realview_gic.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" static void mpcore_priv_set_irq(void *opaque, int irq, int level) diff --git a/hw/cpu/cluster.c b/hw/cpu/cluster.c index 6f5f037b3c..74d8d43c00 100644 --- a/hw/cpu/cluster.c +++ b/hw/cpu/cluster.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "hw/cpu/cluster.h" +#include "hw/qdev-properties.h" #include "qom/cpu.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/cpu/realview_mpcore.c b/hw/cpu/realview_mpcore.c index 34da446d94..ae2c9913f6 100644 --- a/hw/cpu/realview_mpcore.c +++ b/hw/cpu/realview_mpcore.c @@ -14,6 +14,7 @@ #include "hw/cpu/arm11mpcore.h" #include "hw/intc/realview_gic.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #define TYPE_REALVIEW_MPCORE_RIRQ "realview_mpcore" #define REALVIEW_MPCORE_RIRQ(obj) \ diff --git a/hw/display/ati.c b/hw/display/ati.c index df978a420d..35f49a591b 100644 --- a/hw/display/ati.c +++ b/hw/display/ati.c @@ -19,6 +19,7 @@ #include "qemu/osdep.h" #include "ati_int.h" #include "ati_regs.h" +#include "hw/qdev-properties.h" #include "vga_regs.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/display/bcm2835_fb.c b/hw/display/bcm2835_fb.c index e606893f28..8f856878cd 100644 --- a/hw/display/bcm2835_fb.c +++ b/hw/display/bcm2835_fb.c @@ -31,6 +31,7 @@ #include "framebuffer.h" #include "ui/pixel_ops.h" #include "hw/misc/bcm2835_mbox_defs.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/display/bochs-display.c b/hw/display/bochs-display.c index 0a535de40c..01ee814ffa 100644 --- a/hw/display/bochs-display.c +++ b/hw/display/bochs-display.c @@ -9,6 +9,7 @@ #include "qemu/module.h" #include "qemu/units.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "hw/display/bochs-vbe.h" #include "hw/display/edid.h" diff --git a/hw/display/cg3.c b/hw/display/cg3.c index 29a8735a38..f90baae4de 100644 --- a/hw/display/cg3.c +++ b/hw/display/cg3.c @@ -32,6 +32,7 @@ #include "migration/vmstate.h" #include "hw/irq.h" #include "hw/loader.h" +#include "hw/qdev-properties.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c index 0f5465bc14..cd283e53b4 100644 --- a/hw/display/cirrus_vga.c +++ b/hw/display/cirrus_vga.c @@ -39,6 +39,7 @@ #include "qapi/error.h" #include "trace.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "ui/pixel_ops.h" #include "cirrus_vga_internal.h" diff --git a/hw/display/cirrus_vga_isa.c b/hw/display/cirrus_vga_isa.c index 49f409b638..7ef8e59224 100644 --- a/hw/display/cirrus_vga_isa.c +++ b/hw/display/cirrus_vga_isa.c @@ -27,6 +27,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/loader.h" +#include "hw/qdev-properties.h" #include "hw/isa/isa.h" #include "cirrus_vga_internal.h" diff --git a/hw/display/g364fb.c b/hw/display/g364fb.c index 1757b777e2..839d26eca1 100644 --- a/hw/display/g364fb.c +++ b/hw/display/g364fb.c @@ -21,6 +21,7 @@ #include "qemu/units.h" #include "hw/hw.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "qemu/error-report.h" #include "qemu/module.h" #include "ui/console.h" diff --git a/hw/display/i2c-ddc.c b/hw/display/i2c-ddc.c index 3ac85216a5..fc70b7930c 100644 --- a/hw/display/i2c-ddc.c +++ b/hw/display/i2c-ddc.c @@ -20,6 +20,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/i2c/i2c.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "hw/display/i2c-ddc.h" diff --git a/hw/display/milkymist-vgafb.c b/hw/display/milkymist-vgafb.c index 9a9a481ebd..8b0da4660a 100644 --- a/hw/display/milkymist-vgafb.c +++ b/hw/display/milkymist-vgafb.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "trace.h" #include "ui/console.h" diff --git a/hw/display/qxl.c b/hw/display/qxl.c index 539ede12c0..971c2d0568 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -29,6 +29,7 @@ #include "qemu/main-loop.h" #include "qemu/module.h" #include "sysemu/sysemu.h" +#include "hw/qdev-properties.h" #include "migration/blocker.h" #include "migration/vmstate.h" #include "trace.h" diff --git a/hw/display/ramfb-standalone.c b/hw/display/ramfb-standalone.c index 56215ef88c..ebd623a669 100644 --- a/hw/display/ramfb-standalone.c +++ b/hw/display/ramfb-standalone.c @@ -2,6 +2,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/loader.h" +#include "hw/qdev-properties.h" #include "hw/isa/isa.h" #include "hw/display/ramfb.h" #include "ui/console.h" diff --git a/hw/display/sm501.c b/hw/display/sm501.c index 603396358d..d9e5762e36 100644 --- a/hw/display/sm501.c +++ b/hw/display/sm501.c @@ -34,6 +34,7 @@ #include "hw/sysbus.h" #include "migration/vmstate.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "hw/i2c/i2c.h" #include "hw/display/i2c-ddc.h" #include "qemu/range.h" diff --git a/hw/display/tcx.c b/hw/display/tcx.c index f9b1ae56ec..14e829d3fa 100644 --- a/hw/display/tcx.c +++ b/hw/display/tcx.c @@ -28,6 +28,7 @@ #include "ui/console.h" #include "ui/pixel_ops.h" #include "hw/loader.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "qemu/error-report.h" diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c index 189a4afc15..873e5e9706 100644 --- a/hw/display/vga-isa.c +++ b/hw/display/vga-isa.c @@ -31,6 +31,7 @@ #include "qemu/module.h" #include "qemu/timer.h" #include "hw/loader.h" +#include "hw/qdev-properties.h" #define TYPE_ISA_VGA "isa-vga" #define ISA_VGA(obj) OBJECT_CHECK(ISAVGAState, (obj), TYPE_ISA_VGA) diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c index 86299f5e97..a27b88122d 100644 --- a/hw/display/vga-pci.c +++ b/hw/display/vga-pci.c @@ -26,6 +26,7 @@ #include "qemu/osdep.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "vga_int.h" #include "ui/pixel_ops.h" diff --git a/hw/display/vhost-user-gpu.c b/hw/display/vhost-user-gpu.c index 7181d9cdba..279877886e 100644 --- a/hw/display/vhost-user-gpu.c +++ b/hw/display/vhost-user-gpu.c @@ -11,6 +11,7 @@ */ #include "qemu/osdep.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio-gpu.h" #include "chardev/char-fe.h" #include "qapi/error.h" diff --git a/hw/display/virtio-gpu-pci.c b/hw/display/virtio-gpu-pci.c index d6f01b4a98..566ec8bd77 100644 --- a/hw/display/virtio-gpu-pci.c +++ b/hw/display/virtio-gpu-pci.c @@ -15,6 +15,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-gpu-pci.h" diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index ed92071963..6de9689a30 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -24,6 +24,7 @@ #include "hw/virtio/virtio-gpu-pixman.h" #include "hw/virtio/virtio-bus.h" #include "hw/display/edid.h" +#include "hw/qdev-properties.h" #include "qemu/log.h" #include "qemu/module.h" #include "qapi/error.h" diff --git a/hw/display/virtio-vga.c b/hw/display/virtio-vga.c index 55e6a9085c..d3059a70ba 100644 --- a/hw/display/virtio-vga.c +++ b/hw/display/virtio-vga.c @@ -1,5 +1,6 @@ #include "qemu/osdep.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio-gpu.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c index f0b136eb16..23dc8910cc 100644 --- a/hw/display/vmware_vga.c +++ b/hw/display/vmware_vga.c @@ -30,6 +30,7 @@ #include "trace.h" #include "ui/vnc.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #undef VERBOSE diff --git a/hw/dma/i82374.c b/hw/dma/i82374.c index 3f0db4a021..b788b3681a 100644 --- a/hw/dma/i82374.c +++ b/hw/dma/i82374.c @@ -26,6 +26,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/isa/isa.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "hw/dma/i8257.h" diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c index c626bd958a..792f617eb4 100644 --- a/hw/dma/i8257.c +++ b/hw/dma/i8257.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "hw/isa/isa.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "hw/dma/i8257.h" #include "qemu/main-loop.h" diff --git a/hw/dma/pl080.c b/hw/dma/pl080.c index 3713d5dadd..52ba23f4bf 100644 --- a/hw/dma/pl080.c +++ b/hw/dma/pl080.c @@ -16,6 +16,7 @@ #include "hw/dma/pl080.h" #include "hw/hw.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "qapi/error.h" #define PL080_CONF_E 0x1 diff --git a/hw/dma/pl330.c b/hw/dma/pl330.c index 2ee440905f..338aec9f22 100644 --- a/hw/dma/pl330.c +++ b/hw/dma/pl330.c @@ -17,6 +17,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "qapi/error.h" diff --git a/hw/dma/pxa2xx_dma.c b/hw/dma/pxa2xx_dma.c index 1124051730..18e7a0b694 100644 --- a/hw/dma/pxa2xx_dma.c +++ b/hw/dma/pxa2xx_dma.c @@ -11,6 +11,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/arm/pxa.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/dma/sparc32_dma.c b/hw/dma/sparc32_dma.c index 16d53b92dd..0e5bbcdc7f 100644 --- a/hw/dma/sparc32_dma.c +++ b/hw/dma/sparc32_dma.c @@ -27,6 +27,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/sparc/sparc32_dma.h" #include "hw/sparc/sun4m_iommu.h" #include "hw/sysbus.h" diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c index 2c2d567a95..d176df6d44 100644 --- a/hw/dma/xilinx_axidma.c +++ b/hw/dma/xilinx_axidma.c @@ -29,6 +29,7 @@ #include "hw/hw.h" #include "hw/irq.h" #include "hw/ptimer.h" +#include "hw/qdev-properties.h" #include "qemu/log.h" #include "qemu/main-loop.h" #include "qemu/module.h" diff --git a/hw/dma/xlnx-zdma.c b/hw/dma/xlnx-zdma.c index 2dbdfc5739..75b660988f 100644 --- a/hw/dma/xlnx-zdma.c +++ b/hw/dma/xlnx-zdma.c @@ -29,6 +29,7 @@ #include "qemu/osdep.h" #include "hw/dma/xlnx-zdma.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/bitops.h" #include "qemu/log.h" diff --git a/hw/gpio/imx_gpio.c b/hw/gpio/imx_gpio.c index 8792fb5ad4..ac8304ec56 100644 --- a/hw/gpio/imx_gpio.c +++ b/hw/gpio/imx_gpio.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "hw/gpio/imx_gpio.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/gpio/max7310.c b/hw/gpio/max7310.c index 87b0f24747..bebb4030d2 100644 --- a/hw/gpio/max7310.c +++ b/hw/gpio/max7310.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/i2c/i2c.h" +#include "hw/hw.h" #include "hw/irq.h" #include "migration/vmstate.h" #include "qemu/module.h" diff --git a/hw/gpio/omap_gpio.c b/hw/gpio/omap_gpio.c index 46a721779c..41e1aa798c 100644 --- a/hw/gpio/omap_gpio.c +++ b/hw/gpio/omap_gpio.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/arm/omap.h" #include "hw/sysbus.h" #include "qemu/error-report.h" diff --git a/hw/hyperv/hyperv_testdev.c b/hw/hyperv/hyperv_testdev.c index 0d343a8bc0..88a5a63782 100644 --- a/hw/hyperv/hyperv_testdev.c +++ b/hw/hyperv/hyperv_testdev.c @@ -15,7 +15,6 @@ #include "qemu/main-loop.h" #include "qemu/module.h" #include "qemu/queue.h" -#include "hw/qdev.h" #include "hw/isa/isa.h" #include "hw/hyperv/hyperv.h" diff --git a/hw/i2c/core.c b/hw/i2c/core.c index 25b792fdd0..92cd489069 100644 --- a/hw/i2c/core.c +++ b/hw/i2c/core.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "hw/i2c/i2c.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "trace.h" diff --git a/hw/i2c/omap_i2c.c b/hw/i2c/omap_i2c.c index 34f34e3b05..3ba965a58f 100644 --- a/hw/i2c/omap_i2c.c +++ b/hw/i2c/omap_i2c.c @@ -22,6 +22,7 @@ #include "qemu/module.h" #include "hw/i2c/i2c.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/arm/omap.h" #include "hw/sysbus.h" #include "qemu/error-report.h" diff --git a/hw/i2c/smbus_eeprom.c b/hw/i2c/smbus_eeprom.c index 8642f0036d..54c86a0112 100644 --- a/hw/i2c/smbus_eeprom.c +++ b/hw/i2c/smbus_eeprom.c @@ -28,6 +28,7 @@ #include "hw/boards.h" #include "hw/i2c/i2c.h" #include "hw/i2c/smbus_slave.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "hw/i2c/smbus_eeprom.h" diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index 50fe5cc1a9..75ca6f9c70 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -28,6 +28,7 @@ #include "intel_iommu_internal.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bus.h" +#include "hw/qdev-properties.h" #include "hw/i386/pc.h" #include "hw/i386/apic-msidef.h" #include "hw/boards.h" diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c index d98cf9d5d1..d6a5325f0b 100644 --- a/hw/i386/kvm/clock.c +++ b/hw/i386/kvm/clock.c @@ -24,6 +24,7 @@ #include "migration/vmstate.h" #include "hw/sysbus.h" #include "hw/kvm/clock.h" +#include "hw/qdev-properties.h" #include "qapi/error.h" #include diff --git a/hw/i386/kvm/ioapic.c b/hw/i386/kvm/ioapic.c index 99ef530967..f94729c565 100644 --- a/hw/i386/kvm/ioapic.c +++ b/hw/i386/kvm/ioapic.c @@ -14,6 +14,7 @@ #include "monitor/monitor.h" #include "hw/i386/pc.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/i386/ioapic_internal.h" #include "hw/i386/apic_internal.h" #include "sysemu/kvm.h" diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 060b47f845..8777c9618b 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -40,6 +40,7 @@ #include "kvm_i386.h" #include "hw/kvm/clock.h" #include "hw/pci-host/q35.h" +#include "hw/qdev-properties.h" #include "exec/address-spaces.h" #include "hw/i386/pc.h" #include "hw/i386/ich9.h" diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c index defea37fe4..235928452b 100644 --- a/hw/i386/pc_sysfw.c +++ b/hw/i386/pc_sysfw.c @@ -34,6 +34,7 @@ #include "hw/i386/pc.h" #include "hw/boards.h" #include "hw/loader.h" +#include "hw/qdev-properties.h" #include "sysemu/sysemu.h" #include "hw/block/flash.h" #include "sysemu/kvm.h" diff --git a/hw/i386/vmmouse.c b/hw/i386/vmmouse.c index 4f81504577..012ab90396 100644 --- a/hw/i386/vmmouse.c +++ b/hw/i386/vmmouse.c @@ -26,7 +26,7 @@ #include "ui/console.h" #include "hw/i386/pc.h" #include "hw/input/i8042.h" -#include "hw/qdev.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" /* debug only vmmouse */ diff --git a/hw/i386/vmport.c b/hw/i386/vmport.c index 26fcbe3827..1f31e27c8a 100644 --- a/hw/i386/vmport.c +++ b/hw/i386/vmport.c @@ -26,7 +26,6 @@ #include "hw/i386/pc.h" #include "hw/input/i8042.h" #include "sysemu/hw_accel.h" -#include "hw/qdev.h" #include "qemu/log.h" #include "trace.h" diff --git a/hw/i386/x86-iommu.c b/hw/i386/x86-iommu.c index d1534c1ae0..1eaf2dd1bc 100644 --- a/hw/i386/x86-iommu.c +++ b/hw/i386/x86-iommu.c @@ -21,6 +21,7 @@ #include "hw/sysbus.h" #include "hw/boards.h" #include "hw/i386/x86-iommu.h" +#include "hw/qdev-properties.h" #include "hw/i386/pc.h" #include "qapi/error.h" #include "qemu/error-report.h" diff --git a/hw/i386/xen/xen_pvdevice.c b/hw/i386/xen/xen_pvdevice.c index 10c89cda41..27f646da06 100644 --- a/hw/i386/xen/xen_pvdevice.c +++ b/hw/i386/xen/xen_pvdevice.c @@ -33,6 +33,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "trace.h" diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 378c1f360f..d72da85605 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "hw/pci/msi.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/error-report.h" diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index c2ee427f56..3fbfc5ea45 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "hw/isa/isa.h" diff --git a/hw/ide/isa.c b/hw/ide/isa.c index 939b473dad..7b6e283679 100644 --- a/hw/ide/isa.c +++ b/hw/ide/isa.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/isa/isa.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "sysemu/dma.h" diff --git a/hw/ide/macio.c b/hw/ide/macio.c index 44f2ff92bb..79f787c539 100644 --- a/hw/ide/macio.c +++ b/hw/ide/macio.c @@ -26,6 +26,7 @@ #include "qemu/osdep.h" #include "hw/ppc/mac.h" #include "hw/ppc/mac_dbdma.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "hw/misc/macio/macio.h" diff --git a/hw/ide/mmio.c b/hw/ide/mmio.c index d2a377f326..7149a9cba6 100644 --- a/hw/ide/mmio.c +++ b/hw/ide/mmio.c @@ -30,6 +30,7 @@ #include "sysemu/dma.h" #include "hw/ide/internal.h" +#include "hw/qdev-properties.h" /***********************************************************/ /* MMIO based ide port diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c index d30bdd70ee..39957dd39f 100644 --- a/hw/ide/qdev.c +++ b/hw/ide/qdev.c @@ -25,6 +25,7 @@ #include "qemu/main-loop.h" #include "qemu/module.h" #include "hw/ide/internal.h" +#include "hw/qdev-properties.h" #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" #include "hw/block/block.h" diff --git a/hw/input/adb.c b/hw/input/adb.c index 80ba1259bf..478a90fae2 100644 --- a/hw/input/adb.c +++ b/hw/input/adb.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "hw/input/adb.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "adb-internal.h" diff --git a/hw/input/milkymist-softusb.c b/hw/input/milkymist-softusb.c index 8f6fdf2d97..67fcb3595f 100644 --- a/hw/input/milkymist-softusb.c +++ b/hw/input/milkymist-softusb.c @@ -29,6 +29,7 @@ #include "ui/console.h" #include "hw/input/hid.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "qemu/error-report.h" #include "qemu/module.h" diff --git a/hw/input/vhost-user-input.c b/hw/input/vhost-user-input.c index 6da497b1a8..544452a234 100644 --- a/hw/input/vhost-user-input.c +++ b/hw/input/vhost-user-input.c @@ -9,7 +9,6 @@ #include "qapi/error.h" #include "qemu-common.h" -#include "hw/qdev.h" #include "hw/virtio/virtio-input.h" static int vhost_input_config_change(struct vhost_dev *dev) diff --git a/hw/input/virtio-input-hid.c b/hw/input/virtio-input-hid.c index f15a063fac..386a363a17 100644 --- a/hw/input/virtio-input-hid.c +++ b/hw/input/virtio-input-hid.c @@ -8,8 +8,8 @@ #include "qemu/iov.h" #include "qemu/module.h" -#include "hw/qdev.h" #include "hw/virtio/virtio.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio-input.h" #undef CONFIG_CURSES diff --git a/hw/input/virtio-input-host.c b/hw/input/virtio-input-host.c index a54c31eb09..1c3b12ba32 100644 --- a/hw/input/virtio-input-host.c +++ b/hw/input/virtio-input-host.c @@ -9,8 +9,8 @@ #include "qemu/module.h" #include "qemu/sockets.h" -#include "hw/qdev.h" #include "hw/virtio/virtio.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio-input.h" #include diff --git a/hw/input/virtio-input.c b/hw/input/virtio-input.c index 9946394cf4..51617a5885 100644 --- a/hw/input/virtio-input.c +++ b/hw/input/virtio-input.c @@ -10,8 +10,8 @@ #include "qemu/module.h" #include "trace.h" -#include "hw/qdev.h" #include "hw/virtio/virtio.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio-input.h" #include "standard-headers/linux/input.h" diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c index fbb6e25cf4..aafd8e0e33 100644 --- a/hw/intc/apic_common.c +++ b/hw/intc/apic_common.c @@ -29,7 +29,7 @@ #include "trace.h" #include "sysemu/hax.h" #include "sysemu/kvm.h" -#include "hw/qdev.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "migration/qemu-file-types.h" #include "migration/vmstate.h" diff --git a/hw/intc/arm_gic_common.c b/hw/intc/arm_gic_common.c index 5d506bebb5..f0d0d7c467 100644 --- a/hw/intc/arm_gic_common.c +++ b/hw/intc/arm_gic_common.c @@ -23,6 +23,7 @@ #include "qemu/module.h" #include "gic_internal.h" #include "hw/arm/linux-boot-if.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" static int gic_pre_save(void *opaque) diff --git a/hw/intc/arm_gicv2m.c b/hw/intc/arm_gicv2m.c index 2c96d4fba0..6e45f4ff39 100644 --- a/hw/intc/arm_gicv2m.c +++ b/hw/intc/arm_gicv2m.c @@ -30,6 +30,7 @@ #include "hw/sysbus.h" #include "hw/irq.h" #include "hw/pci/msi.h" +#include "hw/qdev-properties.h" #include "sysemu/kvm.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/intc/arm_gicv3_common.c b/hw/intc/arm_gicv3_common.c index 12479f94a8..8f5f4c8e94 100644 --- a/hw/intc/arm_gicv3_common.c +++ b/hw/intc/arm_gicv3_common.c @@ -26,6 +26,7 @@ #include "qemu/module.h" #include "qom/cpu.h" #include "hw/intc/arm_gicv3_common.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "gicv3_internal.h" #include "hw/arm/linux-boot-if.h" diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c index 0c7fc7078b..62ab8b7273 100644 --- a/hw/intc/armv7m_nvic.c +++ b/hw/intc/armv7m_nvic.c @@ -18,6 +18,7 @@ #include "qemu/timer.h" #include "hw/intc/armv7m_nvic.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "target/arm/cpu.h" #include "exec/exec-all.h" #include "qemu/log.h" diff --git a/hw/intc/etraxfs_pic.c b/hw/intc/etraxfs_pic.c index 88d3b0c36f..77f652acec 100644 --- a/hw/intc/etraxfs_pic.c +++ b/hw/intc/etraxfs_pic.c @@ -26,6 +26,7 @@ #include "hw/sysbus.h" #include "qemu/module.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" //#include "pc.h" //#include "etraxfs.h" diff --git a/hw/intc/exynos4210_combiner.c b/hw/intc/exynos4210_combiner.c index 833e164350..5b33ca6628 100644 --- a/hw/intc/exynos4210_combiner.c +++ b/hw/intc/exynos4210_combiner.c @@ -35,6 +35,7 @@ #include "hw/arm/exynos4210.h" #include "hw/hw.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" //#define DEBUG_COMBINER diff --git a/hw/intc/exynos4210_gic.c b/hw/intc/exynos4210_gic.c index 7fa4583b0f..a1b699b6ba 100644 --- a/hw/intc/exynos4210_gic.c +++ b/hw/intc/exynos4210_gic.c @@ -25,6 +25,7 @@ #include "migration/vmstate.h" #include "qemu/module.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/arm/exynos4210.h" enum ExtGicId { diff --git a/hw/intc/grlib_irqmp.c b/hw/intc/grlib_irqmp.c index 21c77a5ec1..bc78e1a14f 100644 --- a/hw/intc/grlib_irqmp.c +++ b/hw/intc/grlib_irqmp.c @@ -28,6 +28,7 @@ #include "hw/sysbus.h" #include "cpu.h" +#include "hw/qdev-properties.h" #include "hw/sparc/grlib.h" #include "trace.h" diff --git a/hw/intc/i8259_common.c b/hw/intc/i8259_common.c index c7ff2b3274..bd37bb5e68 100644 --- a/hw/intc/i8259_common.c +++ b/hw/intc/i8259_common.c @@ -26,6 +26,7 @@ #include "qemu/osdep.h" #include "hw/i386/pc.h" #include "hw/isa/i8259_internal.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "monitor/monitor.h" diff --git a/hw/intc/ioapic.c b/hw/intc/ioapic.c index c9cbb11f9c..f89677174a 100644 --- a/hw/intc/ioapic.c +++ b/hw/intc/ioapic.c @@ -28,6 +28,7 @@ #include "hw/i386/ioapic.h" #include "hw/i386/ioapic_internal.h" #include "hw/pci/msi.h" +#include "hw/qdev-properties.h" #include "sysemu/kvm.h" #include "hw/i386/apic-msidef.h" #include "hw/i386/x86-iommu.h" diff --git a/hw/intc/mips_gic.c b/hw/intc/mips_gic.c index 6b4322bc5c..524cc3ca45 100644 --- a/hw/intc/mips_gic.c +++ b/hw/intc/mips_gic.c @@ -21,6 +21,7 @@ #include "kvm_mips.h" #include "hw/intc/mips_gic.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" static void mips_gic_set_vp_irq(MIPSGICState *gic, int vp, int pin) { diff --git a/hw/intc/omap_intc.c b/hw/intc/omap_intc.c index f740578e7e..854b709ca0 100644 --- a/hw/intc/omap_intc.c +++ b/hw/intc/omap_intc.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/arm/omap.h" #include "hw/sysbus.h" #include "qemu/error-report.h" diff --git a/hw/intc/ompic.c b/hw/intc/ompic.c index 8a4a422142..ca9614fda1 100644 --- a/hw/intc/ompic.c +++ b/hw/intc/ompic.c @@ -11,6 +11,7 @@ #include "qemu/module.h" #include "qapi/error.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "exec/memory.h" diff --git a/hw/intc/openpic.c b/hw/intc/openpic.c index 312ac54c7c..c797ba78f3 100644 --- a/hw/intc/openpic.c +++ b/hw/intc/openpic.c @@ -40,6 +40,7 @@ #include "hw/pci/pci.h" #include "hw/ppc/openpic.h" #include "hw/ppc/ppc_e500.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "hw/pci/msi.h" diff --git a/hw/intc/pnv_xive.c b/hw/intc/pnv_xive.c index 63b0f461ec..a8caf258fd 100644 --- a/hw/intc/pnv_xive.c +++ b/hw/intc/pnv_xive.c @@ -22,6 +22,7 @@ #include "hw/ppc/pnv_xscom.h" #include "hw/ppc/pnv_xive.h" #include "hw/ppc/xive_regs.h" +#include "hw/qdev-properties.h" #include "hw/ppc/ppc.h" #include diff --git a/hw/intc/realview_gic.c b/hw/intc/realview_gic.c index ac22a2abde..73fe8cd815 100644 --- a/hw/intc/realview_gic.c +++ b/hw/intc/realview_gic.c @@ -12,6 +12,7 @@ #include "qemu/module.h" #include "hw/intc/realview_gic.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" static void realview_gic_set_irq(void *opaque, int irq, int level) { diff --git a/hw/intc/s390_flic.c b/hw/intc/s390_flic.c index a1b28e755f..a159c0c7cf 100644 --- a/hw/intc/s390_flic.c +++ b/hw/intc/s390_flic.c @@ -17,10 +17,10 @@ #include "hw/sysbus.h" #include "hw/s390x/ioinst.h" #include "hw/s390x/s390_flic.h" +#include "hw/qdev-properties.h" #include "hw/s390x/css.h" #include "trace.h" #include "cpu.h" -#include "hw/qdev.h" #include "qapi/error.h" #include "hw/s390x/s390-virtio-ccw.h" diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c index 2fdd68035a..aad981cb78 100644 --- a/hw/intc/spapr_xive.c +++ b/hw/intc/spapr_xive.c @@ -23,6 +23,7 @@ #include "hw/ppc/spapr_xive.h" #include "hw/ppc/xive.h" #include "hw/ppc/xive_regs.h" +#include "hw/qdev-properties.h" /* * XIVE Virtualization Controller BAR and Thread Managment BAR that we diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 88709d4b90..b2fca2975c 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -31,6 +31,7 @@ #include "trace.h" #include "qemu/timer.h" #include "hw/ppc/xics.h" +#include "hw/qdev-properties.h" #include "qemu/error-report.h" #include "qemu/module.h" #include "qapi/visitor.h" diff --git a/hw/intc/xilinx_intc.c b/hw/intc/xilinx_intc.c index 3a5c7f82f4..e15cb42b36 100644 --- a/hw/intc/xilinx_intc.c +++ b/hw/intc/xilinx_intc.c @@ -26,6 +26,7 @@ #include "hw/sysbus.h" #include "qemu/module.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #define D(x) diff --git a/hw/intc/xlnx-pmu-iomod-intc.c b/hw/intc/xlnx-pmu-iomod-intc.c index f2ba9b4ada..f9a1401a94 100644 --- a/hw/intc/xlnx-pmu-iomod-intc.c +++ b/hw/intc/xlnx-pmu-iomod-intc.c @@ -33,6 +33,7 @@ #include "qemu/module.h" #include "hw/intc/xlnx-pmu-iomod-intc.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #ifndef XLNX_PMU_IO_INTC_ERR_DEBUG #define XLNX_PMU_IO_INTC_ERR_DEBUG 0 diff --git a/hw/ipack/ipack.c b/hw/ipack/ipack.c index 9a520806d7..30e16696c0 100644 --- a/hw/ipack/ipack.c +++ b/hw/ipack/ipack.c @@ -13,6 +13,7 @@ #include "qemu/module.h" #include "hw/ipack/ipack.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" IPackDevice *ipack_device_find(IPackBus *bus, int32_t slot) diff --git a/hw/ipmi/ipmi.c b/hw/ipmi/ipmi.c index 2090c6f73a..ff05a889ec 100644 --- a/hw/ipmi/ipmi.c +++ b/hw/ipmi/ipmi.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "hw/ipmi/ipmi.h" +#include "hw/qdev-properties.h" #include "sysemu/sysemu.h" #include "qom/object_interfaces.h" #include "qapi/error.h" diff --git a/hw/ipmi/ipmi_bmc_extern.c b/hw/ipmi/ipmi_bmc_extern.c index eb2eba891c..4405aa634e 100644 --- a/hw/ipmi/ipmi_bmc_extern.c +++ b/hw/ipmi/ipmi_bmc_extern.c @@ -35,6 +35,7 @@ #include "chardev/char-fe.h" #include "sysemu/sysemu.h" #include "hw/ipmi/ipmi.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #define VM_MSG_CHAR 0xA0 /* Marks end of message */ diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c index 91e1484103..246a6d390c 100644 --- a/hw/ipmi/ipmi_bmc_sim.c +++ b/hw/ipmi/ipmi_bmc_sim.c @@ -29,6 +29,7 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "hw/loader.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #define IPMI_NETFN_CHASSIS 0x00 diff --git a/hw/ipmi/isa_ipmi_bt.c b/hw/ipmi/isa_ipmi_bt.c index 33c800acb5..a696096cbb 100644 --- a/hw/ipmi/isa_ipmi_bt.c +++ b/hw/ipmi/isa_ipmi_bt.c @@ -29,6 +29,7 @@ #include "hw/ipmi/ipmi.h" #include "hw/irq.h" #include "hw/isa/isa.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" /* Control register */ diff --git a/hw/ipmi/isa_ipmi_kcs.c b/hw/ipmi/isa_ipmi_kcs.c index 9a1de662ba..374b2a0709 100644 --- a/hw/ipmi/isa_ipmi_kcs.c +++ b/hw/ipmi/isa_ipmi_kcs.c @@ -29,6 +29,7 @@ #include "hw/ipmi/ipmi.h" #include "hw/irq.h" #include "hw/isa/isa.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #define IPMI_KCS_OBF_BIT 0 diff --git a/hw/isa/isa-superio.c b/hw/isa/isa-superio.c index 4c73c2100f..c4e391916c 100644 --- a/hw/isa/isa-superio.c +++ b/hw/isa/isa-superio.c @@ -18,6 +18,7 @@ #include "sysemu/blockdev.h" #include "chardev/char.h" #include "hw/isa/superio.h" +#include "hw/qdev-properties.h" #include "hw/input/i8042.h" #include "hw/char/serial.h" #include "trace.h" diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c index a037c21104..41452f36b8 100644 --- a/hw/isa/lpc_ich9.c +++ b/hw/isa/lpc_ich9.c @@ -45,6 +45,7 @@ #include "hw/acpi/acpi.h" #include "hw/acpi/ich9.h" #include "hw/pci/pci_bus.h" +#include "hw/qdev-properties.h" #include "exec/address-spaces.h" #include "sysemu/sysemu.h" #include "qom/cpu.h" diff --git a/hw/isa/pc87312.c b/hw/isa/pc87312.c index 60845f3ff0..b9bd57471e 100644 --- a/hw/isa/pc87312.c +++ b/hw/isa/pc87312.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/isa/pc87312.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/error-report.h" diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 7379d90cf4..1bc915405b 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -14,6 +14,7 @@ #include "hw/isa/vt82c686.h" #include "hw/i2c/i2c.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "hw/isa/isa.h" #include "hw/isa/superio.h" #include "hw/sysbus.h" diff --git a/hw/lm32/lm32.h b/hw/lm32/lm32.h index d1514a61b3..98de07acf2 100644 --- a/hw/lm32/lm32.h +++ b/hw/lm32/lm32.h @@ -2,6 +2,7 @@ #define HW_LM32_H #include "hw/char/lm32_juart.h" +#include "hw/qdev-properties.h" static inline DeviceState *lm32_pic_init(qemu_irq cpu_irq) { diff --git a/hw/lm32/milkymist-hw.h b/hw/lm32/milkymist-hw.h index 976cf9254d..5f63024355 100644 --- a/hw/lm32/milkymist-hw.h +++ b/hw/lm32/milkymist-hw.h @@ -1,7 +1,7 @@ #ifndef QEMU_HW_MILKYMIST_HW_H #define QEMU_HW_MILKYMIST_HW_H -#include "hw/qdev.h" +#include "hw/qdev-core.h" #include "net/net.h" static inline DeviceState *milkymist_uart_create(hwaddr base, diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c index 5ec3ae0300..460d322de5 100644 --- a/hw/lm32/milkymist.c +++ b/hw/lm32/milkymist.c @@ -30,6 +30,7 @@ #include "sysemu/reset.h" #include "hw/boards.h" #include "hw/loader.h" +#include "hw/qdev-properties.h" #include "elf.h" #include "milkymist-hw.h" #include "hw/display/milkymist_tmu2.h" diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c index 5f2c408036..53953fdc3a 100644 --- a/hw/mem/memory-device.c +++ b/hw/mem/memory-device.c @@ -11,7 +11,6 @@ #include "qemu/osdep.h" #include "hw/mem/memory-device.h" -#include "hw/qdev.h" #include "qapi/error.h" #include "hw/boards.h" #include "qemu/range.h" diff --git a/hw/mem/nvdimm.c b/hw/mem/nvdimm.c index f438abb387..6fefd65092 100644 --- a/hw/mem/nvdimm.c +++ b/hw/mem/nvdimm.c @@ -28,6 +28,7 @@ #include "qapi/error.h" #include "qapi/visitor.h" #include "hw/mem/nvdimm.h" +#include "hw/qdev-properties.h" #include "hw/mem/memory-device.h" static void nvdimm_get_label_size(Object *obj, Visitor *v, const char *name, diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index 178f4a0df3..0c83dcd61e 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "hw/mem/pc-dimm.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "hw/mem/nvdimm.h" #include "hw/mem/memory-device.h" diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c index 03f6c1cc7c..09486bc8bf 100644 --- a/hw/microblaze/petalogix_ml605_mmu.c +++ b/hw/microblaze/petalogix_ml605_mmu.c @@ -35,6 +35,7 @@ #include "sysemu/sysemu.h" #include "hw/boards.h" #include "hw/char/serial.h" +#include "hw/qdev-properties.h" #include "exec/address-spaces.h" #include "hw/ssi/ssi.h" diff --git a/hw/microblaze/xlnx-zynqmp-pmu.c b/hw/microblaze/xlnx-zynqmp-pmu.c index 67cedec4ef..028f31894d 100644 --- a/hw/microblaze/xlnx-zynqmp-pmu.c +++ b/hw/microblaze/xlnx-zynqmp-pmu.c @@ -19,7 +19,6 @@ #include "qapi/error.h" #include "exec/address-spaces.h" #include "hw/boards.h" -#include "hw/qdev-properties.h" #include "cpu.h" #include "boot.h" diff --git a/hw/mips/boston.c b/hw/mips/boston.c index ce86b75664..aa8016f986 100644 --- a/hw/mips/boston.c +++ b/hw/mips/boston.c @@ -30,6 +30,7 @@ #include "hw/mips/cps.h" #include "hw/mips/cpudevs.h" #include "hw/pci-host/xilinx-pcie.h" +#include "hw/qdev-properties.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/log.h" diff --git a/hw/mips/cps.c b/hw/mips/cps.c index aea6bcd7fe..cd8b07ded2 100644 --- a/hw/mips/cps.c +++ b/hw/mips/cps.c @@ -22,6 +22,7 @@ #include "qemu/module.h" #include "hw/mips/cps.h" #include "hw/mips/mips.h" +#include "hw/qdev-properties.h" #include "hw/mips/cpudevs.h" #include "sysemu/kvm.h" #include "sysemu/reset.h" diff --git a/hw/misc/a9scu.c b/hw/misc/a9scu.c index 62bc60b2ae..45c91db303 100644 --- a/hw/misc/a9scu.c +++ b/hw/misc/a9scu.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #include "hw/misc/a9scu.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/module.h" diff --git a/hw/misc/applesmc.c b/hw/misc/applesmc.c index d9d369777c..24d57e8677 100644 --- a/hw/misc/applesmc.c +++ b/hw/misc/applesmc.c @@ -32,6 +32,7 @@ #include "qemu/osdep.h" #include "hw/isa/isa.h" +#include "hw/qdev-properties.h" #include "ui/console.h" #include "qemu/module.h" #include "qemu/timer.h" diff --git a/hw/misc/arm11scu.c b/hw/misc/arm11scu.c index 84275df885..3023284d6f 100644 --- a/hw/misc/arm11scu.c +++ b/hw/misc/arm11scu.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #include "hw/misc/arm11scu.h" +#include "hw/qdev-properties.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/arm_l2x0.c b/hw/misc/arm_l2x0.c index 454a942ce0..af2c7af4a0 100644 --- a/hw/misc/arm_l2x0.c +++ b/hw/misc/arm_l2x0.c @@ -19,6 +19,7 @@ */ #include "qemu/osdep.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" diff --git a/hw/misc/arm_sysctl.c b/hw/misc/arm_sysctl.c index 2a4e0458c7..e0b299c235 100644 --- a/hw/misc/arm_sysctl.c +++ b/hw/misc/arm_sysctl.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "qemu/timer.h" #include "qemu/bitops.h" #include "hw/sysbus.h" diff --git a/hw/misc/armsse-cpuid.c b/hw/misc/armsse-cpuid.c index 05c08f3db5..5f225096f6 100644 --- a/hw/misc/armsse-cpuid.c +++ b/hw/misc/armsse-cpuid.c @@ -27,6 +27,7 @@ #include "hw/sysbus.h" #include "hw/registerfields.h" #include "hw/misc/armsse-cpuid.h" +#include "hw/qdev-properties.h" REG32(CPUID, 0x0) REG32(PID4, 0xfd0) diff --git a/hw/misc/bcm2835_property.c b/hw/misc/bcm2835_property.c index 0d078f15f9..d86d510572 100644 --- a/hw/misc/bcm2835_property.c +++ b/hw/misc/bcm2835_property.c @@ -6,6 +6,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/misc/bcm2835_property.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "hw/irq.h" #include "hw/misc/bcm2835_mbox_defs.h" diff --git a/hw/misc/debugexit.c b/hw/misc/debugexit.c index 752cb53cf6..ccf02bdbd4 100644 --- a/hw/misc/debugexit.c +++ b/hw/misc/debugexit.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "hw/isa/isa.h" +#include "hw/qdev-properties.h" #include "qemu/module.h" #define TYPE_ISA_DEBUG_EXIT_DEVICE "isa-debug-exit" diff --git a/hw/misc/eccmemctl.c b/hw/misc/eccmemctl.c index 3300a46bb3..4b1f2b675a 100644 --- a/hw/misc/eccmemctl.c +++ b/hw/misc/eccmemctl.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "qemu/module.h" diff --git a/hw/misc/iotkit-sysctl.c b/hw/misc/iotkit-sysctl.c index 31fe9a5997..dba91f94a7 100644 --- a/hw/misc/iotkit-sysctl.c +++ b/hw/misc/iotkit-sysctl.c @@ -27,6 +27,7 @@ #include "migration/vmstate.h" #include "hw/registerfields.h" #include "hw/misc/iotkit-sysctl.h" +#include "hw/qdev-properties.h" #include "target/arm/arm-powerctl.h" #include "target/arm/cpu.h" diff --git a/hw/misc/iotkit-sysinfo.c b/hw/misc/iotkit-sysinfo.c index 3e1cf0ec34..0106fa48d3 100644 --- a/hw/misc/iotkit-sysinfo.c +++ b/hw/misc/iotkit-sysinfo.c @@ -26,6 +26,7 @@ #include "hw/sysbus.h" #include "hw/registerfields.h" #include "hw/misc/iotkit-sysinfo.h" +#include "hw/qdev-properties.h" REG32(SYS_VERSION, 0x0) REG32(SYS_CONFIG, 0x4) diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index 7a2334c98b..5e3b05eae0 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -22,6 +22,7 @@ #include "qapi/error.h" #include "qemu/cutils.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "hw/pci/msi.h" #include "hw/pci/msix.h" #include "sysemu/kvm.h" diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c index 5e8ee80c25..9011f93086 100644 --- a/hw/misc/macio/cuda.c +++ b/hw/misc/macio/cuda.c @@ -26,6 +26,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "hw/ppc/mac.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "hw/input/adb.h" #include "hw/misc/mos6522.h" diff --git a/hw/misc/macio/gpio.c b/hw/misc/macio/gpio.c index e62b622112..6cca6b27d6 100644 --- a/hw/misc/macio/gpio.c +++ b/hw/misc/macio/gpio.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/ppc/mac.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "hw/misc/macio/macio.h" #include "hw/misc/macio/gpio.h" diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c index 222f163139..b59df4e3b8 100644 --- a/hw/misc/macio/macio.c +++ b/hw/misc/macio/macio.c @@ -30,6 +30,7 @@ #include "hw/misc/macio/cuda.h" #include "hw/pci/pci.h" #include "hw/ppc/mac_dbdma.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "hw/char/escc.h" #include "hw/misc/macio/macio.h" diff --git a/hw/misc/macio/pmu.c b/hw/misc/macio/pmu.c index d824a068d9..a289340036 100644 --- a/hw/misc/macio/pmu.c +++ b/hw/misc/macio/pmu.c @@ -31,6 +31,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "hw/ppc/mac.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "hw/input/adb.h" #include "hw/irq.h" diff --git a/hw/misc/mips_cmgcr.c b/hw/misc/mips_cmgcr.c index 6bddb2312a..0feab092f1 100644 --- a/hw/misc/mips_cmgcr.c +++ b/hw/misc/mips_cmgcr.c @@ -17,6 +17,7 @@ #include "sysemu/sysemu.h" #include "hw/misc/mips_cmgcr.h" #include "hw/misc/mips_cpc.h" +#include "hw/qdev-properties.h" #include "hw/intc/mips_gic.h" static inline bool is_cpc_connected(MIPSGCRState *s) diff --git a/hw/misc/mips_cpc.c b/hw/misc/mips_cpc.c index caa618f582..19ea016b87 100644 --- a/hw/misc/mips_cpc.c +++ b/hw/misc/mips_cpc.c @@ -26,6 +26,7 @@ #include "migration/vmstate.h" #include "hw/misc/mips_cpc.h" +#include "hw/qdev-properties.h" static inline uint64_t cpc_vp_run_mask(MIPSCPCState *cpc) { diff --git a/hw/misc/mips_itu.c b/hw/misc/mips_itu.c index e8ba4a3cd0..ea0cf9726b 100644 --- a/hw/misc/mips_itu.c +++ b/hw/misc/mips_itu.c @@ -25,6 +25,7 @@ #include "cpu.h" #include "exec/exec-all.h" #include "hw/misc/mips_itu.h" +#include "hw/qdev-properties.h" #define ITC_TAG_ADDRSPACE_SZ (ITC_ADDRESSMAP_NUM * 8) /* Initialize as 4kB area to fit all 32 cells with default 128B grain. diff --git a/hw/misc/mos6522.c b/hw/misc/mos6522.c index f06cf0b52a..4d99350e22 100644 --- a/hw/misc/mos6522.c +++ b/hw/misc/mos6522.c @@ -28,6 +28,7 @@ #include "hw/input/adb.h" #include "hw/irq.h" #include "hw/misc/mos6522.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" diff --git a/hw/misc/mps2-fpgaio.c b/hw/misc/mps2-fpgaio.c index 4824dc09b2..5e8b103914 100644 --- a/hw/misc/mps2-fpgaio.c +++ b/hw/misc/mps2-fpgaio.c @@ -24,6 +24,7 @@ #include "migration/vmstate.h" #include "hw/registerfields.h" #include "hw/misc/mps2-fpgaio.h" +#include "hw/qdev-properties.h" #include "qemu/timer.h" REG32(LED0, 0) diff --git a/hw/misc/mps2-scc.c b/hw/misc/mps2-scc.c index 042ce130ba..25779a1dca 100644 --- a/hw/misc/mps2-scc.c +++ b/hw/misc/mps2-scc.c @@ -25,6 +25,7 @@ #include "migration/vmstate.h" #include "hw/registerfields.h" #include "hw/misc/mps2-scc.h" +#include "hw/qdev-properties.h" REG32(CFG0, 0) REG32(CFG1, 4) diff --git a/hw/misc/msf2-sysreg.c b/hw/misc/msf2-sysreg.c index da0f7c26e1..ddc5a30c80 100644 --- a/hw/misc/msf2-sysreg.c +++ b/hw/misc/msf2-sysreg.c @@ -17,6 +17,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "hw/misc/msf2-sysreg.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/error-report.h" #include "trace.h" diff --git a/hw/misc/nrf51_rng.c b/hw/misc/nrf51_rng.c index 8528c8880c..5140981c96 100644 --- a/hw/misc/nrf51_rng.c +++ b/hw/misc/nrf51_rng.c @@ -16,6 +16,7 @@ #include "hw/arm/nrf51.h" #include "hw/irq.h" #include "hw/misc/nrf51_rng.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/guest-random.h" diff --git a/hw/misc/pc-testdev.c b/hw/misc/pc-testdev.c index 94cf55440e..0fb84ddc6b 100644 --- a/hw/misc/pc-testdev.c +++ b/hw/misc/pc-testdev.c @@ -36,7 +36,6 @@ */ #include "qemu/osdep.h" -#include "hw/qdev.h" #include "qemu/module.h" #include "hw/irq.h" #include "hw/isa/isa.h" diff --git a/hw/misc/pci-testdev.c b/hw/misc/pci-testdev.c index 0eb9ed5469..74d8571a73 100644 --- a/hw/misc/pci-testdev.c +++ b/hw/misc/pci-testdev.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "qemu/event_notifier.h" #include "qemu/module.h" #include "sysemu/kvm.h" diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c index 1da24c621e..653393ef02 100644 --- a/hw/misc/pvpanic.c +++ b/hw/misc/pvpanic.c @@ -18,6 +18,7 @@ #include "qemu/module.h" #include "hw/nvram/fw_cfg.h" +#include "hw/qdev-properties.h" #include "hw/misc/pvpanic.h" /* The bit of supported pv event */ diff --git a/hw/misc/tz-mpc.c b/hw/misc/tz-mpc.c index deb7796ec2..49dd6050bd 100644 --- a/hw/misc/tz-mpc.c +++ b/hw/misc/tz-mpc.c @@ -19,6 +19,7 @@ #include "hw/registerfields.h" #include "hw/irq.h" #include "hw/misc/tz-mpc.h" +#include "hw/qdev-properties.h" /* Our IOMMU has two IOMMU indexes, one for secure transactions and one for * non-secure transactions. diff --git a/hw/misc/tz-msc.c b/hw/misc/tz-msc.c index 5b664d760f..7d522ac0ec 100644 --- a/hw/misc/tz-msc.c +++ b/hw/misc/tz-msc.c @@ -19,6 +19,7 @@ #include "hw/registerfields.h" #include "hw/irq.h" #include "hw/misc/tz-msc.h" +#include "hw/qdev-properties.h" static void tz_msc_update_irq(TZMSC *s) { diff --git a/hw/misc/tz-ppc.c b/hw/misc/tz-ppc.c index ccc4468c11..181a5f1e81 100644 --- a/hw/misc/tz-ppc.c +++ b/hw/misc/tz-ppc.c @@ -19,6 +19,7 @@ #include "hw/registerfields.h" #include "hw/irq.h" #include "hw/misc/tz-ppc.h" +#include "hw/qdev-properties.h" static void tz_ppc_update_irq(TZPPC *s) { diff --git a/hw/net/allwinner_emac.c b/hw/net/allwinner_emac.c index f4b8c4fa67..e055a661c4 100644 --- a/hw/net/allwinner_emac.c +++ b/hw/net/allwinner_emac.c @@ -24,6 +24,7 @@ #include "qemu/fifo8.h" #include "hw/irq.h" #include "hw/net/allwinner_emac.h" +#include "hw/qdev-properties.h" #include "qemu/log.h" #include "qemu/module.h" #include diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c index ab6f7e8262..7f9cb5ab95 100644 --- a/hw/net/cadence_gem.c +++ b/hw/net/cadence_gem.c @@ -27,6 +27,7 @@ #include "hw/irq.h" #include "hw/net/cadence_gem.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/log.h" diff --git a/hw/net/can/can_kvaser_pci.c b/hw/net/can/can_kvaser_pci.c index 401da73cc8..16861b8f9f 100644 --- a/hw/net/can/can_kvaser_pci.c +++ b/hw/net/can/can_kvaser_pci.c @@ -38,6 +38,7 @@ #include "chardev/char.h" #include "hw/irq.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "net/can_emu.h" diff --git a/hw/net/can/can_mioe3680_pci.c b/hw/net/can/can_mioe3680_pci.c index 0f0ca912c9..965e252d9d 100644 --- a/hw/net/can/can_mioe3680_pci.c +++ b/hw/net/can/can_mioe3680_pci.c @@ -34,6 +34,7 @@ #include "chardev/char.h" #include "hw/irq.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "net/can_emu.h" diff --git a/hw/net/can/can_pcm3680_pci.c b/hw/net/can/can_pcm3680_pci.c index 632eb0b59b..51b6540072 100644 --- a/hw/net/can/can_pcm3680_pci.c +++ b/hw/net/can/can_pcm3680_pci.c @@ -34,6 +34,7 @@ #include "chardev/char.h" #include "hw/irq.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "net/can_emu.h" diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c index 8d0cafc6ba..a5678e11fa 100644 --- a/hw/net/dp8393x.c +++ b/hw/net/dp8393x.c @@ -19,6 +19,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "net/net.h" diff --git a/hw/net/e1000.c b/hw/net/e1000.c index 1d035b8ff7..ff99616c9a 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -27,6 +27,7 @@ #include "qemu/osdep.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "net/net.h" #include "net/checksum.h" diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c index 270ff93841..b69fd7d8ad 100644 --- a/hw/net/e1000e.c +++ b/hw/net/e1000e.c @@ -43,6 +43,7 @@ #include "hw/hw.h" #include "hw/pci/msi.h" #include "hw/pci/msix.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "e1000_regs.h" diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c index 2ad1b328e4..cc2dd8b1c9 100644 --- a/hw/net/eepro100.c +++ b/hw/net/eepro100.c @@ -43,6 +43,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "net/net.h" #include "net/eth.h" diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c index e5c902ada4..e1556236b0 100644 --- a/hw/net/fsl_etsec/etsec.c +++ b/hw/net/fsl_etsec/etsec.c @@ -31,6 +31,7 @@ #include "hw/sysbus.h" #include "hw/irq.h" #include "hw/ptimer.h" +#include "hw/qdev-properties.h" #include "etsec.h" #include "registers.h" #include "qemu/log.h" diff --git a/hw/net/fsl_etsec/etsec.h b/hw/net/fsl_etsec/etsec.h index 877988572e..09d05c2133 100644 --- a/hw/net/fsl_etsec/etsec.h +++ b/hw/net/fsl_etsec/etsec.h @@ -25,7 +25,6 @@ #ifndef ETSEC_H #define ETSEC_H -#include "hw/qdev.h" #include "hw/sysbus.h" #include "net/net.h" #include "hw/ptimer.h" diff --git a/hw/net/ftgmac100.c b/hw/net/ftgmac100.c index 4d0f56c123..04c78e8517 100644 --- a/hw/net/ftgmac100.c +++ b/hw/net/ftgmac100.c @@ -20,6 +20,7 @@ #include "net/checksum.h" #include "net/eth.h" #include "hw/net/mii.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" /* For crc32 */ diff --git a/hw/net/imx_fec.c b/hw/net/imx_fec.c index 5a22542aaf..7ac4ed7c12 100644 --- a/hw/net/imx_fec.c +++ b/hw/net/imx_fec.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" #include "hw/net/imx_fec.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "sysemu/dma.h" #include "qemu/log.h" diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c index ea20a92cda..e7662f0575 100644 --- a/hw/net/lan9118.c +++ b/hw/net/lan9118.c @@ -20,6 +20,7 @@ #include "hw/net/lan9118.h" #include "sysemu/sysemu.h" #include "hw/ptimer.h" +#include "hw/qdev-properties.h" #include "qemu/log.h" #include "qemu/main-loop.h" #include "qemu/module.h" diff --git a/hw/net/lance.c b/hw/net/lance.c index 0d094327cb..6631e2a4e0 100644 --- a/hw/net/lance.c +++ b/hw/net/lance.c @@ -41,6 +41,7 @@ #include "hw/sparc/sparc32_dma.h" #include "migration/vmstate.h" #include "hw/net/lance.h" +#include "hw/qdev-properties.h" #include "trace.h" #include "sysemu/sysemu.h" diff --git a/hw/net/mcf_fec.c b/hw/net/mcf_fec.c index e4a3b55eb6..8fcf354a4b 100644 --- a/hw/net/mcf_fec.c +++ b/hw/net/mcf_fec.c @@ -14,6 +14,7 @@ #include "hw/m68k/mcf.h" #include "hw/m68k/mcf_fec.h" #include "hw/net/mii.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" /* For crc32 */ #include diff --git a/hw/net/milkymist-minimac2.c b/hw/net/milkymist-minimac2.c index 1e3fb9c220..86b6d28033 100644 --- a/hw/net/milkymist-minimac2.c +++ b/hw/net/milkymist-minimac2.c @@ -26,6 +26,7 @@ #include "qapi/error.h" #include "cpu.h" /* FIXME: why does this use TARGET_PAGE_ALIGN? */ #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "trace.h" diff --git a/hw/net/mipsnet.c b/hw/net/mipsnet.c index 013f762d72..f7ae1ced4d 100644 --- a/hw/net/mipsnet.c +++ b/hw/net/mipsnet.c @@ -1,5 +1,6 @@ #include "qemu/osdep.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "net/net.h" #include "qemu/module.h" #include "trace.h" diff --git a/hw/net/ne2000-isa.c b/hw/net/ne2000-isa.c index 5195c107d0..6fcf3d5cd9 100644 --- a/hw/net/ne2000-isa.c +++ b/hw/net/ne2000-isa.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include "hw/isa/isa.h" #include "hw/net/ne2000-isa.h" -#include "hw/qdev.h" #include "migration/vmstate.h" #include "ne2000.h" #include "sysemu/sysemu.h" diff --git a/hw/net/ne2000-pci.c b/hw/net/ne2000-pci.c index 084d92f955..9a20d427e3 100644 --- a/hw/net/ne2000-pci.c +++ b/hw/net/ne2000-pci.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "ne2000.h" #include "sysemu/sysemu.h" diff --git a/hw/net/opencores_eth.c b/hw/net/opencores_eth.c index a9e96cdd3a..aa13159464 100644 --- a/hw/net/opencores_eth.c +++ b/hw/net/opencores_eth.c @@ -34,6 +34,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" #include "hw/net/mii.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "net/net.h" #include "qemu/module.h" diff --git a/hw/net/pcnet-pci.c b/hw/net/pcnet-pci.c index a77d2c9368..4723c30c79 100644 --- a/hw/net/pcnet-pci.c +++ b/hw/net/pcnet-pci.c @@ -30,6 +30,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "net/net.h" #include "qemu/module.h" diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c index bfcfcf5be3..107ac680b2 100644 --- a/hw/net/pcnet.c +++ b/hw/net/pcnet.c @@ -38,7 +38,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "hw/irq.h" -#include "hw/qdev.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "net/net.h" #include "net/eth.h" diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c index 789e5c4876..50f9e33e2f 100644 --- a/hw/net/rocker/rocker.c +++ b/hw/net/rocker/rocker.c @@ -17,6 +17,7 @@ #include "qemu/osdep.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "hw/pci/msix.h" #include "net/net.h" diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c index 89156ed802..88a97d756d 100644 --- a/hw/net/rtl8139.c +++ b/hw/net/rtl8139.c @@ -54,6 +54,7 @@ #include #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "sysemu/dma.h" #include "qemu/module.h" diff --git a/hw/net/smc91c111.c b/hw/net/smc91c111.c index 67e3f2408e..e574635969 100644 --- a/hw/net/smc91c111.c +++ b/hw/net/smc91c111.c @@ -13,6 +13,7 @@ #include "net/net.h" #include "hw/irq.h" #include "hw/net/smc91c111.h" +#include "hw/qdev-properties.h" #include "qemu/log.h" #include "qemu/module.h" /* For crc32 */ diff --git a/hw/net/spapr_llan.c b/hw/net/spapr_llan.c index 60085b1bf4..701e6e1514 100644 --- a/hw/net/spapr_llan.c +++ b/hw/net/spapr_llan.c @@ -31,10 +31,10 @@ #include "qemu/log.h" #include "qemu/module.h" #include "net/net.h" -#include "hw/qdev.h" #include "migration/vmstate.h" #include "hw/ppc/spapr.h" #include "hw/ppc/spapr_vio.h" +#include "hw/qdev-properties.h" #include "sysemu/sysemu.h" #include "trace.h" diff --git a/hw/net/stellaris_enet.c b/hw/net/stellaris_enet.c index 154214ca1d..3aca2a09f3 100644 --- a/hw/net/stellaris_enet.c +++ b/hw/net/stellaris_enet.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "net/net.h" diff --git a/hw/net/sungem.c b/hw/net/sungem.c index f5e30725be..f31d41ac5b 100644 --- a/hw/net/sungem.c +++ b/hw/net/sungem.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/net/sunhme.c b/hw/net/sunhme.c index 359bd4f9f5..2243b7cf7b 100644 --- a/hw/net/sunhme.c +++ b/hw/net/sunhme.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "hw/net/mii.h" #include "net/net.h" diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index cdf4d774da..4113729fcf 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -27,6 +27,7 @@ #include "hw/virtio/virtio-bus.h" #include "qapi/error.h" #include "qapi/qapi-events-net.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio-access.h" #include "migration/misc.h" #include "standard-headers/linux/ethtool.h" diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c index 88a7c13a96..17b420b2a8 100644 --- a/hw/net/vmxnet3.c +++ b/hw/net/vmxnet3.c @@ -18,6 +18,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "net/tap.h" #include "net/checksum.h" #include "sysemu/sysemu.h" diff --git a/hw/net/xgmac.c b/hw/net/xgmac.c index ded8b9cf9d..2ea8d2ec72 100644 --- a/hw/net/xgmac.c +++ b/hw/net/xgmac.c @@ -26,6 +26,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c index b22e344a4b..d8716a1f73 100644 --- a/hw/net/xilinx_axienet.c +++ b/hw/net/xilinx_axienet.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "hw/hw.h" #include "hw/sysbus.h" #include "qapi/error.h" #include "qemu/log.h" @@ -32,6 +33,7 @@ #include "hw/hw.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/stream.h" #define DPHY(x) diff --git a/hw/net/xilinx_ethlite.c b/hw/net/xilinx_ethlite.c index a963087f16..384e72b157 100644 --- a/hw/net/xilinx_ethlite.c +++ b/hw/net/xilinx_ethlite.c @@ -27,6 +27,7 @@ #include "cpu.h" /* FIXME should not use tswap* */ #include "hw/sysbus.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "net/net.h" #define D(x) diff --git a/hw/nios2/10m50_devboard.c b/hw/nios2/10m50_devboard.c index 3c01e4f667..ad8b2fc670 100644 --- a/hw/nios2/10m50_devboard.c +++ b/hw/nios2/10m50_devboard.c @@ -28,6 +28,7 @@ #include "hw/sysbus.h" #include "hw/char/serial.h" +#include "hw/qdev-properties.h" #include "sysemu/sysemu.h" #include "hw/boards.h" #include "exec/memory.h" diff --git a/hw/nvram/ds1225y.c b/hw/nvram/ds1225y.c index 9cddb37925..934e09bf75 100644 --- a/hw/nvram/ds1225y.c +++ b/hw/nvram/ds1225y.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "trace.h" diff --git a/hw/nvram/eeprom_at24c.c b/hw/nvram/eeprom_at24c.c index 00f942db51..3416367523 100644 --- a/hw/nvram/eeprom_at24c.c +++ b/hw/nvram/eeprom_at24c.c @@ -12,6 +12,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/i2c/i2c.h" +#include "hw/qdev-properties.h" #include "sysemu/block-backend.h" /* #define DEBUG_AT24C */ diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index f192c3ea16..7dc3ac378e 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -29,6 +29,7 @@ #include "sysemu/reset.h" #include "hw/boards.h" #include "hw/nvram/fw_cfg.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "migration/qemu-file-types.h" #include "migration/vmstate.h" diff --git a/hw/nvram/mac_nvram.c b/hw/nvram/mac_nvram.c index 853b693109..9a47e35b8e 100644 --- a/hw/nvram/mac_nvram.c +++ b/hw/nvram/mac_nvram.c @@ -26,6 +26,7 @@ #include "qemu/osdep.h" #include "hw/nvram/chrp_nvram.h" #include "hw/ppc/mac.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/cutils.h" #include "qemu/module.h" diff --git a/hw/nvram/nrf51_nvm.c b/hw/nvram/nrf51_nvm.c index e13ff4b2fe..4d678f994e 100644 --- a/hw/nvram/nrf51_nvm.c +++ b/hw/nvram/nrf51_nvm.c @@ -24,6 +24,7 @@ #include "exec/address-spaces.h" #include "hw/arm/nrf51.h" #include "hw/nvram/nrf51_nvm.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" /* diff --git a/hw/nvram/spapr_nvram.c b/hw/nvram/spapr_nvram.c index ef22962767..c7bcd29e15 100644 --- a/hw/nvram/spapr_nvram.c +++ b/hw/nvram/spapr_nvram.c @@ -36,6 +36,7 @@ #include "hw/nvram/chrp_nvram.h" #include "hw/ppc/spapr.h" #include "hw/ppc/spapr_vio.h" +#include "hw/qdev-properties.h" typedef struct SpaprNvram { SpaprVioDevice sdev; diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c index 13572b8eff..79e70493fc 100644 --- a/hw/openrisc/openrisc_sim.c +++ b/hw/openrisc/openrisc_sim.c @@ -28,6 +28,7 @@ #include "hw/char/serial.h" #include "net/net.h" #include "hw/loader.h" +#include "hw/qdev-properties.h" #include "exec/address-spaces.h" #include "sysemu/sysemu.h" #include "hw/sysbus.h" diff --git a/hw/pci-bridge/gen_pcie_root_port.c b/hw/pci-bridge/gen_pcie_root_port.c index fb78cf1905..9eaefebca8 100644 --- a/hw/pci-bridge/gen_pcie_root_port.c +++ b/hw/pci-bridge/gen_pcie_root_port.c @@ -15,6 +15,7 @@ #include "qemu/module.h" #include "hw/pci/msix.h" #include "hw/pci/pcie_port.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #define TYPE_GEN_PCIE_ROOT_PORT "pcie-root-port" diff --git a/hw/pci-bridge/pci_bridge_dev.c b/hw/pci-bridge/pci_bridge_dev.c index 5fe96d02b3..cc80cb4898 100644 --- a/hw/pci-bridge/pci_bridge_dev.c +++ b/hw/pci-bridge/pci_bridge_dev.c @@ -27,6 +27,7 @@ #include "hw/pci/msi.h" #include "hw/pci/shpc.h" #include "hw/pci/slotid_cap.h" +#include "hw/qdev-properties.h" #include "exec/memory.h" #include "hw/pci/pci_bus.h" #include "hw/hotplug.h" diff --git a/hw/pci-bridge/pci_expander_bridge.c b/hw/pci-bridge/pci_expander_bridge.c index aecf3d7ddf..06a7c018d7 100644 --- a/hw/pci-bridge/pci_expander_bridge.c +++ b/hw/pci-bridge/pci_expander_bridge.c @@ -15,6 +15,7 @@ #include "hw/pci/pci.h" #include "hw/pci/pci_bus.h" #include "hw/pci/pci_host.h" +#include "hw/qdev-properties.h" #include "hw/pci/pci_bridge.h" #include "qemu/range.h" #include "qemu/error-report.h" diff --git a/hw/pci-bridge/pcie_pci_bridge.c b/hw/pci-bridge/pcie_pci_bridge.c index d0bfa0189a..7679bef6c1 100644 --- a/hw/pci-bridge/pcie_pci_bridge.c +++ b/hw/pci-bridge/pcie_pci_bridge.c @@ -16,6 +16,7 @@ #include "hw/pci/msi.h" #include "hw/pci/shpc.h" #include "hw/pci/slotid_cap.h" +#include "hw/qdev-properties.h" typedef struct PCIEPCIBridge { /*< private >*/ diff --git a/hw/pci-bridge/pcie_root_port.c b/hw/pci-bridge/pcie_root_port.c index 09019ca05d..85cf295b2d 100644 --- a/hw/pci-bridge/pcie_root_port.c +++ b/hw/pci-bridge/pcie_root_port.c @@ -16,6 +16,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/pci/pcie_port.h" +#include "hw/qdev-properties.h" static void rp_aer_vector_update(PCIDevice *d) { diff --git a/hw/pci-bridge/xio3130_downstream.c b/hw/pci-bridge/xio3130_downstream.c index 1d62e31272..a9f084b863 100644 --- a/hw/pci-bridge/xio3130_downstream.c +++ b/hw/pci-bridge/xio3130_downstream.c @@ -24,6 +24,7 @@ #include "hw/pci/msi.h" #include "hw/pci/pcie.h" #include "hw/pci/pcie_port.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/pci-host/designware.c b/hw/pci-host/designware.c index 083f5bb1a6..71e9b0d9b5 100644 --- a/hw/pci-host/designware.c +++ b/hw/pci-host/designware.c @@ -25,6 +25,7 @@ #include "hw/pci/pci_bridge.h" #include "hw/pci/pci_host.h" #include "hw/pci/pcie_port.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "hw/irq.h" #include "hw/pci-host/designware.h" diff --git a/hw/pci-host/gpex.c b/hw/pci-host/gpex.c index 93f28efb49..0ca604dc62 100644 --- a/hw/pci-host/gpex.c +++ b/hw/pci-host/gpex.c @@ -33,6 +33,7 @@ #include "qapi/error.h" #include "hw/irq.h" #include "hw/pci-host/gpex.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/module.h" diff --git a/hw/pci-host/grackle.c b/hw/pci-host/grackle.c index 912f8bf13f..537273e578 100644 --- a/hw/pci-host/grackle.c +++ b/hw/pci-host/grackle.c @@ -26,6 +26,7 @@ #include "qemu/osdep.h" #include "hw/pci/pci_host.h" #include "hw/ppc/mac.h" +#include "hw/qdev-properties.h" #include "hw/pci/pci.h" #include "hw/intc/heathrow_pic.h" #include "hw/irq.h" diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index bc9726057a..2e97bc0bdb 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -27,6 +27,7 @@ #include "hw/irq.h" #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" +#include "hw/qdev-properties.h" #include "hw/isa/isa.h" #include "hw/sysbus.h" #include "qapi/error.h" diff --git a/hw/pci-host/ppce500.c b/hw/pci-host/ppce500.c index 241e7e788d..8bed8e8941 100644 --- a/hw/pci-host/ppce500.c +++ b/hw/pci-host/ppce500.c @@ -17,6 +17,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" #include "hw/ppc/e500-ccsr.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c index 588c7dc6c0..85d7ba9037 100644 --- a/hw/pci-host/prep.c +++ b/hw/pci-host/prep.c @@ -30,6 +30,7 @@ #include "hw/pci/pci.h" #include "hw/pci/pci_bus.h" #include "hw/pci/pci_host.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "hw/i386/pc.h" #include "hw/irq.h" diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index 1688a89b6a..158d270b9f 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -30,6 +30,7 @@ #include "qemu/osdep.h" #include "hw/pci-host/q35.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qapi/visitor.h" diff --git a/hw/pci-host/sabre.c b/hw/pci-host/sabre.c index 772ac1f725..a6520511b4 100644 --- a/hw/pci-host/sabre.c +++ b/hw/pci-host/sabre.c @@ -28,6 +28,7 @@ #include "hw/sysbus.h" #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" +#include "hw/qdev-properties.h" #include "hw/pci/pci_bridge.h" #include "hw/pci/pci_bus.h" #include "hw/irq.h" diff --git a/hw/pci-host/uninorth.c b/hw/pci-host/uninorth.c index 76293ab22b..75bc506965 100644 --- a/hw/pci-host/uninorth.c +++ b/hw/pci-host/uninorth.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" #include "hw/ppc/mac.h" +#include "hw/qdev-properties.h" #include "qemu/module.h" #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" diff --git a/hw/pci-host/versatile.c b/hw/pci-host/versatile.c index 1cd832a393..b731d0544f 100644 --- a/hw/pci-host/versatile.c +++ b/hw/pci-host/versatile.c @@ -14,6 +14,7 @@ #include "hw/pci/pci.h" #include "hw/pci/pci_bus.h" #include "hw/pci/pci_host.h" +#include "hw/qdev-properties.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/pci-host/xilinx-pcie.c b/hw/pci-host/xilinx-pcie.c index f42fabbbe7..17d5024349 100644 --- a/hw/pci-host/xilinx-pcie.c +++ b/hw/pci-host/xilinx-pcie.c @@ -22,6 +22,7 @@ #include "qemu/units.h" #include "qapi/error.h" #include "hw/pci/pci_bridge.h" +#include "hw/qdev-properties.h" #include "hw/irq.h" #include "hw/pci-host/xilinx-pcie.h" diff --git a/hw/pci/pci.c b/hw/pci/pci.c index d84ecd8507..9001b81daa 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -29,6 +29,7 @@ #include "hw/pci/pci_bridge.h" #include "hw/pci/pci_bus.h" #include "hw/pci/pci_host.h" +#include "hw/qdev-properties.h" #include "migration/qemu-file-types.h" #include "migration/vmstate.h" #include "monitor/monitor.h" diff --git a/hw/pci/pcie_port.c b/hw/pci/pcie_port.c index c9c3ba540a..c19a9be592 100644 --- a/hw/pci/pcie_port.c +++ b/hw/pci/pcie_port.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "hw/pci/pcie_port.h" +#include "hw/qdev-properties.h" #include "qemu/module.h" #include "hw/hotplug.h" diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 3f0c3dea92..3b04484654 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -33,6 +33,7 @@ #include "hw/ppc/openpic.h" #include "hw/ppc/openpic_kvm.h" #include "hw/ppc/ppc.h" +#include "hw/qdev-properties.h" #include "hw/loader.h" #include "elf.h" #include "hw/sysbus.h" diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index 94a958e5e0..c5bbcc7433 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -50,6 +50,7 @@ #include "qemu-common.h" #include "qapi/error.h" #include "hw/ppc/ppc.h" +#include "hw/qdev-properties.h" #include "hw/ppc/mac.h" #include "hw/input/adb.h" #include "hw/ppc/mac_dbdma.h" diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c index aeeddd1d3b..0fa680b749 100644 --- a/hw/ppc/mac_oldworld.c +++ b/hw/ppc/mac_oldworld.c @@ -29,6 +29,7 @@ #include "qemu/units.h" #include "qapi/error.h" #include "hw/ppc/ppc.h" +#include "hw/qdev-properties.h" #include "mac.h" #include "hw/input/adb.h" #include "sysemu/sysemu.h" diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index 114d5826df..cf31830655 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -41,6 +41,7 @@ #include "target/ppc/mmu-hash64.h" #include "hw/ppc/xics.h" +#include "hw/qdev-properties.h" #include "hw/ppc/pnv_xscom.h" #include "hw/isa/isa.h" diff --git a/hw/ppc/pnv_core.c b/hw/ppc/pnv_core.c index ff477ba6c9..c6b0fee56f 100644 --- a/hw/ppc/pnv_core.c +++ b/hw/ppc/pnv_core.c @@ -29,6 +29,7 @@ #include "hw/ppc/pnv_core.h" #include "hw/ppc/pnv_xscom.h" #include "hw/ppc/xics.h" +#include "hw/qdev-properties.h" static const char *pnv_core_cpu_typename(PnvCore *pc) { diff --git a/hw/ppc/pnv_psi.c b/hw/ppc/pnv_psi.c index f10d519014..88ba8e7b9b 100644 --- a/hw/ppc/pnv_psi.c +++ b/hw/ppc/pnv_psi.c @@ -31,6 +31,7 @@ #include "hw/ppc/fdt.h" #include "hw/ppc/pnv.h" #include "hw/ppc/pnv_xscom.h" +#include "hw/qdev-properties.h" #include "hw/ppc/pnv_psi.h" #include diff --git a/hw/ppc/ppc440_uc.c b/hw/ppc/ppc440_uc.c index 761d551967..95475c9c5f 100644 --- a/hw/ppc/ppc440_uc.c +++ b/hw/ppc/ppc440_uc.c @@ -20,6 +20,7 @@ #include "exec/address-spaces.h" #include "exec/memory.h" #include "hw/ppc/ppc.h" +#include "hw/qdev-properties.h" #include "hw/pci/pci.h" #include "sysemu/block-backend.h" #include "sysemu/reset.h" diff --git a/hw/ppc/prep_systemio.c b/hw/ppc/prep_systemio.c index d46792d366..10f9725f41 100644 --- a/hw/ppc/prep_systemio.c +++ b/hw/ppc/prep_systemio.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" #include "hw/isa/isa.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "exec/address-spaces.h" #include "qemu/error-report.h" /* for error_report() */ diff --git a/hw/ppc/rs6000_mc.c b/hw/ppc/rs6000_mc.c index daea13cdea..df7c0006fc 100644 --- a/hw/ppc/rs6000_mc.c +++ b/hw/ppc/rs6000_mc.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "hw/isa/isa.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "exec/address-spaces.h" #include "hw/boards.h" diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c index 7ed5518dbc..437e214210 100644 --- a/hw/ppc/sam460ex.c +++ b/hw/ppc/sam460ex.c @@ -37,6 +37,7 @@ #include "hw/i2c/smbus_eeprom.h" #include "hw/usb/hcd-ehci.h" #include "hw/ppc/fdt.h" +#include "hw/qdev-properties.h" #include diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 4c02ce9a08..06d23a5004 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -56,6 +56,7 @@ #include "hw/ppc/fdt.h" #include "hw/ppc/spapr.h" #include "hw/ppc/spapr_vio.h" +#include "hw/qdev-properties.h" #include "hw/pci-host/spapr.h" #include "hw/pci/msi.h" diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c index f86f773d42..920bc365ef 100644 --- a/hw/ppc/spapr_cpu_core.c +++ b/hw/ppc/spapr_cpu_core.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #include "hw/cpu/core.h" #include "hw/ppc/spapr_cpu_core.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "target/ppc/cpu.h" #include "hw/ppc/spapr.h" diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c index c09bbcc22d..09255f4951 100644 --- a/hw/ppc/spapr_drc.c +++ b/hw/ppc/spapr_drc.c @@ -17,7 +17,6 @@ #include "qemu/cutils.h" #include "hw/ppc/spapr_drc.h" #include "qom/object.h" -#include "hw/qdev.h" #include "migration/vmstate.h" #include "qapi/visitor.h" #include "qemu/error-report.h" diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c index d75359c5f3..53c973bdd1 100644 --- a/hw/ppc/spapr_events.c +++ b/hw/ppc/spapr_events.c @@ -29,7 +29,6 @@ #include "qapi/error.h" #include "cpu.h" #include "sysemu/sysemu.h" -#include "hw/qdev.h" #include "sysemu/device_tree.h" #include "hw/ppc/fdt.h" diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c index 8223bdb39f..ce85f8ac63 100644 --- a/hw/ppc/spapr_iommu.c +++ b/hw/ppc/spapr_iommu.c @@ -22,7 +22,6 @@ #include "qemu/log.h" #include "qemu/module.h" #include "sysemu/kvm.h" -#include "hw/qdev.h" #include "kvm_ppc.h" #include "migration/vmstate.h" #include "sysemu/dma.h" diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c index 132b7a8253..50a6a2eeeb 100644 --- a/hw/ppc/spapr_irq.c +++ b/hw/ppc/spapr_irq.c @@ -17,6 +17,7 @@ #include "hw/ppc/spapr_xive.h" #include "hw/ppc/xics.h" #include "hw/ppc/xics_spapr.h" +#include "hw/qdev-properties.h" #include "cpu-models.h" #include "sysemu/kvm.h" diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index 53b799fec7..bf31fd854c 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -47,6 +47,7 @@ #include "hw/pci/pci_bus.h" #include "hw/pci/pci_ids.h" #include "hw/ppc/spapr_drc.h" +#include "hw/qdev-properties.h" #include "sysemu/device_tree.h" #include "sysemu/kvm.h" #include "sysemu/hostmem.h" diff --git a/hw/ppc/spapr_rng.c b/hw/ppc/spapr_rng.c index cfe43eaae9..27198e0ced 100644 --- a/hw/ppc/spapr_rng.c +++ b/hw/ppc/spapr_rng.c @@ -27,6 +27,7 @@ #include "sysemu/device_tree.h" #include "sysemu/rng.h" #include "hw/ppc/spapr.h" +#include "hw/qdev-properties.h" #include "kvm_ppc.h" #define SPAPR_RNG(obj) \ diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c index a618a2ac0f..558d702833 100644 --- a/hw/ppc/spapr_rtas.c +++ b/hw/ppc/spapr_rtas.c @@ -29,7 +29,6 @@ #include "qemu/log.h" #include "qemu/error-report.h" #include "sysemu/sysemu.h" -#include "hw/qdev.h" #include "sysemu/device_tree.h" #include "sysemu/cpus.h" #include "sysemu/hw_accel.h" diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c index 099b94cc54..68625522d8 100644 --- a/hw/ppc/virtex_ml507.c +++ b/hw/ppc/virtex_ml507.c @@ -43,6 +43,7 @@ #include "hw/ppc/ppc.h" #include "hw/ppc/ppc4xx.h" +#include "hw/qdev-properties.h" #include "ppc405.h" #define EPAPR_MAGIC (0x45504150) diff --git a/hw/rdma/vmw/pvrdma_main.c b/hw/rdma/vmw/pvrdma_main.c index b924843367..e3a12173e3 100644 --- a/hw/rdma/vmw/pvrdma_main.c +++ b/hw/rdma/vmw/pvrdma_main.c @@ -20,7 +20,6 @@ #include "hw/pci/pci_ids.h" #include "hw/pci/msi.h" #include "hw/pci/msix.h" -#include "hw/qdev-core.h" #include "hw/qdev-properties.h" #include "cpu.h" #include "trace.h" diff --git a/hw/riscv/riscv_hart.c b/hw/riscv/riscv_hart.c index 61bd4d5170..d0f3199968 100644 --- a/hw/riscv/riscv_hart.c +++ b/hw/riscv/riscv_hart.c @@ -24,6 +24,7 @@ #include "sysemu/reset.h" #include "hw/sysbus.h" #include "target/riscv/cpu.h" +#include "hw/qdev-properties.h" #include "hw/riscv/riscv_hart.h" static Property riscv_harts_props[] = { diff --git a/hw/riscv/sifive_clint.c b/hw/riscv/sifive_clint.c index 591d70deb3..e5a8f75cee 100644 --- a/hw/riscv/sifive_clint.c +++ b/hw/riscv/sifive_clint.c @@ -24,6 +24,7 @@ #include "qemu/module.h" #include "hw/sysbus.h" #include "target/riscv/cpu.h" +#include "hw/qdev-properties.h" #include "hw/riscv/sifive_clint.h" #include "qemu/timer.h" diff --git a/hw/riscv/sifive_plic.c b/hw/riscv/sifive_plic.c index 0950e89e15..64a1a10380 100644 --- a/hw/riscv/sifive_plic.c +++ b/hw/riscv/sifive_plic.c @@ -25,6 +25,7 @@ #include "hw/sysbus.h" #include "hw/pci/msi.h" #include "hw/boards.h" +#include "hw/qdev-properties.h" #include "target/riscv/cpu.h" #include "sysemu/sysemu.h" #include "hw/riscv/sifive_plic.h" diff --git a/hw/riscv/sifive_prci.c b/hw/riscv/sifive_prci.c index 562bc3dc4c..9837b6166f 100644 --- a/hw/riscv/sifive_prci.c +++ b/hw/riscv/sifive_prci.c @@ -19,6 +19,7 @@ */ #include "qemu/osdep.h" +#include "hw/hw.h" #include "hw/sysbus.h" #include "qemu/module.h" #include "target/riscv/cpu.h" diff --git a/hw/riscv/sifive_test.c b/hw/riscv/sifive_test.c index 3a14f9f8b6..afbb3aaf34 100644 --- a/hw/riscv/sifive_test.c +++ b/hw/riscv/sifive_test.c @@ -19,6 +19,7 @@ */ #include "qemu/osdep.h" +#include "hw/hw.h" #include "hw/sysbus.h" #include "qemu/module.h" #include "target/riscv/cpu.h" diff --git a/hw/s390x/3270-ccw.c b/hw/s390x/3270-ccw.c index 14882242c3..c19a75b9b7 100644 --- a/hw/s390x/3270-ccw.c +++ b/hw/s390x/3270-ccw.c @@ -9,12 +9,14 @@ * your option) any later version. See the COPYING file in the top-level * directory. */ + #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/module.h" #include "cpu.h" #include "hw/s390x/css.h" #include "hw/s390x/css-bridge.h" +#include "hw/qdev-properties.h" #include "hw/s390x/3270-ccw.h" /* Handle READ ccw commands from guest */ diff --git a/hw/s390x/ap-device.c b/hw/s390x/ap-device.c index f5ac8db968..fc0b41e937 100644 --- a/hw/s390x/ap-device.c +++ b/hw/s390x/ap-device.c @@ -10,7 +10,6 @@ #include "qemu/osdep.h" #include "qemu/module.h" #include "qapi/error.h" -#include "hw/qdev.h" #include "hw/s390x/ap-device.h" static void ap_class_init(ObjectClass *klass, void *data) diff --git a/hw/s390x/ccw-device.c b/hw/s390x/ccw-device.c index 24f17bb6ca..4d222ad202 100644 --- a/hw/s390x/ccw-device.c +++ b/hw/s390x/ccw-device.c @@ -11,6 +11,7 @@ #include "qemu/osdep.h" #include "ccw-device.h" +#include "hw/qdev-properties.h" #include "qemu/module.h" static void ccw_device_refill_ids(CcwDevice *dev) diff --git a/hw/s390x/css-bridge.c b/hw/s390x/css-bridge.c index 4e9ff481e8..15a8ed96de 100644 --- a/hw/s390x/css-bridge.c +++ b/hw/s390x/css-bridge.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/hotplug.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "qemu/bitops.h" #include "qemu/module.h" diff --git a/hw/s390x/css.c b/hw/s390x/css.c index b92395f165..844caab408 100644 --- a/hw/s390x/css.c +++ b/hw/s390x/css.c @@ -12,12 +12,12 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qapi/visitor.h" -#include "hw/qdev.h" #include "qemu/bitops.h" #include "qemu/error-report.h" #include "exec/address-spaces.h" #include "cpu.h" #include "hw/s390x/ioinst.h" +#include "hw/qdev-properties.h" #include "hw/s390x/css.h" #include "trace.h" #include "hw/s390x/s390_flic.h" diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index 2e5ce11a6b..304063cbe0 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -20,6 +20,7 @@ #include "cpu.h" #include "elf.h" #include "hw/loader.h" +#include "hw/qdev-properties.h" #include "hw/boards.h" #include "hw/s390x/virtio-ccw.h" #include "hw/s390x/vfio-ccw.h" diff --git a/hw/s390x/ipl.h b/hw/s390x/ipl.h index b3a07a12d8..d4813105db 100644 --- a/hw/s390x/ipl.h +++ b/hw/s390x/ipl.h @@ -12,8 +12,8 @@ #ifndef HW_S390_IPL_H #define HW_S390_IPL_H -#include "hw/qdev.h" #include "cpu.h" +#include "hw/qdev-core.h" struct IplBlockCcw { uint8_t reserved0[85]; diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c index 2c6e084e2c..963a41c7f5 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -18,6 +18,7 @@ #include "s390-pci-bus.h" #include "s390-pci-inst.h" #include "hw/pci/pci_bus.h" +#include "hw/qdev-properties.h" #include "hw/pci/pci_bridge.h" #include "hw/pci/msi.h" #include "qemu/error-report.h" diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 4ffdd53a85..a543b64e56 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -38,6 +38,7 @@ #include "migration/register.h" #include "cpu_models.h" #include "hw/nmi.h" +#include "hw/qdev-properties.h" #include "hw/s390x/tod.h" S390CPU *s390_cpu_addr2state(uint16_t cpu_addr) diff --git a/hw/s390x/sclpquiesce.c b/hw/s390x/sclpquiesce.c index 6dfb087568..f56273ca4b 100644 --- a/hw/s390x/sclpquiesce.c +++ b/hw/s390x/sclpquiesce.c @@ -13,7 +13,6 @@ */ #include "qemu/osdep.h" -#include "hw/qdev.h" #include "sysemu/sysemu.h" #include "hw/s390x/sclp.h" #include "migration/vmstate.h" diff --git a/hw/s390x/vhost-vsock-ccw.c b/hw/s390x/vhost-vsock-ccw.c index 076f733390..1835812bd1 100644 --- a/hw/s390x/vhost-vsock-ccw.c +++ b/hw/s390x/vhost-vsock-ccw.c @@ -7,6 +7,7 @@ */ #include "qemu/osdep.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/s390x/virtio-ccw-9p.c b/hw/s390x/virtio-ccw-9p.c index 67b2c537cc..5453a964d2 100644 --- a/hw/s390x/virtio-ccw-9p.c +++ b/hw/s390x/virtio-ccw-9p.c @@ -10,6 +10,7 @@ */ #include "qemu/osdep.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/s390x/virtio-ccw-balloon.c b/hw/s390x/virtio-ccw-balloon.c index 35e43e89fb..7088612f6b 100644 --- a/hw/s390x/virtio-ccw-balloon.c +++ b/hw/s390x/virtio-ccw-balloon.c @@ -10,6 +10,7 @@ */ #include "qemu/osdep.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/s390x/virtio-ccw-blk.c b/hw/s390x/virtio-ccw-blk.c index 83636cb6d7..1512af8974 100644 --- a/hw/s390x/virtio-ccw-blk.c +++ b/hw/s390x/virtio-ccw-blk.c @@ -10,6 +10,7 @@ */ #include "qemu/osdep.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/s390x/virtio-ccw-crypto.c b/hw/s390x/virtio-ccw-crypto.c index 4569fe0649..086b397ad2 100644 --- a/hw/s390x/virtio-ccw-crypto.c +++ b/hw/s390x/virtio-ccw-crypto.c @@ -9,6 +9,7 @@ */ #include "qemu/osdep.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/s390x/virtio-ccw-gpu.c b/hw/s390x/virtio-ccw-gpu.c index 10ee4b86eb..be46ca7a96 100644 --- a/hw/s390x/virtio-ccw-gpu.c +++ b/hw/s390x/virtio-ccw-gpu.c @@ -9,6 +9,7 @@ */ #include "qemu/osdep.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/s390x/virtio-ccw-input.c b/hw/s390x/virtio-ccw-input.c index 075bb094ee..370b776790 100644 --- a/hw/s390x/virtio-ccw-input.c +++ b/hw/s390x/virtio-ccw-input.c @@ -9,6 +9,7 @@ */ #include "qemu/osdep.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/s390x/virtio-ccw-net.c b/hw/s390x/virtio-ccw-net.c index 8ff184265e..12c03d73c4 100644 --- a/hw/s390x/virtio-ccw-net.c +++ b/hw/s390x/virtio-ccw-net.c @@ -10,6 +10,7 @@ */ #include "qemu/osdep.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/s390x/virtio-ccw-rng.c b/hw/s390x/virtio-ccw-rng.c index dc60f084a5..854254dd50 100644 --- a/hw/s390x/virtio-ccw-rng.c +++ b/hw/s390x/virtio-ccw-rng.c @@ -10,6 +10,7 @@ */ #include "qemu/osdep.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/s390x/virtio-ccw-scsi.c b/hw/s390x/virtio-ccw-scsi.c index 26fa086ef0..4662288b5b 100644 --- a/hw/s390x/virtio-ccw-scsi.c +++ b/hw/s390x/virtio-ccw-scsi.c @@ -10,6 +10,7 @@ */ #include "qemu/osdep.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/s390x/virtio-ccw-serial.c b/hw/s390x/virtio-ccw-serial.c index 8cf5a529a5..eafb7d5c1f 100644 --- a/hw/s390x/virtio-ccw-serial.c +++ b/hw/s390x/virtio-ccw-serial.c @@ -12,6 +12,7 @@ #include "qemu/osdep.h" #include "hw/virtio/virtio.h" #include "qemu/module.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio-serial.h" #include "virtio-ccw.h" diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index 3706294a85..de9bd20887 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -21,6 +21,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "sysemu/dma.h" #include "sysemu/block-backend.h" #include "hw/pci/msi.h" diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c index efa54a30c5..b8a4b37cf3 100644 --- a/hw/scsi/mptsas.c +++ b/hw/scsi/mptsas.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "sysemu/dma.h" #include "hw/pci/msi.h" #include "qemu/iov.h" diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index 1f9914739a..db785e6001 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -3,11 +3,11 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "qemu/option.h" +#include "hw/qdev-properties.h" #include "hw/scsi/scsi.h" #include "migration/qemu-file-types.h" #include "migration/vmstate.h" #include "scsi/constants.h" -#include "hw/qdev.h" #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" #include "trace.h" diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index 3a2ef2ddc3..2f30f4b206 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -34,6 +34,7 @@ #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" #include "hw/block/block.h" +#include "hw/qdev-properties.h" #include "sysemu/dma.h" #include "qemu/cutils.h" #include "trace.h" diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c index 6883cbb0ca..9f1c1d45ae 100644 --- a/hw/scsi/scsi-generic.c +++ b/hw/scsi/scsi-generic.c @@ -18,6 +18,7 @@ #include "qemu/module.h" #include "hw/scsi/scsi.h" #include "migration/qemu-file-types.h" +#include "hw/qdev-properties.h" #include "hw/scsi/emulation.h" #include "sysemu/block-backend.h" #include "trace.h" diff --git a/hw/scsi/spapr_vscsi.c b/hw/scsi/spapr_vscsi.c index fedeec676d..2120ceb051 100644 --- a/hw/scsi/spapr_vscsi.c +++ b/hw/scsi/spapr_vscsi.c @@ -39,9 +39,9 @@ #include "migration/vmstate.h" #include "scsi/constants.h" #include "srp.h" -#include "hw/qdev.h" #include "hw/ppc/spapr.h" #include "hw/ppc/spapr_vio.h" +#include "hw/qdev-properties.h" #include "viosrp.h" #include "trace.h" diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c index 1fe6c9caef..fc25fb87a2 100644 --- a/hw/scsi/vhost-scsi.c +++ b/hw/scsi/vhost-scsi.c @@ -28,6 +28,7 @@ #include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-access.h" #include "hw/fw-path-provider.h" +#include "hw/qdev-properties.h" #include "qemu/cutils.h" /* Features supported by host kernel. */ diff --git a/hw/scsi/vhost-user-scsi.c b/hw/scsi/vhost-user-scsi.c index a9fd8ea305..0bb8e0dfdd 100644 --- a/hw/scsi/vhost-user-scsi.c +++ b/hw/scsi/vhost-user-scsi.c @@ -21,6 +21,7 @@ #include "qom/object.h" #include "hw/fw-path-provider.h" #include "hw/qdev-core.h" +#include "hw/qdev-properties.h" #include "hw/virtio/vhost.h" #include "hw/virtio/vhost-backend.h" #include "hw/virtio/vhost-user-scsi.h" diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c index 06a3cbcbda..7e987a274c 100644 --- a/hw/scsi/virtio-scsi.c +++ b/hw/scsi/virtio-scsi.c @@ -22,6 +22,7 @@ #include "qemu/iov.h" #include "qemu/module.h" #include "sysemu/block-backend.h" +#include "hw/qdev-properties.h" #include "hw/scsi/scsi.h" #include "scsi/constants.h" #include "hw/virtio/virtio-bus.h" diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c index 7e27bce43e..452a3b63b2 100644 --- a/hw/scsi/vmw_pvscsi.c +++ b/hw/scsi/vmw_pvscsi.c @@ -33,6 +33,7 @@ #include "migration/vmstate.h" #include "scsi/constants.h" #include "hw/pci/msi.h" +#include "hw/qdev-properties.h" #include "vmw_pvscsi.h" #include "trace.h" diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c index e3c7cf5b5f..79a9a5c52c 100644 --- a/hw/sd/milkymist-memcard.c +++ b/hw/sd/milkymist-memcard.c @@ -31,6 +31,7 @@ #include "qapi/error.h" #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" +#include "hw/qdev-properties.h" #include "hw/sd/sd.h" enum { diff --git a/hw/sd/pxa2xx_mmci.c b/hw/sd/pxa2xx_mmci.c index db2f2adf58..8f9ab0ec16 100644 --- a/hw/sd/pxa2xx_mmci.c +++ b/hw/sd/pxa2xx_mmci.c @@ -17,7 +17,6 @@ #include "migration/vmstate.h" #include "hw/arm/pxa.h" #include "hw/sd/sd.h" -#include "hw/qdev.h" #include "hw/qdev-properties.h" #include "qemu/error-report.h" #include "qemu/log.h" diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 3f26b38786..49b83576e7 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -32,7 +32,6 @@ #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/qdev.h" #include "hw/irq.h" #include "hw/registerfields.h" #include "sysemu/block-backend.h" diff --git a/hw/sd/sdhci-internal.h b/hw/sd/sdhci-internal.h index 34141400f8..1d9053c183 100644 --- a/hw/sd/sdhci-internal.h +++ b/hw/sd/sdhci-internal.h @@ -21,6 +21,7 @@ * You should have received a copy of the GNU General Public License along * with this program; if not, see . */ + #ifndef SDHCI_INTERNAL_H #define SDHCI_INTERNAL_H diff --git a/hw/sd/sdhci-pci.c b/hw/sd/sdhci-pci.c index 438cb30af5..2c8d8f59b5 100644 --- a/hw/sd/sdhci-pci.c +++ b/hw/sd/sdhci-pci.c @@ -18,6 +18,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/module.h" +#include "hw/qdev-properties.h" #include "hw/sd/sdhci.h" #include "sdhci-internal.h" diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 1adc16e3e9..e08ec3e398 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -27,6 +27,7 @@ #include "qemu/error-report.h" #include "qapi/error.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "sysemu/dma.h" #include "qemu/timer.h" #include "qemu/bitops.h" diff --git a/hw/sd/ssi-sd.c b/hw/sd/ssi-sd.c index 571aabea5c..91db069212 100644 --- a/hw/sd/ssi-sd.c +++ b/hw/sd/ssi-sd.c @@ -14,6 +14,7 @@ #include "sysemu/blockdev.h" #include "hw/ssi/ssi.h" #include "migration/vmstate.h" +#include "hw/qdev-properties.h" #include "hw/sd/sd.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c index 571e594304..b421b3bc83 100644 --- a/hw/sh4/r2d.c +++ b/hw/sh4/r2d.c @@ -33,6 +33,7 @@ #include "sysemu/sysemu.h" #include "hw/boards.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "net/net.h" #include "sh7750_regs.h" #include "hw/ide.h" diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c index 655939a3f1..c5f1b1ee72 100644 --- a/hw/sparc/leon3.c +++ b/hw/sparc/leon3.c @@ -31,6 +31,7 @@ #include "hw/irq.h" #include "qemu/timer.h" #include "hw/ptimer.h" +#include "hw/qdev-properties.h" #include "sysemu/sysemu.h" #include "sysemu/qtest.h" #include "sysemu/reset.h" diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 99b8693a0c..267895b93e 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -41,6 +41,7 @@ #include "hw/boards.h" #include "hw/scsi/esp.h" #include "hw/nvram/sun_nvram.h" +#include "hw/qdev-properties.h" #include "hw/nvram/chrp_nvram.h" #include "hw/nvram/fw_cfg.h" #include "hw/char/escc.h" diff --git a/hw/sparc/sun4m_iommu.c b/hw/sparc/sun4m_iommu.c index a5681ded6a..ccf46a5147 100644 --- a/hw/sparc/sun4m_iommu.c +++ b/hw/sparc/sun4m_iommu.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/sparc/sun4m_iommu.h" #include "hw/sysbus.h" #include "migration/vmstate.h" diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index 54a385970c..08e12aa88b 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -32,6 +32,7 @@ #include "hw/pci/pci_bridge.h" #include "hw/pci/pci_bus.h" #include "hw/pci/pci_host.h" +#include "hw/qdev-properties.h" #include "hw/pci-host/sabre.h" #include "hw/char/serial.h" #include "hw/char/parallel.h" diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c index 7ace5780a3..b8332150f1 100644 --- a/hw/ssi/aspeed_smc.c +++ b/hw/ssi/aspeed_smc.c @@ -31,6 +31,7 @@ #include "qemu/error-report.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/ssi/aspeed_smc.h" /* CE Type Setting Register */ diff --git a/hw/ssi/xilinx_spi.c b/hw/ssi/xilinx_spi.c index 081433c2f0..24280dfeab 100644 --- a/hw/ssi/xilinx_spi.c +++ b/hw/ssi/xilinx_spi.c @@ -33,6 +33,7 @@ #include "qemu/fifo8.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/ssi/ssi.h" #ifdef XILINX_SPI_ERR_DEBUG diff --git a/hw/ssi/xilinx_spips.c b/hw/ssi/xilinx_spips.c index a28cd8f8f0..1605fa102b 100644 --- a/hw/ssi/xilinx_spips.c +++ b/hw/ssi/xilinx_spips.c @@ -27,6 +27,7 @@ #include "sysemu/sysemu.h" #include "hw/irq.h" #include "hw/ptimer.h" +#include "hw/qdev-properties.h" #include "qemu/log.h" #include "qemu/module.h" #include "qemu/bitops.h" diff --git a/hw/timer/a9gtimer.c b/hw/timer/a9gtimer.c index 0339b92cf8..75f1867174 100644 --- a/hw/timer/a9gtimer.c +++ b/hw/timer/a9gtimer.c @@ -23,6 +23,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/timer/a9gtimer.h" #include "migration/vmstate.h" #include "qapi/error.h" diff --git a/hw/timer/allwinner-a10-pit.c b/hw/timer/allwinner-a10-pit.c index 904da4fc88..1e1f74f1a1 100644 --- a/hw/timer/allwinner-a10-pit.c +++ b/hw/timer/allwinner-a10-pit.c @@ -17,6 +17,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "sysemu/sysemu.h" #include "hw/timer/allwinner-a10-pit.h" diff --git a/hw/timer/altera_timer.c b/hw/timer/altera_timer.c index 51971e44ca..c9988f67ac 100644 --- a/hw/timer/altera_timer.c +++ b/hw/timer/altera_timer.c @@ -27,6 +27,7 @@ #include "sysemu/sysemu.h" #include "hw/irq.h" #include "hw/ptimer.h" +#include "hw/qdev-properties.h" #define R_STATUS 0 #define R_CONTROL 1 diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c index abfc5baa77..983e61847e 100644 --- a/hw/timer/arm_mptimer.c +++ b/hw/timer/arm_mptimer.c @@ -23,6 +23,7 @@ #include "hw/hw.h" #include "hw/irq.h" #include "hw/ptimer.h" +#include "hw/qdev-properties.h" #include "hw/timer/arm_mptimer.h" #include "migration/vmstate.h" #include "qapi/error.h" diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c index 0b121252fd..c2e6211188 100644 --- a/hw/timer/arm_timer.c +++ b/hw/timer/arm_timer.c @@ -11,9 +11,9 @@ #include "hw/sysbus.h" #include "migration/vmstate.h" #include "qemu/timer.h" -#include "hw/qdev.h" #include "hw/irq.h" #include "hw/ptimer.h" +#include "hw/qdev-properties.h" #include "qemu/main-loop.h" #include "qemu/module.h" #include "qemu/log.h" diff --git a/hw/timer/cmsdk-apb-dualtimer.c b/hw/timer/cmsdk-apb-dualtimer.c index 6a084a91dd..5e2352dd32 100644 --- a/hw/timer/cmsdk-apb-dualtimer.c +++ b/hw/timer/cmsdk-apb-dualtimer.c @@ -24,6 +24,7 @@ #include "qemu/module.h" #include "hw/sysbus.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/registerfields.h" #include "hw/timer/cmsdk-apb-dualtimer.h" #include "migration/vmstate.h" diff --git a/hw/timer/exynos4210_mct.c b/hw/timer/exynos4210_mct.c index 79b291863c..77b9af05f4 100644 --- a/hw/timer/exynos4210_mct.c +++ b/hw/timer/exynos4210_mct.c @@ -54,6 +54,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" +#include "hw/hw.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "qemu/timer.h" diff --git a/hw/timer/grlib_gptimer.c b/hw/timer/grlib_gptimer.c index 28ba1259d0..32dbf870d4 100644 --- a/hw/timer/grlib_gptimer.c +++ b/hw/timer/grlib_gptimer.c @@ -28,6 +28,7 @@ #include "qemu/timer.h" #include "hw/irq.h" #include "hw/ptimer.h" +#include "hw/qdev-properties.h" #include "qemu/main-loop.h" #include "qemu/module.h" diff --git a/hw/timer/lm32_timer.c b/hw/timer/lm32_timer.c index a381e39f0a..ac3edaff4f 100644 --- a/hw/timer/lm32_timer.c +++ b/hw/timer/lm32_timer.c @@ -28,6 +28,7 @@ #include "trace.h" #include "qemu/timer.h" #include "hw/ptimer.h" +#include "hw/qdev-properties.h" #include "qemu/error-report.h" #include "qemu/main-loop.h" #include "qemu/module.h" diff --git a/hw/timer/m48t59-isa.c b/hw/timer/m48t59-isa.c index cbc5e61ddd..5e5432abfd 100644 --- a/hw/timer/m48t59-isa.c +++ b/hw/timer/m48t59-isa.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/isa/isa.h" +#include "hw/qdev-properties.h" #include "hw/timer/m48t59.h" #include "m48t59-internal.h" #include "qemu/module.h" diff --git a/hw/timer/m48t59.c b/hw/timer/m48t59.c index 199003030a..56f9dfa8dd 100644 --- a/hw/timer/m48t59.c +++ b/hw/timer/m48t59.c @@ -26,6 +26,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/timer/m48t59.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index 473935339d..5aa584c080 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -28,6 +28,7 @@ #include "qemu/module.h" #include "qemu/bcd.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" #include "sysemu/replay.h" diff --git a/hw/timer/milkymist-sysctl.c b/hw/timer/milkymist-sysctl.c index 4d75d73a93..a65c174c04 100644 --- a/hw/timer/milkymist-sysctl.c +++ b/hw/timer/milkymist-sysctl.c @@ -29,6 +29,7 @@ #include "trace.h" #include "qemu/timer.h" #include "hw/ptimer.h" +#include "hw/qdev-properties.h" #include "qemu/error-report.h" #include "qemu/main-loop.h" #include "qemu/module.h" diff --git a/hw/timer/mss-timer.c b/hw/timer/mss-timer.c index 084e02199d..45f1cf42f9 100644 --- a/hw/timer/mss-timer.c +++ b/hw/timer/mss-timer.c @@ -28,6 +28,7 @@ #include "qemu/module.h" #include "qemu/log.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/timer/mss-timer.h" #include "migration/vmstate.h" diff --git a/hw/timer/pl031.c b/hw/timer/pl031.c index 39abd08643..2b3e261006 100644 --- a/hw/timer/pl031.c +++ b/hw/timer/pl031.c @@ -16,6 +16,7 @@ #include "hw/timer/pl031.h" #include "migration/vmstate.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" diff --git a/hw/timer/pxa2xx_timer.c b/hw/timer/pxa2xx_timer.c index 99e6c1e250..af7e4dbcbd 100644 --- a/hw/timer/pxa2xx_timer.c +++ b/hw/timer/pxa2xx_timer.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" #include "hw/arm/pxa.h" diff --git a/hw/timer/slavio_timer.c b/hw/timer/slavio_timer.c index 931ffd483f..38fd32b62a 100644 --- a/hw/timer/slavio_timer.c +++ b/hw/timer/slavio_timer.c @@ -26,6 +26,7 @@ #include "qemu/timer.h" #include "hw/irq.h" #include "hw/ptimer.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "trace.h" diff --git a/hw/timer/stm32f2xx_timer.c b/hw/timer/stm32f2xx_timer.c index b41822f047..edc557a4b9 100644 --- a/hw/timer/stm32f2xx_timer.c +++ b/hw/timer/stm32f2xx_timer.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/timer/stm32f2xx_timer.h" #include "migration/vmstate.h" #include "qemu/log.h" diff --git a/hw/timer/xilinx_timer.c b/hw/timer/xilinx_timer.c index c4a83af8b9..355518232c 100644 --- a/hw/timer/xilinx_timer.c +++ b/hw/timer/xilinx_timer.c @@ -26,6 +26,7 @@ #include "hw/sysbus.h" #include "hw/irq.h" #include "hw/ptimer.h" +#include "hw/qdev-properties.h" #include "qemu/log.h" #include "qemu/main-loop.h" #include "qemu/module.h" diff --git a/hw/tpm/tpm_crb.c b/hw/tpm/tpm_crb.c index 5e2db9e0c4..c37affe656 100644 --- a/hw/tpm/tpm_crb.c +++ b/hw/tpm/tpm_crb.c @@ -19,8 +19,6 @@ #include "qemu/module.h" #include "qapi/error.h" #include "exec/address-spaces.h" - -#include "hw/qdev-core.h" #include "hw/qdev-properties.h" #include "hw/pci/pci_ids.h" #include "hw/acpi/tpm.h" diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c index 3370d667ab..2900a098ad 100644 --- a/hw/tpm/tpm_tis.c +++ b/hw/tpm/tpm_tis.c @@ -30,6 +30,7 @@ #include "hw/acpi/tpm.h" #include "hw/pci/pci_ids.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "sysemu/tpm_backend.h" #include "tpm_int.h" diff --git a/hw/tpm/tpm_util.c b/hw/tpm/tpm_util.c index ee41757ea2..62b091f0c0 100644 --- a/hw/tpm/tpm_util.c +++ b/hw/tpm/tpm_util.c @@ -26,8 +26,8 @@ #include "tpm_util.h" #include "tpm_int.h" #include "exec/memory.h" +#include "hw/qdev-properties.h" #include "sysemu/tpm_backend.h" -#include "hw/qdev.h" #include "trace.h" /* tpm backend property */ diff --git a/hw/usb/bus.c b/hw/usb/bus.c index be18221ac6..a6522f5429 100644 --- a/hw/usb/bus.c +++ b/hw/usb/bus.c @@ -1,6 +1,6 @@ #include "qemu/osdep.h" +#include "hw/qdev-properties.h" #include "hw/usb.h" -#include "hw/qdev.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/module.h" diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c index e20f8ed293..291e41db8a 100644 --- a/hw/usb/ccid-card-emulated.c +++ b/hw/usb/ccid-card-emulated.c @@ -33,6 +33,7 @@ #include "qemu/main-loop.h" #include "qemu/module.h" #include "ccid.h" +#include "hw/qdev-properties.h" #include "qapi/error.h" #define DPRINTF(card, lvl, fmt, ...) \ diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c index 9e42547fc8..267ed9a8a0 100644 --- a/hw/usb/ccid-card-passthru.c +++ b/hw/usb/ccid-card-passthru.c @@ -13,6 +13,7 @@ #include "qemu/units.h" #include #include "chardev/char-fe.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/error-report.h" #include "qemu/module.h" diff --git a/hw/usb/ccid.h b/hw/usb/ccid.h index 3920733f13..bb2fdbfff3 100644 --- a/hw/usb/ccid.h +++ b/hw/usb/ccid.h @@ -10,7 +10,7 @@ #ifndef CCID_H #define CCID_H -#include "hw/qdev.h" +#include "hw/qdev-core.h" typedef struct CCIDCardState CCIDCardState; typedef struct CCIDCardInfo CCIDCardInfo; diff --git a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c index c0f35c58d5..d3ca3bd1ab 100644 --- a/hw/usb/dev-audio.c +++ b/hw/usb/dev-audio.c @@ -31,6 +31,7 @@ #include "qemu/osdep.h" #include "qemu/module.h" +#include "hw/qdev-properties.h" #include "hw/usb.h" #include "migration/vmstate.h" #include "desc.h" diff --git a/hw/usb/dev-hid.c b/hw/usb/dev-hid.c index 79b3be3c3f..88492f26e6 100644 --- a/hw/usb/dev-hid.c +++ b/hw/usb/dev-hid.c @@ -32,6 +32,7 @@ #include "qemu/module.h" #include "qemu/timer.h" #include "hw/input/hid.h" +#include "hw/qdev-properties.h" /* HID interface requests */ #define GET_REPORT 0xa101 diff --git a/hw/usb/dev-hub.c b/hw/usb/dev-hub.c index 886423bdec..07ecfefc12 100644 --- a/hw/usb/dev-hub.c +++ b/hw/usb/dev-hub.c @@ -26,6 +26,7 @@ #include "qapi/error.h" #include "qemu/timer.h" #include "trace.h" +#include "hw/qdev-properties.h" #include "hw/usb.h" #include "migration/vmstate.h" #include "desc.h" diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index 2e2a47ff7c..9846e4b513 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -23,6 +23,7 @@ #include "qemu/module.h" #include "qemu/filemonitor.h" #include "trace.h" +#include "hw/qdev-properties.h" #include "hw/usb.h" #include "migration/vmstate.h" #include "desc.h" diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c index db928d7cdf..5de6213cc4 100644 --- a/hw/usb/dev-network.c +++ b/hw/usb/dev-network.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "hw/qdev-properties.h" #include "hw/usb.h" #include "migration/vmstate.h" #include "desc.h" diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c index 039dc4889f..45cc74128a 100644 --- a/hw/usb/dev-serial.c +++ b/hw/usb/dev-serial.c @@ -13,6 +13,7 @@ #include "qemu/cutils.h" #include "qemu/error-report.h" #include "qemu/module.h" +#include "hw/qdev-properties.h" #include "hw/usb.h" #include "migration/vmstate.h" #include "desc.h" diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c index 57a0cbcae7..4568db2568 100644 --- a/hw/usb/dev-smartcard-reader.c +++ b/hw/usb/dev-smartcard-reader.c @@ -40,6 +40,7 @@ #include "qemu-common.h" #include "qemu/error-report.h" #include "qemu/module.h" +#include "hw/qdev-properties.h" #include "hw/usb.h" #include "migration/vmstate.h" #include "desc.h" diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c index 8bc5d8728a..8545193488 100644 --- a/hw/usb/dev-storage.c +++ b/hw/usb/dev-storage.c @@ -15,6 +15,7 @@ #include "qemu/config-file.h" #include "hw/usb.h" #include "desc.h" +#include "hw/qdev-properties.h" #include "hw/scsi/scsi.h" #include "ui/console.h" #include "migration/vmstate.h" diff --git a/hw/usb/dev-uas.c b/hw/usb/dev-uas.c index c7d215d4ef..6d6d1073b9 100644 --- a/hw/usb/dev-uas.c +++ b/hw/usb/dev-uas.c @@ -20,6 +20,7 @@ #include "hw/usb.h" #include "migration/vmstate.h" #include "desc.h" +#include "hw/qdev-properties.h" #include "hw/scsi/scsi.h" #include "scsi/constants.h" diff --git a/hw/usb/hcd-ehci-pci.c b/hw/usb/hcd-ehci-pci.c index 7232dee882..5b9a8d3dc1 100644 --- a/hw/usb/hcd-ehci-pci.c +++ b/hw/usb/hcd-ehci-pci.c @@ -16,6 +16,7 @@ */ #include "qemu/osdep.h" +#include "hw/qdev-properties.h" #include "hw/usb/hcd-ehci.h" #include "migration/vmstate.h" #include "qemu/module.h" diff --git a/hw/usb/hcd-ehci-sysbus.c b/hw/usb/hcd-ehci-sysbus.c index 9a509f3b08..020211fd10 100644 --- a/hw/usb/hcd-ehci-sysbus.c +++ b/hw/usb/hcd-ehci-sysbus.c @@ -16,6 +16,7 @@ */ #include "qemu/osdep.h" +#include "hw/qdev-properties.h" #include "hw/usb/hcd-ehci.h" #include "migration/vmstate.h" #include "qemu/module.h" diff --git a/hw/usb/hcd-ohci-pci.c b/hw/usb/hcd-ohci-pci.c index 25b0ced804..c052f10521 100644 --- a/hw/usb/hcd-ohci-pci.c +++ b/hw/usb/hcd-ohci-pci.c @@ -26,6 +26,7 @@ #include "hw/pci/pci.h" #include "hw/sysbus.h" #include "hw/qdev-dma.h" +#include "hw/qdev-properties.h" #include "trace.h" #include "hcd-ohci.h" diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c index 94b3410d3c..145ee21fd6 100644 --- a/hw/usb/hcd-ohci.c +++ b/hw/usb/hcd-ohci.c @@ -34,6 +34,7 @@ #include "migration/vmstate.h" #include "hw/sysbus.h" #include "hw/qdev-dma.h" +#include "hw/qdev-properties.h" #include "trace.h" #include "hcd-ohci.h" diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c index 7c6edd17b4..23507ad3b5 100644 --- a/hw/usb/hcd-uhci.c +++ b/hw/usb/hcd-uhci.c @@ -31,6 +31,7 @@ #include "hw/usb/uhci-regs.h" #include "migration/vmstate.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "qapi/error.h" #include "qemu/timer.h" #include "qemu/iov.h" diff --git a/hw/usb/hcd-xhci-nec.c b/hw/usb/hcd-xhci-nec.c index aba3716875..05fb3f54b3 100644 --- a/hw/usb/hcd-xhci-nec.c +++ b/hw/usb/hcd-xhci-nec.c @@ -23,6 +23,7 @@ #include "hw/usb.h" #include "qemu/module.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "hcd-xhci.h" diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index d60ad895a3..f698224c8a 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -26,6 +26,7 @@ #include "hw/usb.h" #include "migration/vmstate.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "hw/pci/msi.h" #include "hw/pci/msix.h" #include "trace.h" diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c index c043487298..80fd1e9a80 100644 --- a/hw/usb/host-libusb.c +++ b/hw/usb/host-libusb.c @@ -48,6 +48,7 @@ #include "sysemu/sysemu.h" #include "trace.h" +#include "hw/qdev-properties.h" #include "hw/usb.h" /* ------------------------------------------------------------------------ */ diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index 84ec3d5219..8db2c68a1e 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -40,6 +40,7 @@ #include #include +#include "hw/qdev-properties.h" #include "hw/usb.h" #include "migration/qemu-file-types.h" #include "migration/vmstate.h" diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c index 2bfc402037..d53453aad6 100644 --- a/hw/vfio/ap.c +++ b/hw/vfio/ap.c @@ -26,6 +26,7 @@ #include "kvm_s390x.h" #include "migration/vmstate.h" #include "sysemu/sysemu.h" +#include "hw/qdev-properties.h" #include "hw/s390x/ap-bridge.h" #include "exec/address-spaces.h" diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c index c78a85a864..6863f6c69f 100644 --- a/hw/vfio/ccw.c +++ b/hw/vfio/ccw.c @@ -25,6 +25,7 @@ #include "hw/vfio/vfio-common.h" #include "hw/s390x/s390-ccw.h" #include "hw/s390x/vfio-ccw.h" +#include "hw/qdev-properties.h" #include "hw/s390x/ccw-device.h" #include "exec/address-spaces.h" #include "qemu/error-report.h" diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c index 62d765a4ea..f71aace156 100644 --- a/hw/vfio/pci-quirks.c +++ b/hw/vfio/pci-quirks.c @@ -21,6 +21,7 @@ #include #include "hw/hw.h" #include "hw/nvram/fw_cfg.h" +#include "hw/qdev-properties.h" #include "pci.h" #include "trace.h" diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index ab3ee2ca7a..8337af8434 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -26,6 +26,7 @@ #include "hw/pci/msi.h" #include "hw/pci/msix.h" #include "hw/pci/pci_bridge.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/error-report.h" #include "qemu/main-loop.h" diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c index ff5f805d68..d14f6b4a7a 100644 --- a/hw/vfio/platform.c +++ b/hw/vfio/platform.c @@ -33,6 +33,7 @@ #include "trace.h" #include "hw/irq.h" #include "hw/platform-bus.h" +#include "hw/qdev-properties.h" #include "sysemu/kvm.h" /* diff --git a/hw/virtio/vhost-scsi-pci.c b/hw/virtio/vhost-scsi-pci.c index 95a1f32439..e8dfbfc60f 100644 --- a/hw/virtio/vhost-scsi-pci.c +++ b/hw/virtio/vhost-scsi-pci.c @@ -17,6 +17,7 @@ #include "qemu/osdep.h" #include "standard-headers/linux/virtio_pci.h" +#include "hw/qdev-properties.h" #include "hw/virtio/vhost-scsi.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/virtio/vhost-user-blk-pci.c b/hw/virtio/vhost-user-blk-pci.c index ed81614d43..1dc834a3ff 100644 --- a/hw/virtio/vhost-user-blk-pci.c +++ b/hw/virtio/vhost-user-blk-pci.c @@ -22,6 +22,7 @@ #include "hw/virtio/virtio.h" #include "hw/virtio/vhost-user-blk.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/module.h" diff --git a/hw/virtio/vhost-user-scsi-pci.c b/hw/virtio/vhost-user-scsi-pci.c index daeea77ce1..ff13af7030 100644 --- a/hw/virtio/vhost-user-scsi-pci.c +++ b/hw/virtio/vhost-user-scsi-pci.c @@ -22,6 +22,7 @@ #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-scsi.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/module.h" diff --git a/hw/virtio/vhost-vsock-pci.c b/hw/virtio/vhost-vsock-pci.c index c06c9a83b9..4ca097ffff 100644 --- a/hw/virtio/vhost-vsock-pci.c +++ b/hw/virtio/vhost-vsock-pci.c @@ -14,6 +14,7 @@ #include "qemu/osdep.h" #include "virtio-pci.h" +#include "hw/qdev-properties.h" #include "hw/virtio/vhost-vsock.h" #include "qemu/module.h" diff --git a/hw/virtio/vhost-vsock.c b/hw/virtio/vhost-vsock.c index 0371493197..f5744363a8 100644 --- a/hw/virtio/vhost-vsock.c +++ b/hw/virtio/vhost-vsock.c @@ -18,6 +18,7 @@ #include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-access.h" #include "qemu/error-report.h" +#include "hw/qdev-properties.h" #include "hw/virtio/vhost-vsock.h" #include "qemu/iov.h" #include "qemu/module.h" diff --git a/hw/virtio/virtio-9p-pci.c b/hw/virtio/virtio-9p-pci.c index 29c3712feb..22a183cca7 100644 --- a/hw/virtio/virtio-9p-pci.c +++ b/hw/virtio/virtio-9p-pci.c @@ -17,6 +17,7 @@ #include "virtio-pci.h" #include "hw/9pfs/virtio-9p.h" +#include "hw/qdev-properties.h" #include "qemu/module.h" /* diff --git a/hw/virtio/virtio-balloon-pci.c b/hw/virtio/virtio-balloon-pci.c index 7393435a98..69ca057911 100644 --- a/hw/virtio/virtio-balloon-pci.c +++ b/hw/virtio/virtio-balloon-pci.c @@ -15,6 +15,7 @@ #include "qemu/osdep.h" #include "virtio-pci.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio-balloon.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c index e85d1c0d5c..94973aa822 100644 --- a/hw/virtio/virtio-balloon.c +++ b/hw/virtio/virtio-balloon.c @@ -19,6 +19,7 @@ #include "qemu/timer.h" #include "hw/virtio/virtio.h" #include "hw/mem/pc-dimm.h" +#include "hw/qdev-properties.h" #include "sysemu/balloon.h" #include "hw/virtio/virtio-balloon.h" #include "exec/address-spaces.h" diff --git a/hw/virtio/virtio-blk-pci.c b/hw/virtio/virtio-blk-pci.c index d790b07a99..d9b69a5af3 100644 --- a/hw/virtio/virtio-blk-pci.c +++ b/hw/virtio/virtio-blk-pci.c @@ -17,6 +17,7 @@ #include "qemu/osdep.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio-blk.h" #include "virtio-pci.h" #include "qapi/error.h" diff --git a/hw/virtio/virtio-bus.c b/hw/virtio/virtio-bus.c index 207e955996..b2c804292e 100644 --- a/hw/virtio/virtio-bus.c +++ b/hw/virtio/virtio-bus.c @@ -26,7 +26,6 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "qapi/error.h" -#include "hw/qdev.h" #include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio.h" #include "exec/address-spaces.h" diff --git a/hw/virtio/virtio-crypto-pci.c b/hw/virtio/virtio-crypto-pci.c index c8a2317a10..3660d865df 100644 --- a/hw/virtio/virtio-crypto-pci.c +++ b/hw/virtio/virtio-crypto-pci.c @@ -14,6 +14,7 @@ #include "qemu/osdep.h" #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-pci.h" diff --git a/hw/virtio/virtio-crypto.c b/hw/virtio/virtio-crypto.c index dbfaee6d7c..6d42f95a89 100644 --- a/hw/virtio/virtio-crypto.c +++ b/hw/virtio/virtio-crypto.c @@ -15,12 +15,12 @@ #include "qemu/iov.h" #include "qemu/main-loop.h" #include "qemu/module.h" -#include "hw/qdev.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-crypto.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio-access.h" #include "standard-headers/linux/virtio_ids.h" #include "sysemu/cryptodev-vhost.h" diff --git a/hw/virtio/virtio-input-pci.c b/hw/virtio/virtio-input-pci.c index 1c40292abc..dcf0a68046 100644 --- a/hw/virtio/virtio-input-pci.c +++ b/hw/virtio/virtio-input-pci.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "virtio-pci.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio-input.h" #include "qemu/module.h" diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c index 3dc525dea4..eccc795f28 100644 --- a/hw/virtio/virtio-mmio.c +++ b/hw/virtio/virtio-mmio.c @@ -22,6 +22,7 @@ #include "qemu/osdep.h" #include "standard-headers/linux/virtio_mmio.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "hw/virtio/virtio.h" #include "migration/qemu-file-types.h" diff --git a/hw/virtio/virtio-net-pci.c b/hw/virtio/virtio-net-pci.c index 5df36f26bf..f670aed0a7 100644 --- a/hw/virtio/virtio-net-pci.c +++ b/hw/virtio/virtio-net-pci.c @@ -17,6 +17,7 @@ #include "qemu/osdep.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio-net.h" #include "virtio-pci.h" #include "qapi/error.h" diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 1769a70721..a8d1010d4f 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -22,6 +22,7 @@ #include "migration/qemu-file-types.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bus.h" +#include "hw/qdev-properties.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/module.h" diff --git a/hw/virtio/virtio-pmem.c b/hw/virtio/virtio-pmem.c index ca487f63d2..ff1a2ddb36 100644 --- a/hw/virtio/virtio-pmem.c +++ b/hw/virtio/virtio-pmem.c @@ -17,6 +17,7 @@ #include "qemu/error-report.h" #include "qemu/main-loop.h" #include "hw/virtio/virtio-pmem.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio-access.h" #include "standard-headers/linux/virtio_ids.h" #include "standard-headers/linux/virtio_pmem.h" diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c index db6d1d9454..34b4619fd3 100644 --- a/hw/virtio/virtio-rng.c +++ b/hw/virtio/virtio-rng.c @@ -13,8 +13,8 @@ #include "qapi/error.h" #include "qemu/iov.h" #include "qemu/module.h" -#include "hw/qdev.h" #include "hw/virtio/virtio.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio-rng.h" #include "sysemu/rng.h" #include "qom/object_interfaces.h" diff --git a/hw/virtio/virtio-scsi-pci.c b/hw/virtio/virtio-scsi-pci.c index f68f689aee..3c55dc19a1 100644 --- a/hw/virtio/virtio-scsi-pci.c +++ b/hw/virtio/virtio-scsi-pci.c @@ -15,6 +15,7 @@ #include "qemu/osdep.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio-scsi.h" #include "qemu/module.h" #include "virtio-pci.h" diff --git a/hw/virtio/virtio-serial-pci.c b/hw/virtio/virtio-serial-pci.c index ac74b44dae..953abbd13a 100644 --- a/hw/virtio/virtio-serial-pci.c +++ b/hw/virtio/virtio-serial-pci.c @@ -17,6 +17,7 @@ #include "qemu/osdep.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio-serial.h" #include "qemu/module.h" #include "virtio-pci.h" diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index f4c8337930..721dcccc96 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -23,6 +23,7 @@ #include "migration/qemu-file-types.h" #include "qemu/atomic.h" #include "hw/virtio/virtio-bus.h" +#include "hw/qdev-properties.h" #include "hw/virtio/virtio-access.h" #include "sysemu/dma.h" diff --git a/hw/watchdog/cmsdk-apb-watchdog.c b/hw/watchdog/cmsdk-apb-watchdog.c index 3140e91959..6bf43f943f 100644 --- a/hw/watchdog/cmsdk-apb-watchdog.c +++ b/hw/watchdog/cmsdk-apb-watchdog.c @@ -29,6 +29,7 @@ #include "sysemu/watchdog.h" #include "hw/sysbus.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/registerfields.h" #include "hw/watchdog/cmsdk-apb-watchdog.h" #include "migration/vmstate.h" diff --git a/hw/watchdog/wdt_aspeed.c b/hw/watchdog/wdt_aspeed.c index 49415f132d..9b93213417 100644 --- a/hw/watchdog/wdt_aspeed.c +++ b/hw/watchdog/wdt_aspeed.c @@ -15,6 +15,7 @@ #include "qemu/timer.h" #include "sysemu/watchdog.h" #include "hw/misc/aspeed_scu.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "hw/watchdog/wdt_aspeed.h" #include "migration/vmstate.h" diff --git a/hw/xen/xen-bus.c b/hw/xen/xen-bus.c index 3f39a894da..e40500242d 100644 --- a/hw/xen/xen-bus.c +++ b/hw/xen/xen-bus.c @@ -9,6 +9,7 @@ #include "qemu/main-loop.h" #include "qemu/module.h" #include "qemu/uuid.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "hw/xen/xen.h" #include "hw/xen/xen-backend.h" diff --git a/hw/xen/xen-legacy-backend.c b/hw/xen/xen-legacy-backend.c index 47a7c9760a..4412d7aa76 100644 --- a/hw/xen/xen-legacy-backend.c +++ b/hw/xen/xen-legacy-backend.c @@ -27,6 +27,7 @@ #include "hw/sysbus.h" #include "hw/boards.h" +#include "hw/qdev-properties.h" #include "qemu/log.h" #include "qemu/main-loop.h" #include "qapi/error.h" diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index 5539d56c3a..8fbaf2eae9 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -57,6 +57,7 @@ #include #include "hw/pci/pci.h" +#include "hw/qdev-properties.h" #include "hw/xen/xen.h" #include "hw/i386/pc.h" #include "hw/xen/xen-legacy-backend.h" diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c index 83103974ab..62119d2555 100644 --- a/hw/xtensa/xtfpga.c +++ b/hw/xtensa/xtfpga.c @@ -32,6 +32,7 @@ #include "sysemu/sysemu.h" #include "hw/boards.h" #include "hw/loader.h" +#include "hw/qdev-properties.h" #include "elf.h" #include "exec/memory.h" #include "exec/address-spaces.h" diff --git a/include/hw/acpi/acpi_dev_interface.h b/include/hw/acpi/acpi_dev_interface.h index 6465072b7d..0ba90effd2 100644 --- a/include/hw/acpi/acpi_dev_interface.h +++ b/include/hw/acpi/acpi_dev_interface.h @@ -4,6 +4,7 @@ #include "qapi/qapi-types-misc.h" #include "qom/object.h" #include "hw/boards.h" +#include "hw/qdev-core.h" /* These values are part of guest ABI, and can not be changed */ typedef enum { diff --git a/include/hw/acpi/vmgenid.h b/include/hw/acpi/vmgenid.h index 38586ecbdf..c49d913f3e 100644 --- a/include/hw/acpi/vmgenid.h +++ b/include/hw/acpi/vmgenid.h @@ -2,7 +2,7 @@ #define ACPI_VMGENID_H #include "hw/acpi/bios-linker-loader.h" -#include "hw/qdev.h" +#include "hw/qdev-core.h" #include "qemu/uuid.h" #define VMGENID_DEVICE "vmgenid" diff --git a/include/hw/audio/pcspk.h b/include/hw/audio/pcspk.h index 0f5d4f9919..632cce9f68 100644 --- a/include/hw/audio/pcspk.h +++ b/include/hw/audio/pcspk.h @@ -26,6 +26,7 @@ #define HW_PCSPK_H #include "hw/isa/isa.h" +#include "hw/qdev-properties.h" #define TYPE_PC_SPEAKER "isa-pcspk" diff --git a/include/hw/boards.h b/include/hw/boards.h index 3a0be3131a..67e551636a 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -6,7 +6,6 @@ #include "exec/memory.h" #include "sysemu/blockdev.h" #include "sysemu/accel.h" -#include "hw/qdev.h" #include "qapi/qapi-types-machine.h" #include "qemu/module.h" #include "qom/object.h" diff --git a/include/hw/char/cadence_uart.h b/include/hw/char/cadence_uart.h index e1cf33e94c..47cec956c4 100644 --- a/include/hw/char/cadence_uart.h +++ b/include/hw/char/cadence_uart.h @@ -19,6 +19,7 @@ #ifndef CADENCE_UART_H #define CADENCE_UART_H +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "chardev/char-fe.h" #include "qemu/timer.h" diff --git a/include/hw/char/cmsdk-apb-uart.h b/include/hw/char/cmsdk-apb-uart.h index c41fba9a27..3c1b53db4e 100644 --- a/include/hw/char/cmsdk-apb-uart.h +++ b/include/hw/char/cmsdk-apb-uart.h @@ -12,6 +12,7 @@ #ifndef CMSDK_APB_UART_H #define CMSDK_APB_UART_H +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "chardev/char-fe.h" diff --git a/include/hw/char/lm32_juart.h b/include/hw/char/lm32_juart.h index e7c6fb5a3b..6fce278326 100644 --- a/include/hw/char/lm32_juart.h +++ b/include/hw/char/lm32_juart.h @@ -1,7 +1,7 @@ #ifndef QEMU_HW_CHAR_LM32_JUART_H #define QEMU_HW_CHAR_LM32_JUART_H -#include "hw/qdev.h" +#include "hw/qdev-core.h" #define TYPE_LM32_JUART "lm32-juart" diff --git a/include/hw/char/pl011.h b/include/hw/char/pl011.h index dad3cf2912..14187165c6 100644 --- a/include/hw/char/pl011.h +++ b/include/hw/char/pl011.h @@ -15,6 +15,7 @@ #ifndef HW_PL011_H #define HW_PL011_H +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "chardev/char-fe.h" diff --git a/include/hw/char/xilinx_uartlite.h b/include/hw/char/xilinx_uartlite.h index 99d8bbf405..194e2feafe 100644 --- a/include/hw/char/xilinx_uartlite.h +++ b/include/hw/char/xilinx_uartlite.h @@ -15,6 +15,7 @@ #ifndef XILINX_UARTLITE_H #define XILINX_UARTLITE_H +#include "hw/qdev-properties.h" #include "hw/sysbus.h" static inline DeviceState *xilinx_uartlite_create(hwaddr addr, diff --git a/include/hw/cpu/cluster.h b/include/hw/cpu/cluster.h index 01c1e50cd2..a616501a55 100644 --- a/include/hw/cpu/cluster.h +++ b/include/hw/cpu/cluster.h @@ -20,7 +20,7 @@ #ifndef HW_CPU_CLUSTER_H #define HW_CPU_CLUSTER_H -#include "hw/qdev.h" +#include "hw/qdev-core.h" /* * CPU Cluster type diff --git a/include/hw/cpu/core.h b/include/hw/cpu/core.h index b7470644d8..555ad831bb 100644 --- a/include/hw/cpu/core.h +++ b/include/hw/cpu/core.h @@ -9,7 +9,7 @@ #ifndef HW_CPU_CORE_H #define HW_CPU_CORE_H -#include "hw/qdev.h" +#include "hw/qdev-core.h" #define TYPE_CPU_CORE "cpu-core" diff --git a/include/hw/cris/etraxfs.h b/include/hw/cris/etraxfs.h index 494222d315..aa146a2cd8 100644 --- a/include/hw/cris/etraxfs.h +++ b/include/hw/cris/etraxfs.h @@ -27,6 +27,7 @@ #include "net/net.h" #include "hw/cris/etraxfs_dma.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" /* Instantiate an ETRAXFS Ethernet MAC. */ diff --git a/include/hw/display/milkymist_tmu2.h b/include/hw/display/milkymist_tmu2.h index 1fd978dcc5..e3394ff158 100644 --- a/include/hw/display/milkymist_tmu2.h +++ b/include/hw/display/milkymist_tmu2.h @@ -28,7 +28,7 @@ #define HW_DISPLAY_MILKYMIST_TMU2_H #include "exec/hwaddr.h" -#include "hw/qdev.h" +#include "hw/qdev-core.h" #if defined(CONFIG_X11) && defined(CONFIG_OPENGL) DeviceState *milkymist_tmu2_create(hwaddr base, qemu_irq irq); diff --git a/include/hw/i2c/i2c.h b/include/hw/i2c/i2c.h index 75c5bd638b..4117211565 100644 --- a/include/hw/i2c/i2c.h +++ b/include/hw/i2c/i2c.h @@ -1,7 +1,7 @@ #ifndef QEMU_I2C_H #define QEMU_I2C_H -#include "hw/qdev.h" +#include "hw/qdev-core.h" /* The QEMU I2C implementation only supports simple transfers that complete immediately. It does not support slave devices that need to be able to diff --git a/include/hw/i386/intel_iommu.h b/include/hw/i386/intel_iommu.h index 12f3d266e2..66b931e526 100644 --- a/include/hw/i386/intel_iommu.h +++ b/include/hw/i386/intel_iommu.h @@ -21,7 +21,7 @@ #ifndef INTEL_IOMMU_H #define INTEL_IOMMU_H -#include "hw/qdev.h" + #include "sysemu/dma.h" #include "hw/i386/x86-iommu.h" #include "hw/i386/ioapic.h" diff --git a/include/hw/input/adb.h b/include/hw/input/adb.h index f99d478252..b7b32e2b16 100644 --- a/include/hw/input/adb.h +++ b/include/hw/input/adb.h @@ -26,7 +26,7 @@ #ifndef ADB_H #define ADB_H -#include "hw/qdev.h" +#include "hw/qdev-core.h" #define MAX_ADB_DEVICES 16 diff --git a/include/hw/ipack/ipack.h b/include/hw/ipack/ipack.h index e33e032ced..1c07969bc9 100644 --- a/include/hw/ipack/ipack.h +++ b/include/hw/ipack/ipack.h @@ -11,7 +11,7 @@ #ifndef QEMU_IPACK_H #define QEMU_IPACK_H -#include "hw/qdev.h" +#include "hw/qdev-core.h" typedef struct IPackBus IPackBus; diff --git a/include/hw/ipmi/ipmi.h b/include/hw/ipmi/ipmi.h index 011faf22e9..70871da0a7 100644 --- a/include/hw/ipmi/ipmi.h +++ b/include/hw/ipmi/ipmi.h @@ -26,7 +26,7 @@ #define HW_IPMI_H #include "exec/memory.h" -#include "hw/qdev.h" +#include "hw/qdev-core.h" #define MAX_IPMI_MSG_SIZE 300 diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h index e62ac91c19..018ada4f6f 100644 --- a/include/hw/isa/isa.h +++ b/include/hw/isa/isa.h @@ -5,7 +5,7 @@ #include "exec/memory.h" #include "exec/ioport.h" -#include "hw/qdev.h" +#include "hw/qdev-core.h" #define ISA_NUM_IRQS 16 diff --git a/include/hw/mem/memory-device.h b/include/hw/mem/memory-device.h index 2ada6e7bde..04476acb8f 100644 --- a/include/hw/mem/memory-device.h +++ b/include/hw/mem/memory-device.h @@ -13,9 +13,9 @@ #ifndef MEMORY_DEVICE_H #define MEMORY_DEVICE_H +#include "hw/qdev-core.h" #include "qapi/qapi-types-misc.h" #include "qom/object.h" -#include "hw/qdev.h" #define TYPE_MEMORY_DEVICE "memory-device" diff --git a/include/hw/mem/pc-dimm.h b/include/hw/mem/pc-dimm.h index 01436b9f50..66dee284ac 100644 --- a/include/hw/mem/pc-dimm.h +++ b/include/hw/mem/pc-dimm.h @@ -18,7 +18,7 @@ #include "exec/memory.h" #include "sysemu/hostmem.h" -#include "hw/qdev.h" +#include "hw/qdev-core.h" #include "hw/boards.h" #define TYPE_PC_DIMM "pc-dimm" diff --git a/include/hw/misc/auxbus.h b/include/hw/misc/auxbus.h index ee0ca3dd51..a539a98c4b 100644 --- a/include/hw/misc/auxbus.h +++ b/include/hw/misc/auxbus.h @@ -26,7 +26,7 @@ #define HW_MISC_AUXBUS_H #include "exec/memory.h" -#include "hw/qdev.h" +#include "hw/qdev-core.h" typedef struct AUXBus AUXBus; typedef struct AUXSlave AUXSlave; diff --git a/include/hw/misc/unimp.h b/include/hw/misc/unimp.h index 2a291ca42d..44d87be903 100644 --- a/include/hw/misc/unimp.h +++ b/include/hw/misc/unimp.h @@ -8,6 +8,7 @@ #ifndef HW_MISC_UNIMP_H #define HW_MISC_UNIMP_H +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #define TYPE_UNIMPLEMENTED_DEVICE "unimplemented-device" diff --git a/include/hw/misc/vmcoreinfo.h b/include/hw/misc/vmcoreinfo.h index 0d11578059..d4f3d3a91c 100644 --- a/include/hw/misc/vmcoreinfo.h +++ b/include/hw/misc/vmcoreinfo.h @@ -12,7 +12,7 @@ #ifndef VMCOREINFO_H #define VMCOREINFO_H -#include "hw/qdev.h" +#include "hw/qdev-core.h" #include "standard-headers/linux/qemu_fw_cfg.h" #define VMCOREINFO_DEVICE "vmcoreinfo" diff --git a/include/hw/net/ne2000-isa.h b/include/hw/net/ne2000-isa.h index 1233928a34..eef17a680d 100644 --- a/include/hw/net/ne2000-isa.h +++ b/include/hw/net/ne2000-isa.h @@ -10,8 +10,8 @@ #ifndef HW_NET_NE2000_ISA_H #define HW_NET_NE2000_ISA_H -#include "hw/qdev.h" #include "hw/isa/isa.h" +#include "hw/qdev-properties.h" #include "net/net.h" #define TYPE_ISA_NE2000 "ne2k_isa" diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index aaf1b9f70d..1b840e61a2 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -1,7 +1,6 @@ #ifndef QEMU_PCI_H #define QEMU_PCI_H -#include "hw/qdev.h" #include "exec/memory.h" #include "sysemu/dma.h" diff --git a/include/hw/pcmcia.h b/include/hw/pcmcia.h index 1b4080764f..ebad7bc504 100644 --- a/include/hw/pcmcia.h +++ b/include/hw/pcmcia.h @@ -3,7 +3,7 @@ /* PCMCIA/Cardbus */ -#include "hw/qdev.h" +#include "hw/qdev-core.h" typedef struct PCMCIASocket { qemu_irq irq; diff --git a/include/hw/ppc/openpic.h b/include/hw/ppc/openpic.h index 7642a8ea1d..ec16897bfb 100644 --- a/include/hw/ppc/openpic.h +++ b/include/hw/ppc/openpic.h @@ -2,7 +2,6 @@ #define OPENPIC_H #include "hw/sysbus.h" -#include "hw/qdev-core.h" #include "qom/cpu.h" #define MAX_CPU 32 diff --git a/include/hw/ppc/spapr_cpu_core.h b/include/hw/ppc/spapr_cpu_core.h index f9645a7290..35e0a7eead 100644 --- a/include/hw/ppc/spapr_cpu_core.h +++ b/include/hw/ppc/spapr_cpu_core.h @@ -9,8 +9,8 @@ #ifndef HW_SPAPR_CPU_CORE_H #define HW_SPAPR_CPU_CORE_H -#include "hw/qdev.h" #include "hw/cpu/core.h" +#include "hw/qdev-core.h" #include "target/ppc/cpu-qom.h" #include "target/ppc/cpu.h" diff --git a/include/hw/ppc/spapr_drc.h b/include/hw/ppc/spapr_drc.h index 576c711b86..721213d5b0 100644 --- a/include/hw/ppc/spapr_drc.h +++ b/include/hw/ppc/spapr_drc.h @@ -16,7 +16,7 @@ #include #include "qom/object.h" #include "sysemu/sysemu.h" -#include "hw/qdev.h" +#include "hw/qdev-core.h" #include "qapi/error.h" #define TYPE_SPAPR_DR_CONNECTOR "spapr-dr-connector" diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index 457aa98f81..f2a8d6a4b4 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -29,7 +29,7 @@ #define XICS_H #include "exec/memory.h" -#include "hw/qdev.h" +#include "hw/qdev-core.h" #define XICS_IPI 0x2 #define XICS_BUID 0x1 diff --git a/include/hw/ppc/xive.h b/include/hw/ppc/xive.h index 55c53c7417..e10b96b10a 100644 --- a/include/hw/ppc/xive.h +++ b/include/hw/ppc/xive.h @@ -141,7 +141,6 @@ #define PPC_XIVE_H #include "sysemu/kvm.h" -#include "hw/qdev-core.h" #include "hw/sysbus.h" #include "hw/ppc/xive_regs.h" diff --git a/include/hw/qdev-dma.h b/include/hw/qdev-dma.h index b00391aa0c..002705c57d 100644 --- a/include/hw/qdev-dma.h +++ b/include/hw/qdev-dma.h @@ -10,6 +10,7 @@ #ifndef HW_QDEV_DMA_H #define HW_QDEV_DMA_H + #define DEFINE_PROP_DMAADDR(_n, _s, _f, _d) \ DEFINE_PROP_UINT64(_n, _s, _f, _d) diff --git a/include/hw/qdev.h b/include/hw/qdev.h deleted file mode 100644 index d68991ae87..0000000000 --- a/include/hw/qdev.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef QDEV_H -#define QDEV_H - -#include "hw/qdev-core.h" -#include "hw/qdev-properties.h" - -#endif diff --git a/include/hw/s390x/event-facility.h b/include/hw/s390x/event-facility.h index 6cf71cec38..bdc32a3c09 100644 --- a/include/hw/s390x/event-facility.h +++ b/include/hw/s390x/event-facility.h @@ -15,8 +15,8 @@ #ifndef HW_S390_SCLP_EVENT_FACILITY_H #define HW_S390_SCLP_EVENT_FACILITY_H -#include "hw/qdev.h" #include "qemu/thread.h" +#include "hw/qdev-core.h" #include "hw/s390x/sclp.h" /* SCLP event types */ diff --git a/include/hw/s390x/sclp.h b/include/hw/s390x/sclp.h index f9db243484..c54413b78c 100644 --- a/include/hw/s390x/sclp.h +++ b/include/hw/s390x/sclp.h @@ -15,7 +15,6 @@ #define HW_S390_SCLP_H #include "hw/sysbus.h" -#include "hw/qdev.h" #include "target/s390x/cpu-qom.h" #define SCLP_CMD_CODE_MASK 0xffff00ff diff --git a/include/hw/s390x/storage-attributes.h b/include/hw/s390x/storage-attributes.h index d6403a0a7e..4f7c6c0877 100644 --- a/include/hw/s390x/storage-attributes.h +++ b/include/hw/s390x/storage-attributes.h @@ -12,7 +12,7 @@ #ifndef S390_STORAGE_ATTRIBUTES_H #define S390_STORAGE_ATTRIBUTES_H -#include "hw/qdev.h" +#include "hw/qdev-core.h" #include "monitor/monitor.h" #define TYPE_S390_STATTRIB "s390-storage_attributes" diff --git a/include/hw/s390x/storage-keys.h b/include/hw/s390x/storage-keys.h index 62df48ec06..3f1ae7e778 100644 --- a/include/hw/s390x/storage-keys.h +++ b/include/hw/s390x/storage-keys.h @@ -12,7 +12,7 @@ #ifndef S390_STORAGE_KEYS_H #define S390_STORAGE_KEYS_H -#include "hw/qdev.h" +#include "hw/qdev-core.h" #include "monitor/monitor.h" #define TYPE_S390_SKEYS "s390-skeys" diff --git a/include/hw/s390x/tod.h b/include/hw/s390x/tod.h index d71f4ea8a7..4251623f7f 100644 --- a/include/hw/s390x/tod.h +++ b/include/hw/s390x/tod.h @@ -11,7 +11,7 @@ #ifndef HW_S390_TOD_H #define HW_S390_TOD_H -#include "hw/qdev.h" +#include "hw/qdev-core.h" #include "target/s390x/s390-tod.h" typedef struct S390TOD { diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h index 15a763dc18..2bfaad0fe9 100644 --- a/include/hw/scsi/scsi.h +++ b/include/hw/scsi/scsi.h @@ -1,9 +1,9 @@ #ifndef QEMU_HW_SCSI_H #define QEMU_HW_SCSI_H -#include "hw/qdev.h" #include "block/aio.h" #include "hw/block/block.h" +#include "hw/qdev-core.h" #include "sysemu/sysemu.h" #include "scsi/utils.h" #include "qemu/notify.h" diff --git a/include/hw/sd/sd.h b/include/hw/sd/sd.h index b865aafc33..a84b8e274a 100644 --- a/include/hw/sd/sd.h +++ b/include/hw/sd/sd.h @@ -30,7 +30,7 @@ #ifndef HW_SD_H #define HW_SD_H -#include "hw/qdev.h" +#include "hw/qdev-core.h" #define OUT_OF_RANGE (1 << 31) #define ADDRESS_ERROR (1 << 30) diff --git a/include/hw/sparc/grlib.h b/include/hw/sparc/grlib.h index 5606ff0a97..78b6178fcd 100644 --- a/include/hw/sparc/grlib.h +++ b/include/hw/sparc/grlib.h @@ -25,7 +25,6 @@ #ifndef GRLIB_H #define GRLIB_H -#include "hw/qdev.h" #include "hw/sysbus.h" /* Emulation of GrLib device is base on the GRLIB IP Core User's Manual: diff --git a/include/hw/ssi/ssi.h b/include/hw/ssi/ssi.h index 6a0c3c3cdb..1107cb89ee 100644 --- a/include/hw/ssi/ssi.h +++ b/include/hw/ssi/ssi.h @@ -11,7 +11,7 @@ #ifndef QEMU_SSI_H #define QEMU_SSI_H -#include "hw/qdev.h" +#include "hw/qdev-core.h" typedef struct SSISlave SSISlave; typedef struct SSISlaveClass SSISlaveClass; diff --git a/include/hw/sysbus.h b/include/hw/sysbus.h index 4c668fbbdc..27e80881da 100644 --- a/include/hw/sysbus.h +++ b/include/hw/sysbus.h @@ -3,7 +3,7 @@ /* Devices attached directly to the main system bus. */ -#include "hw/qdev.h" +#include "hw/qdev-core.h" #include "exec/memory.h" #define QDEV_MAX_MMIO 32 diff --git a/include/hw/timer/cmsdk-apb-timer.h b/include/hw/timer/cmsdk-apb-timer.h index f21686d26b..e93caccc3c 100644 --- a/include/hw/timer/cmsdk-apb-timer.h +++ b/include/hw/timer/cmsdk-apb-timer.h @@ -12,6 +12,7 @@ #ifndef CMSDK_APB_TIMER_H #define CMSDK_APB_TIMER_H +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "hw/ptimer.h" diff --git a/include/hw/timer/i8254.h b/include/hw/timer/i8254.h index 608b116fcf..45cb42571f 100644 --- a/include/hw/timer/i8254.h +++ b/include/hw/timer/i8254.h @@ -25,7 +25,7 @@ #ifndef HW_I8254_H #define HW_I8254_H -#include "hw/qdev.h" +#include "hw/qdev-properties.h" #include "hw/isa/isa.h" #define PIT_FREQ 1193182 diff --git a/include/hw/usb.h b/include/hw/usb.h index 96971a4c26..c24d968a19 100644 --- a/include/hw/usb.h +++ b/include/hw/usb.h @@ -26,7 +26,7 @@ */ #include "exec/memory.h" -#include "hw/qdev.h" +#include "hw/qdev-core.h" #include "qemu/iov.h" #include "qemu/queue.h" diff --git a/include/hw/virtio/vhost-scsi-common.h b/include/hw/virtio/vhost-scsi-common.h index 54357164f0..16bf1a73c1 100644 --- a/include/hw/virtio/vhost-scsi-common.h +++ b/include/hw/virtio/vhost-scsi-common.h @@ -14,7 +14,6 @@ #ifndef VHOST_SCSI_COMMON_H #define VHOST_SCSI_COMMON_H -#include "hw/qdev.h" #include "hw/virtio/virtio-scsi.h" #include "hw/virtio/vhost.h" #include "hw/fw-path-provider.h" diff --git a/include/hw/virtio/vhost-scsi.h b/include/hw/virtio/vhost-scsi.h index df5bfdb188..23252153ff 100644 --- a/include/hw/virtio/vhost-scsi.h +++ b/include/hw/virtio/vhost-scsi.h @@ -14,7 +14,6 @@ #ifndef VHOST_SCSI_H #define VHOST_SCSI_H -#include "hw/qdev.h" #include "hw/virtio/virtio-scsi.h" #include "hw/virtio/vhost.h" #include "hw/virtio/vhost-scsi-common.h" diff --git a/include/hw/virtio/vhost-user-blk.h b/include/hw/virtio/vhost-user-blk.h index 8dbf11c6f0..108bfadeeb 100644 --- a/include/hw/virtio/vhost-user-blk.h +++ b/include/hw/virtio/vhost-user-blk.h @@ -16,7 +16,6 @@ #define VHOST_USER_BLK_H #include "standard-headers/linux/virtio_blk.h" -#include "hw/qdev.h" #include "hw/block/block.h" #include "chardev/char-fe.h" #include "hw/virtio/vhost.h" diff --git a/include/hw/virtio/vhost-user-scsi.h b/include/hw/virtio/vhost-user-scsi.h index 1b332ea910..99ab2f2cc4 100644 --- a/include/hw/virtio/vhost-user-scsi.h +++ b/include/hw/virtio/vhost-user-scsi.h @@ -17,7 +17,6 @@ #ifndef VHOST_USER_SCSI_H #define VHOST_USER_SCSI_H -#include "hw/qdev.h" #include "hw/virtio/virtio-scsi.h" #include "hw/virtio/vhost.h" #include "hw/virtio/vhost-user.h" diff --git a/include/hw/virtio/virtio-bus.h b/include/hw/virtio/virtio-bus.h index 7fec9dc929..8c9cc25b16 100644 --- a/include/hw/virtio/virtio-bus.h +++ b/include/hw/virtio/virtio-bus.h @@ -25,8 +25,8 @@ #ifndef VIRTIO_BUS_H #define VIRTIO_BUS_H -#include "hw/qdev.h" #include "sysemu/sysemu.h" +#include "hw/qdev-core.h" #include "hw/virtio/virtio.h" #define TYPE_VIRTIO_BUS "virtio-bus" diff --git a/include/hw/virtio/virtio-serial.h b/include/hw/virtio/virtio-serial.h index 12657a9f39..ed3e916b68 100644 --- a/include/hw/virtio/virtio-serial.h +++ b/include/hw/virtio/virtio-serial.h @@ -17,7 +17,6 @@ #define QEMU_VIRTIO_SERIAL_H #include "standard-headers/linux/virtio_console.h" -#include "hw/qdev.h" #include "hw/virtio/virtio.h" struct virtio_serial_conf { diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h index 7bae09e3ae..df40a46d60 100644 --- a/include/hw/virtio/virtio.h +++ b/include/hw/virtio/virtio.h @@ -15,8 +15,8 @@ #define QEMU_VIRTIO_H #include "exec/memory.h" +#include "hw/qdev-core.h" #include "net/net.h" -#include "hw/qdev.h" #include "sysemu/sysemu.h" #include "migration/vmstate.h" #include "qemu/event_notifier.h" diff --git a/include/hw/watchdog/wdt_diag288.h b/include/hw/watchdog/wdt_diag288.h index 706d96b753..19d83a0937 100644 --- a/include/hw/watchdog/wdt_diag288.h +++ b/include/hw/watchdog/wdt_diag288.h @@ -1,7 +1,7 @@ #ifndef WDT_DIAG288_H #define WDT_DIAG288_H -#include "hw/qdev.h" +#include "hw/qdev-core.h" #define TYPE_WDT_DIAG288 "diag288" #define DIAG288(obj) \ diff --git a/include/monitor/qdev.h b/include/monitor/qdev.h index 084799e4d9..eaa947d73a 100644 --- a/include/monitor/qdev.h +++ b/include/monitor/qdev.h @@ -1,8 +1,6 @@ #ifndef MONITOR_QDEV_H #define MONITOR_QDEV_H -#include "hw/qdev-core.h" - /*** monitor commands ***/ void hmp_info_qtree(Monitor *mon, const QDict *qdict); diff --git a/include/sysemu/accel.h b/include/sysemu/accel.h index 81293cdb08..c015894422 100644 --- a/include/sysemu/accel.h +++ b/include/sysemu/accel.h @@ -24,7 +24,6 @@ #define HW_ACCEL_H #include "qom/object.h" -#include "hw/qdev-properties.h" typedef struct AccelState { /*< private >*/ diff --git a/memory.c b/memory.c index 9be7e4cb56..e5683eed91 100644 --- a/memory.c +++ b/memory.c @@ -31,7 +31,6 @@ #include "sysemu/kvm.h" #include "sysemu/sysemu.h" #include "sysemu/tcg.h" -#include "hw/qdev-properties.h" #include "migration/vmstate.h" //#define DEBUG_UNASSIGNED diff --git a/migration/migration.c b/migration/migration.c index 85e5d22e32..3a6340f602 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -47,6 +47,7 @@ #include "io/channel-buffer.h" #include "migration/colo.h" #include "hw/boards.h" +#include "hw/qdev-properties.h" #include "monitor/monitor.h" #include "net/announce.h" diff --git a/migration/migration.h b/migration/migration.h index a7882af67a..b150937180 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -15,10 +15,10 @@ #define QEMU_MIGRATION_H #include "exec/cpu-common.h" +#include "hw/qdev-core.h" #include "qapi/qapi-types-migration.h" #include "qemu/thread.h" #include "qemu/coroutine_int.h" -#include "hw/qdev.h" #include "io/channel.h" #include "net/announce.h" diff --git a/net/net.c b/net/net.c index 7d4098254f..11b505a6fd 100644 --- a/net/net.c +++ b/net/net.c @@ -27,6 +27,7 @@ #include "net/net.h" #include "clients.h" #include "hub.h" +#include "hw/qdev-properties.h" #include "net/slirp.h" #include "net/eth.h" #include "util.h" @@ -42,7 +43,6 @@ #include "qemu/cutils.h" #include "qemu/config-file.h" #include "qemu/ctype.h" -#include "hw/qdev.h" #include "qemu/iov.h" #include "qemu/main-loop.h" #include "qemu/option.h" diff --git a/qdev-monitor.c b/qdev-monitor.c index 58222c2211..21c1c301d0 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -18,7 +18,6 @@ */ #include "qemu/osdep.h" -#include "hw/qdev.h" #include "hw/sysbus.h" #include "monitor/monitor.h" #include "monitor/qdev.h" diff --git a/qom/qom-qmp-cmds.c b/qom/qom-qmp-cmds.c index e046a0f190..236e8e41dd 100644 --- a/qom/qom-qmp-cmds.c +++ b/qom/qom-qmp-cmds.c @@ -14,7 +14,7 @@ */ #include "qemu/osdep.h" -#include "hw/qdev.h" +#include "hw/qdev-core.h" #include "qapi/error.h" #include "qapi/qapi-commands-qdev.h" #include "qapi/qapi-commands-qom.h" diff --git a/qtest.c b/qtest.c index 15e27e911f..313821faed 100644 --- a/qtest.c +++ b/qtest.c @@ -15,7 +15,6 @@ #include "qapi/error.h" #include "cpu.h" #include "sysemu/qtest.h" -#include "hw/qdev.h" #include "chardev/char-fe.h" #include "exec/ioport.h" #include "exec/memory.h" diff --git a/target/tilegx/cpu.c b/target/tilegx/cpu.c index 69971247f2..2b2a7ccc31 100644 --- a/target/tilegx/cpu.c +++ b/target/tilegx/cpu.c @@ -22,7 +22,6 @@ #include "qapi/error.h" #include "cpu.h" #include "qemu/module.h" -#include "hw/qdev-properties.h" #include "linux-user/syscall_defs.h" #include "qemu/qemu-print.h" #include "exec/exec-all.h" diff --git a/tests/test-qdev-global-props.c b/tests/test-qdev-global-props.c index 60231b1372..4ed3d06f4e 100644 --- a/tests/test-qdev-global-props.c +++ b/tests/test-qdev-global-props.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" -#include "hw/qdev.h" +#include "hw/qdev-properties.h" #include "qom/object.h" #include "qapi/visitor.h" diff --git a/vl.c b/vl.c index 64b483ed6b..df23dd6913 100644 --- a/vl.c +++ b/vl.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/units.h" +#include "hw/qdev-properties.h" #include "qapi/error.h" #include "qemu-version.h" #include "qemu/cutils.h" @@ -65,7 +66,6 @@ int main(int argc, char **argv) #include "hw/firmware/smbios.h" #include "hw/acpi/acpi.h" #include "hw/xen/xen.h" -#include "hw/qdev.h" #include "hw/loader.h" #include "monitor/qdev.h" #include "sysemu/bt.h" From patchwork Fri Jul 26 12:05:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 11060921 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1699213A0 for ; Fri, 26 Jul 2019 12:10:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 04E9D28AA5 for ; Fri, 26 Jul 2019 12:10:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ED64728AAA; Fri, 26 Jul 2019 12:10:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 968E728AA5 for ; Fri, 26 Jul 2019 12:10:14 +0000 (UTC) Received: from localhost ([::1]:39344 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqz36-0006Il-Nl for patchwork-qemu-devel@patchwork.kernel.org; Fri, 26 Jul 2019 08:10:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58834) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqyz0-0005aI-Va for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:06:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqyyr-00082K-Oe for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58290) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqyyr-0007w1-7G for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:49 -0400 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 47B6530872D1; Fri, 26 Jul 2019 12:05:48 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B17485D70D; Fri, 26 Jul 2019 12:05:47 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 1CFD9112F026; Fri, 26 Jul 2019 14:05:43 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 26 Jul 2019 14:05:36 +0200 Message-Id: <20190726120542.9894-23-armbru@redhat.com> In-Reply-To: <20190726120542.9894-1-armbru@redhat.com> References: <20190726120542.9894-1-armbru@redhat.com> MIME-Version: 1.0 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.47]); Fri, 26 Jul 2019 12:05:48 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 22/28] Include hw/boards.h a bit less X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP hw/boards.h pulls in almost 60 headers. The less we include it into headers, the better. As a first step, drop superfluous inclusions, and downgrade some more to what's actually needed. Gets rid of just one inclusion into a header. Cc: Eduardo Habkost Cc: Marcel Apfelbaum Signed-off-by: Markus Armbruster Reviewed-by: Alistair Francis --- backends/cryptodev-builtin.c | 1 - backends/cryptodev-vhost-user.c | 1 - backends/cryptodev.c | 1 - exec.c | 1 - hw/acpi/cpu.c | 1 - hw/acpi/ich9.c | 1 + hw/acpi/memory_hotplug.c | 1 - hw/alpha/dp264.c | 1 - hw/alpha/typhoon.c | 1 + hw/arm/boot.c | 1 - hw/arm/exynos4210.c | 2 +- hw/arm/fsl-imx25.c | 1 - hw/arm/fsl-imx31.c | 1 - hw/arm/msf2-soc.c | 1 - hw/arm/nrf51_soc.c | 1 - hw/arm/omap1.c | 1 + hw/arm/omap2.c | 1 + hw/arm/smmuv3.c | 1 - hw/arm/virt.c | 1 + hw/core/machine-qmp-cmds.c | 1 - hw/core/machine.c | 1 - hw/core/numa.c | 2 ++ hw/i386/intel_iommu.c | 1 - hw/i386/pc_piix.c | 1 - hw/i386/pc_q35.c | 1 - hw/i386/pc_sysfw.c | 1 - hw/i386/x86-iommu.c | 1 - hw/ppc/e500plat.c | 1 - hw/ppc/mpc8544ds.c | 1 - hw/ppc/pnv.c | 1 + hw/ppc/ppc405_uc.c | 1 - hw/ppc/spapr_cpu_core.c | 1 - hw/ppc/spapr_rtas.c | 1 - hw/ppc/spapr_vio.c | 1 - hw/riscv/boot.c | 2 +- hw/s390x/s390-stattrib-kvm.c | 1 - hw/s390x/s390-stattrib.c | 1 - hw/xtensa/xtensa_memory.c | 1 - include/hw/mem/pc-dimm.h | 1 - monitor/qmp-cmds.c | 1 - target/alpha/machine.c | 1 - target/arm/kvm.c | 1 - target/arm/machine.c | 1 - target/arm/monitor.c | 1 - target/hppa/machine.c | 1 - target/i386/hax-all.c | 1 - target/i386/hvf/hvf.c | 1 - target/i386/hvf/x86_task.c | 1 - target/i386/machine.c | 1 - target/i386/whpx-all.c | 1 - target/lm32/machine.c | 1 - target/moxie/machine.c | 1 - target/openrisc/machine.c | 1 - target/ppc/machine.c | 1 - target/sparc/machine.c | 1 - 55 files changed, 10 insertions(+), 48 deletions(-) diff --git a/backends/cryptodev-builtin.c b/backends/cryptodev-builtin.c index 9fb0bd57a6..c8ae3b9742 100644 --- a/backends/cryptodev-builtin.c +++ b/backends/cryptodev-builtin.c @@ -23,7 +23,6 @@ #include "qemu/osdep.h" #include "sysemu/cryptodev.h" -#include "hw/boards.h" #include "qapi/error.h" #include "standard-headers/linux/virtio_crypto.h" #include "crypto/cipher.h" diff --git a/backends/cryptodev-vhost-user.c b/backends/cryptodev-vhost-user.c index 1052a5d0e9..b344283940 100644 --- a/backends/cryptodev-vhost-user.c +++ b/backends/cryptodev-vhost-user.c @@ -22,7 +22,6 @@ */ #include "qemu/osdep.h" -#include "hw/boards.h" #include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qemu/error-report.h" diff --git a/backends/cryptodev.c b/backends/cryptodev.c index f35be377ef..3c071eab95 100644 --- a/backends/cryptodev.c +++ b/backends/cryptodev.c @@ -23,7 +23,6 @@ #include "qemu/osdep.h" #include "sysemu/cryptodev.h" -#include "hw/boards.h" #include "qapi/error.h" #include "qapi/visitor.h" #include "qemu/config-file.h" diff --git a/exec.c b/exec.c index 78f849de99..6d60fdfb1f 100644 --- a/exec.c +++ b/exec.c @@ -29,7 +29,6 @@ #include "hw/qdev-core.h" #include "hw/qdev-properties.h" #if !defined(CONFIG_USER_ONLY) -#include "hw/boards.h" #include "hw/xen/xen.h" #endif #include "sysemu/kvm.h" diff --git a/hw/acpi/cpu.c b/hw/acpi/cpu.c index 87f30a31d7..d8e531ad64 100644 --- a/hw/acpi/cpu.c +++ b/hw/acpi/cpu.c @@ -1,5 +1,4 @@ #include "qemu/osdep.h" -#include "hw/boards.h" #include "migration/vmstate.h" #include "hw/acpi/cpu.h" #include "qapi/error.h" diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c index 39649cbe6a..c1aaa07d43 100644 --- a/hw/acpi/ich9.c +++ b/hw/acpi/ich9.c @@ -31,6 +31,7 @@ #include "hw/pci/pci.h" #include "migration/vmstate.h" #include "qemu/timer.h" +#include "qom/cpu.h" #include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "hw/acpi/acpi.h" diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c index 9483d66e86..b413f491ee 100644 --- a/hw/acpi/memory_hotplug.c +++ b/hw/acpi/memory_hotplug.c @@ -2,7 +2,6 @@ #include "hw/acpi/memory_hotplug.h" #include "hw/acpi/pc-hotplug.h" #include "hw/mem/pc-dimm.h" -#include "hw/boards.h" #include "hw/qdev-core.h" #include "migration/vmstate.h" #include "trace.h" diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c index 546b89bbcc..51feee8558 100644 --- a/hw/alpha/dp264.c +++ b/hw/alpha/dp264.c @@ -11,7 +11,6 @@ #include "cpu.h" #include "elf.h" #include "hw/loader.h" -#include "hw/boards.h" #include "alpha_sys.h" #include "qemu/error-report.h" #include "sysemu/sysemu.h" diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c index 5d7f8f3342..1c0565acc1 100644 --- a/hw/alpha/typhoon.c +++ b/hw/alpha/typhoon.c @@ -11,6 +11,7 @@ #include "qemu/units.h" #include "qapi/error.h" #include "cpu.h" +#include "hw/boards.h" #include "hw/irq.h" #include "sysemu/sysemu.h" #include "alpha_sys.h" diff --git a/hw/arm/boot.c b/hw/arm/boot.c index c9e1e844b8..e1640c4e62 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -18,7 +18,6 @@ #include "sysemu/sysemu.h" #include "sysemu/numa.h" #include "sysemu/reset.h" -#include "hw/boards.h" #include "hw/loader.h" #include "elf.h" #include "sysemu/device_tree.h" diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c index 0e403f3e78..a9f8a5c868 100644 --- a/hw/arm/exynos4210.c +++ b/hw/arm/exynos4210.c @@ -27,7 +27,7 @@ #include "cpu.h" #include "hw/cpu/a9mpcore.h" #include "hw/irq.h" -#include "hw/boards.h" +#include "sysemu/blockdev.h" #include "sysemu/sysemu.h" #include "hw/sysbus.h" #include "hw/arm/boot.h" diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c index 098e84c84d..532d088298 100644 --- a/hw/arm/fsl-imx25.c +++ b/hw/arm/fsl-imx25.c @@ -28,7 +28,6 @@ #include "hw/arm/fsl-imx25.h" #include "sysemu/sysemu.h" #include "exec/address-spaces.h" -#include "hw/boards.h" #include "hw/qdev-properties.h" #include "chardev/char.h" diff --git a/hw/arm/fsl-imx31.c b/hw/arm/fsl-imx31.c index 093ad40984..1a37a7b997 100644 --- a/hw/arm/fsl-imx31.c +++ b/hw/arm/fsl-imx31.c @@ -25,7 +25,6 @@ #include "hw/arm/fsl-imx31.h" #include "sysemu/sysemu.h" #include "exec/address-spaces.h" -#include "hw/boards.h" #include "hw/qdev-properties.h" #include "chardev/char.h" diff --git a/hw/arm/msf2-soc.c b/hw/arm/msf2-soc.c index 4e5251c92e..8ae763f99f 100644 --- a/hw/arm/msf2-soc.c +++ b/hw/arm/msf2-soc.c @@ -28,7 +28,6 @@ #include "exec/address-spaces.h" #include "hw/char/serial.h" #include "hw/irq.h" -#include "hw/boards.h" #include "hw/arm/msf2-soc.h" #include "hw/misc/unimp.h" diff --git a/hw/arm/nrf51_soc.c b/hw/arm/nrf51_soc.c index fc067cd8ee..d9e54fefbb 100644 --- a/hw/arm/nrf51_soc.c +++ b/hw/arm/nrf51_soc.c @@ -12,7 +12,6 @@ #include "qapi/error.h" #include "hw/arm/boot.h" #include "hw/sysbus.h" -#include "hw/boards.h" #include "hw/misc/unimp.h" #include "exec/address-spaces.h" #include "sysemu/sysemu.h" diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c index 19fca4159a..d28ad2b9ff 100644 --- a/hw/arm/omap1.c +++ b/hw/arm/omap1.c @@ -29,6 +29,7 @@ #include "hw/qdev-properties.h" #include "hw/arm/boot.h" #include "hw/arm/omap.h" +#include "sysemu/blockdev.h" #include "sysemu/sysemu.h" #include "hw/arm/soc_dma.h" #include "sysemu/qtest.h" diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c index dccb5707f8..e0a9c2da83 100644 --- a/hw/arm/omap2.c +++ b/hw/arm/omap2.c @@ -22,6 +22,7 @@ #include "qemu/error-report.h" #include "qapi/error.h" #include "cpu.h" +#include "sysemu/blockdev.h" #include "sysemu/qtest.h" #include "sysemu/reset.h" #include "hw/boards.h" diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c index 0634a398d2..0ccc772390 100644 --- a/hw/arm/smmuv3.c +++ b/hw/arm/smmuv3.c @@ -17,7 +17,6 @@ */ #include "qemu/osdep.h" -#include "hw/boards.h" #include "hw/irq.h" #include "sysemu/sysemu.h" #include "hw/sysbus.h" diff --git a/hw/arm/virt.c b/hw/arm/virt.c index e9fddec058..226e810d06 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -34,6 +34,7 @@ #include "qemu/option.h" #include "qapi/error.h" #include "hw/sysbus.h" +#include "hw/boards.h" #include "hw/arm/boot.h" #include "hw/arm/primecell.h" #include "hw/arm/virt.h" diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c index d8284671f0..c83e8954e1 100644 --- a/hw/core/machine-qmp-cmds.c +++ b/hw/core/machine-qmp-cmds.c @@ -9,7 +9,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "hw/boards.h" #include "qapi/error.h" #include "qapi/qapi-commands-machine.h" #include "qapi/qmp/qerror.h" diff --git a/hw/core/machine.c b/hw/core/machine.c index c58a8e594e..2c9c93983a 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -15,7 +15,6 @@ #include "qapi/qmp/qerror.h" #include "sysemu/replay.h" #include "qemu/units.h" -#include "hw/boards.h" #include "qapi/error.h" #include "qapi/qapi-visit-common.h" #include "qapi/visitor.h" diff --git a/hw/core/numa.c b/hw/core/numa.c index 67548064ee..d817f06ead 100644 --- a/hw/core/numa.c +++ b/hw/core/numa.c @@ -32,8 +32,10 @@ #include "qapi/opts-visitor.h" #include "qapi/qapi-visit-machine.h" #include "sysemu/qtest.h" +#include "qom/cpu.h" #include "hw/mem/pc-dimm.h" #include "migration/vmstate.h" +#include "hw/boards.h" #include "hw/mem/memory-device.h" #include "qemu/option.h" #include "qemu/config-file.h" diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index 75ca6f9c70..6c5cd306fc 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -31,7 +31,6 @@ #include "hw/qdev-properties.h" #include "hw/i386/pc.h" #include "hw/i386/apic-msidef.h" -#include "hw/boards.h" #include "hw/i386/x86-iommu.h" #include "hw/pci-host/q35.h" #include "sysemu/kvm.h" diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 2fbb581c46..9e187f856a 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -35,7 +35,6 @@ #include "hw/pci/pci_ids.h" #include "hw/usb.h" #include "net/net.h" -#include "hw/boards.h" #include "hw/ide.h" #include "hw/irq.h" #include "sysemu/kvm.h" diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 8777c9618b..be3464f485 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -33,7 +33,6 @@ #include "hw/loader.h" #include "sysemu/arch_init.h" #include "hw/i2c/smbus_eeprom.h" -#include "hw/boards.h" #include "hw/timer/mc146818rtc.h" #include "hw/xen/xen.h" #include "sysemu/kvm.h" diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c index 235928452b..a9983f0bfb 100644 --- a/hw/i386/pc_sysfw.c +++ b/hw/i386/pc_sysfw.c @@ -32,7 +32,6 @@ #include "qemu/units.h" #include "hw/sysbus.h" #include "hw/i386/pc.h" -#include "hw/boards.h" #include "hw/loader.h" #include "hw/qdev-properties.h" #include "sysemu/sysemu.h" diff --git a/hw/i386/x86-iommu.c b/hw/i386/x86-iommu.c index 1eaf2dd1bc..a621f30f5b 100644 --- a/hw/i386/x86-iommu.c +++ b/hw/i386/x86-iommu.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" -#include "hw/boards.h" #include "hw/i386/x86-iommu.h" #include "hw/qdev-properties.h" #include "hw/i386/pc.h" diff --git a/hw/ppc/e500plat.c b/hw/ppc/e500plat.c index 2b82a58592..7078386300 100644 --- a/hw/ppc/e500plat.c +++ b/hw/ppc/e500plat.c @@ -13,7 +13,6 @@ #include "qemu/units.h" #include "e500.h" #include "hw/net/fsl_etsec/etsec.h" -#include "hw/boards.h" #include "sysemu/device_tree.h" #include "sysemu/kvm.h" #include "hw/sysbus.h" diff --git a/hw/ppc/mpc8544ds.c b/hw/ppc/mpc8544ds.c index 6a4657c3cd..c2c5e11fa1 100644 --- a/hw/ppc/mpc8544ds.c +++ b/hw/ppc/mpc8544ds.c @@ -11,7 +11,6 @@ #include "qemu/osdep.h" #include "e500.h" -#include "hw/boards.h" #include "sysemu/device_tree.h" #include "hw/ppc/openpic.h" #include "qemu/error-report.h" diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index cf31830655..fc7d24830a 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -45,6 +45,7 @@ #include "hw/ppc/pnv_xscom.h" #include "hw/isa/isa.h" +#include "hw/boards.h" #include "hw/char/serial.h" #include "hw/timer/mc146818rtc.h" diff --git a/hw/ppc/ppc405_uc.c b/hw/ppc/ppc405_uc.c index ba092f2931..381720aced 100644 --- a/hw/ppc/ppc405_uc.c +++ b/hw/ppc/ppc405_uc.c @@ -27,7 +27,6 @@ #include "qapi/error.h" #include "cpu.h" #include "hw/ppc/ppc.h" -#include "hw/boards.h" #include "hw/i2c/ppc4xx_i2c.h" #include "hw/irq.h" #include "ppc405.h" diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c index 920bc365ef..bf47fbdf6f 100644 --- a/hw/ppc/spapr_cpu_core.c +++ b/hw/ppc/spapr_cpu_core.c @@ -14,7 +14,6 @@ #include "migration/vmstate.h" #include "target/ppc/cpu.h" #include "hw/ppc/spapr.h" -#include "hw/boards.h" #include "qapi/error.h" #include "sysemu/cpus.h" #include "sysemu/kvm.h" diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c index 558d702833..5fdd4b90e9 100644 --- a/hw/ppc/spapr_rtas.c +++ b/hw/ppc/spapr_rtas.c @@ -39,7 +39,6 @@ #include "hw/ppc/spapr_rtas.h" #include "hw/ppc/spapr_cpu_core.h" #include "hw/ppc/ppc.h" -#include "hw/boards.h" #include #include "hw/ppc/spapr_drc.h" diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c index 31ff0be189..910c57fce5 100644 --- a/hw/ppc/spapr_vio.c +++ b/hw/ppc/spapr_vio.c @@ -26,7 +26,6 @@ #include "hw/irq.h" #include "qemu/log.h" #include "sysemu/sysemu.h" -#include "hw/boards.h" #include "hw/loader.h" #include "elf.h" #include "hw/sysbus.h" diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c index 5dee63011b..84847a79e2 100644 --- a/hw/riscv/boot.c +++ b/hw/riscv/boot.c @@ -22,9 +22,9 @@ #include "qemu/units.h" #include "qemu/error-report.h" #include "exec/cpu-defs.h" +#include "hw/boards.h" #include "hw/loader.h" #include "hw/riscv/boot.h" -#include "hw/boards.h" #include "elf.h" #if defined(TARGET_RISCV32) diff --git a/hw/s390x/s390-stattrib-kvm.c b/hw/s390x/s390-stattrib-kvm.c index c7e1f35524..947b8df8ff 100644 --- a/hw/s390x/s390-stattrib-kvm.c +++ b/hw/s390x/s390-stattrib-kvm.c @@ -10,7 +10,6 @@ */ #include "qemu/osdep.h" -#include "hw/boards.h" #include "migration/qemu-file.h" #include "hw/s390x/storage-attributes.h" #include "qemu/error-report.h" diff --git a/hw/s390x/s390-stattrib.c b/hw/s390x/s390-stattrib.c index 766f2015a4..eda5ca3bb6 100644 --- a/hw/s390x/s390-stattrib.c +++ b/hw/s390x/s390-stattrib.c @@ -11,7 +11,6 @@ #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/boards.h" #include "cpu.h" #include "migration/qemu-file.h" #include "migration/register.h" diff --git a/hw/xtensa/xtensa_memory.c b/hw/xtensa/xtensa_memory.c index 394d0cf227..40334db441 100644 --- a/hw/xtensa/xtensa_memory.c +++ b/hw/xtensa/xtensa_memory.c @@ -29,7 +29,6 @@ #include "qapi/error.h" #include "cpu.h" #include "sysemu/sysemu.h" -#include "hw/boards.h" #include "exec/memory.h" #include "qemu/error-report.h" #include "xtensa_memory.h" diff --git a/include/hw/mem/pc-dimm.h b/include/hw/mem/pc-dimm.h index 66dee284ac..47b246f95c 100644 --- a/include/hw/mem/pc-dimm.h +++ b/include/hw/mem/pc-dimm.h @@ -19,7 +19,6 @@ #include "exec/memory.h" #include "sysemu/hostmem.h" #include "hw/qdev-core.h" -#include "hw/boards.h" #define TYPE_PC_DIMM "pc-dimm" #define PC_DIMM(obj) \ diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c index b9ae40eec7..330558f332 100644 --- a/monitor/qmp-cmds.c +++ b/monitor/qmp-cmds.c @@ -35,7 +35,6 @@ #include "qapi/qapi-commands-misc.h" #include "qapi/qapi-commands-ui.h" #include "qapi/qmp/qerror.h" -#include "hw/boards.h" #include "hw/mem/memory-device.h" #include "hw/acpi/acpi_dev_interface.h" diff --git a/target/alpha/machine.c b/target/alpha/machine.c index c288be89f7..a09d754bbf 100644 --- a/target/alpha/machine.c +++ b/target/alpha/machine.c @@ -1,6 +1,5 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "hw/boards.h" #include "migration/cpu.h" #include "migration/vmstate.h" diff --git a/target/arm/kvm.c b/target/arm/kvm.c index 36a1e60bd4..d81aa5a8eb 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -26,7 +26,6 @@ #include "hw/pci/pci.h" #include "exec/memattrs.h" #include "exec/address-spaces.h" -#include "hw/boards.h" #include "hw/irq.h" #include "qemu/log.h" diff --git a/target/arm/machine.c b/target/arm/machine.c index 60e0627b89..ac28c0615a 100644 --- a/target/arm/machine.c +++ b/target/arm/machine.c @@ -1,6 +1,5 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "hw/boards.h" #include "qemu/error-report.h" #include "sysemu/kvm.h" #include "kvm_arm.h" diff --git a/target/arm/monitor.c b/target/arm/monitor.c index 6ec6dd04ac..6457c3c87f 100644 --- a/target/arm/monitor.c +++ b/target/arm/monitor.c @@ -21,7 +21,6 @@ */ #include "qemu/osdep.h" -#include "hw/boards.h" #include "kvm_arm.h" #include "qapi/qapi-commands-misc-target.h" diff --git a/target/hppa/machine.c b/target/hppa/machine.c index 092f8b5bfd..e3b6608cf2 100644 --- a/target/hppa/machine.c +++ b/target/hppa/machine.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "hw/boards.h" #include "migration/cpu.h" #include "migration/vmstate.h" diff --git a/target/i386/hax-all.c b/target/i386/hax-all.c index bcacdd1d8f..34a9f6f7a9 100644 --- a/target/i386/hax-all.c +++ b/target/i386/hax-all.c @@ -33,7 +33,6 @@ #include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "qemu/main-loop.h" -#include "hw/boards.h" #define DEBUG_HAX 0 diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c index dc4bb63536..6863cf2de4 100644 --- a/target/i386/hvf/hvf.c +++ b/target/i386/hvf/hvf.c @@ -66,7 +66,6 @@ #include "exec/address-spaces.h" #include "hw/i386/apic_internal.h" -#include "hw/boards.h" #include "qemu/main-loop.h" #include "sysemu/accel.h" #include "sysemu/sysemu.h" diff --git a/target/i386/hvf/x86_task.c b/target/i386/hvf/x86_task.c index 7099335e89..73cd5d2817 100644 --- a/target/i386/hvf/x86_task.c +++ b/target/i386/hvf/x86_task.c @@ -27,7 +27,6 @@ #include #include "hw/i386/apic_internal.h" -#include "hw/boards.h" #include "qemu/main-loop.h" #include "sysemu/accel.h" #include "sysemu/sysemu.h" diff --git a/target/i386/machine.c b/target/i386/machine.c index dd5a72ba00..ff0d33b9db 100644 --- a/target/i386/machine.c +++ b/target/i386/machine.c @@ -1,7 +1,6 @@ #include "qemu/osdep.h" #include "cpu.h" #include "exec/exec-all.h" -#include "hw/boards.h" #include "hw/i386/pc.h" #include "hw/isa/isa.h" #include "migration/cpu.h" diff --git a/target/i386/whpx-all.c b/target/i386/whpx-all.c index 2cf66f7804..b57d1c6683 100644 --- a/target/i386/whpx-all.c +++ b/target/i386/whpx-all.c @@ -18,7 +18,6 @@ #include "sysemu/sysemu.h" #include "sysemu/cpus.h" #include "qemu/main-loop.h" -#include "hw/boards.h" #include "qemu/error-report.h" #include "qapi/error.h" #include "migration/blocker.h" diff --git a/target/lm32/machine.c b/target/lm32/machine.c index 18a1820f22..c6d82a4cfe 100644 --- a/target/lm32/machine.c +++ b/target/lm32/machine.c @@ -1,6 +1,5 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "hw/boards.h" #include "migration/cpu.h" #include "migration/vmstate.h" diff --git a/target/moxie/machine.c b/target/moxie/machine.c index e6f639ee97..37b15e6d60 100644 --- a/target/moxie/machine.c +++ b/target/moxie/machine.c @@ -1,6 +1,5 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "hw/boards.h" #include "machine.h" #include "migration/cpu.h" #include "migration/vmstate.h" diff --git a/target/openrisc/machine.c b/target/openrisc/machine.c index a7bfbbe3b2..296dc70a92 100644 --- a/target/openrisc/machine.c +++ b/target/openrisc/machine.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "hw/boards.h" #include "migration/cpu.h" #include "migration/vmstate.h" diff --git a/target/ppc/machine.c b/target/ppc/machine.c index 74e003cf46..7846c09e71 100644 --- a/target/ppc/machine.c +++ b/target/ppc/machine.c @@ -1,7 +1,6 @@ #include "qemu/osdep.h" #include "cpu.h" #include "exec/exec-all.h" -#include "hw/boards.h" #include "sysemu/kvm.h" #include "helper_regs.h" #include "mmu-hash64.h" diff --git a/target/sparc/machine.c b/target/sparc/machine.c index aeeca69a2d..bea694c973 100644 --- a/target/sparc/machine.c +++ b/target/sparc/machine.c @@ -1,7 +1,6 @@ #include "qemu/osdep.h" #include "cpu.h" #include "exec/exec-all.h" -#include "hw/boards.h" #include "qemu/timer.h" #include "migration/cpu.h" From patchwork Fri Jul 26 12:05:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 11060909 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EDC0713A0 for ; Fri, 26 Jul 2019 12:09:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DB02828812 for ; Fri, 26 Jul 2019 12:09:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CC6C928AA8; Fri, 26 Jul 2019 12:09:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 64B7228812 for ; Fri, 26 Jul 2019 12:09:13 +0000 (UTC) Received: from localhost ([::1]:39316 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqz26-0002Av-7n for patchwork-qemu-devel@patchwork.kernel.org; Fri, 26 Jul 2019 08:09:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58801) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqyz1-0005XM-9s for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:06:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqyyu-0008Gs-UZ for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59192) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqyyu-0007xY-IV for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:52 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 98E20859FF; Fri, 26 Jul 2019 12:05:48 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2F5911001938; Fri, 26 Jul 2019 12:05:48 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 28E10112E9E3; Fri, 26 Jul 2019 14:05:43 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 26 Jul 2019 14:05:37 +0200 Message-Id: <20190726120542.9894-24-armbru@redhat.com> In-Reply-To: <20190726120542.9894-1-armbru@redhat.com> References: <20190726120542.9894-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 26 Jul 2019 12:05:48 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 23/28] numa: Don't include hw/boards.h into sysemu/numa.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP sysemu/numa.h includes hw/boards.h just for the CPUArchId typedef, at the cost of pulling in more than two dozen extra headers indirectly. I could move the typedef from hw/boards.h to qemu/typedefs.h. But it's used in just two headers: boards.h and numa.h. I could move it to another header both its users include. exec/cpu-common.h seems to be the least bad fit. But I'm keeping this simple & stupid: declare the struct tag in numa.h. Cc: Eduardo Habkost Cc: Marcel Apfelbaum Signed-off-by: Markus Armbruster Reviewed-by: Eduardo Habkost --- exec.c | 1 + hw/core/machine-qmp-cmds.c | 1 + hw/core/machine.c | 1 + hw/mem/pc-dimm.c | 1 + include/hw/boards.h | 2 +- include/sysemu/numa.h | 9 +++++++-- 6 files changed, 12 insertions(+), 3 deletions(-) diff --git a/exec.c b/exec.c index 6d60fdfb1f..4d9e146c79 100644 --- a/exec.c +++ b/exec.c @@ -41,6 +41,7 @@ #if defined(CONFIG_USER_ONLY) #include "qemu.h" #else /* !CONFIG_USER_ONLY */ +#include "hw/boards.h" #include "exec/memory.h" #include "exec/ioport.h" #include "sysemu/dma.h" diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c index c83e8954e1..d8284671f0 100644 --- a/hw/core/machine-qmp-cmds.c +++ b/hw/core/machine-qmp-cmds.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "cpu.h" +#include "hw/boards.h" #include "qapi/error.h" #include "qapi/qapi-commands-machine.h" #include "qapi/qmp/qerror.h" diff --git a/hw/core/machine.c b/hw/core/machine.c index 2c9c93983a..901f3fa905 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -23,6 +23,7 @@ #include "sysemu/numa.h" #include "qemu/error-report.h" #include "sysemu/qtest.h" +#include "hw/boards.h" #include "hw/pci/pci.h" #include "hw/mem/nvdimm.h" diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index 0c83dcd61e..fa90d4fc6c 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -19,6 +19,7 @@ */ #include "qemu/osdep.h" +#include "hw/boards.h" #include "hw/mem/pc-dimm.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" diff --git a/include/hw/boards.h b/include/hw/boards.h index 67e551636a..739d109fe1 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -86,7 +86,7 @@ void machine_class_allow_dynamic_sysbus_dev(MachineClass *mc, const char *type); * @props - CPU object properties, initialized by board * #vcpus_count - number of threads provided by @cpu object */ -typedef struct { +typedef struct CPUArchId { uint64_t arch_id; int64_t vcpus_count; CpuInstanceProperties props; diff --git a/include/sysemu/numa.h b/include/sysemu/numa.h index 01a263eba2..4c4c1dee9b 100644 --- a/include/sysemu/numa.h +++ b/include/sysemu/numa.h @@ -4,7 +4,10 @@ #include "qemu/bitmap.h" #include "sysemu/sysemu.h" #include "sysemu/hostmem.h" -#include "hw/boards.h" +#include "qapi/qapi-types-machine.h" +#include "exec/cpu-common.h" + +struct CPUArchId; extern int nb_numa_nodes; /* Number of NUMA nodes */ extern bool have_numa_distance; @@ -32,5 +35,7 @@ void numa_legacy_auto_assign_ram(MachineClass *mc, NodeInfo *nodes, int nb_nodes, ram_addr_t size); void numa_default_auto_assign_ram(MachineClass *mc, NodeInfo *nodes, int nb_nodes, ram_addr_t size); -void numa_cpu_pre_plug(const CPUArchId *slot, DeviceState *dev, Error **errp); +void numa_cpu_pre_plug(const struct CPUArchId *slot, DeviceState *dev, + Error **errp); + #endif From patchwork Fri Jul 26 12:05:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 11060873 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CCA45746 for ; Fri, 26 Jul 2019 12:06:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BB07A28AA5 for ; Fri, 26 Jul 2019 12:06:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AF21B28AAA; Fri, 26 Jul 2019 12:06:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4E8C828AA5 for ; Fri, 26 Jul 2019 12:06:38 +0000 (UTC) Received: from localhost ([::1]:39226 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqyzc-00086G-Tq for patchwork-qemu-devel@patchwork.kernel.org; Fri, 26 Jul 2019 08:06:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58589) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqyyw-0005Vq-8H for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqyyr-00082o-RX for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57068) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqyyr-0007wv-AD for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:49 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 786864E908 for ; Fri, 26 Jul 2019 12:05:48 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 44DF519729; Fri, 26 Jul 2019 12:05:48 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 34B041146402; Fri, 26 Jul 2019 14:05:43 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 26 Jul 2019 14:05:38 +0200 Message-Id: <20190726120542.9894-25-armbru@redhat.com> In-Reply-To: <20190726120542.9894-1-armbru@redhat.com> References: <20190726120542.9894-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 26 Jul 2019 12:05:48 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 24/28] Include sysemu/hostmem.h less X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Igor Mammedov , Eduardo Habkost Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Move the HostMemoryBackend typedef from sysemu/hostmem.h to qemu/typedefs.h. This renders a few inclusions of sysemu/hostmem.h superflouous; drop them. Cc: Eduardo Habkost Cc: Igor Mammedov Signed-off-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Eduardo Habkost Reviewed-by: Igor Mammedov --- hw/mem/nvdimm.c | 1 + hw/virtio/virtio-pmem.c | 1 + include/hw/mem/pc-dimm.h | 1 - include/hw/virtio/virtio-pmem.h | 1 - include/qemu/typedefs.h | 1 + include/sysemu/hostmem.h | 1 - 6 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/mem/nvdimm.c b/hw/mem/nvdimm.c index 6fefd65092..375f9a588a 100644 --- a/hw/mem/nvdimm.c +++ b/hw/mem/nvdimm.c @@ -30,6 +30,7 @@ #include "hw/mem/nvdimm.h" #include "hw/qdev-properties.h" #include "hw/mem/memory-device.h" +#include "sysemu/hostmem.h" static void nvdimm_get_label_size(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) diff --git a/hw/virtio/virtio-pmem.c b/hw/virtio/virtio-pmem.c index ff1a2ddb36..c0c9395e55 100644 --- a/hw/virtio/virtio-pmem.c +++ b/hw/virtio/virtio-pmem.c @@ -21,6 +21,7 @@ #include "hw/virtio/virtio-access.h" #include "standard-headers/linux/virtio_ids.h" #include "standard-headers/linux/virtio_pmem.h" +#include "sysemu/hostmem.h" #include "block/aio.h" #include "block/thread-pool.h" diff --git a/include/hw/mem/pc-dimm.h b/include/hw/mem/pc-dimm.h index 47b246f95c..289edc0f3d 100644 --- a/include/hw/mem/pc-dimm.h +++ b/include/hw/mem/pc-dimm.h @@ -17,7 +17,6 @@ #define QEMU_PC_DIMM_H #include "exec/memory.h" -#include "sysemu/hostmem.h" #include "hw/qdev-core.h" #define TYPE_PC_DIMM "pc-dimm" diff --git a/include/hw/virtio/virtio-pmem.h b/include/hw/virtio/virtio-pmem.h index 8bf2ae780f..33f1999320 100644 --- a/include/hw/virtio/virtio-pmem.h +++ b/include/hw/virtio/virtio-pmem.h @@ -16,7 +16,6 @@ #include "hw/virtio/virtio.h" #include "qapi/qapi-types-misc.h" -#include "sysemu/hostmem.h" #define TYPE_VIRTIO_PMEM "virtio-pmem" diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 9e1283aacf..f569f5f270 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -33,6 +33,7 @@ typedef struct FWCfgEntry FWCfgEntry; typedef struct FWCfgIoState FWCfgIoState; typedef struct FWCfgMemState FWCfgMemState; typedef struct FWCfgState FWCfgState; +typedef struct HostMemoryBackend HostMemoryBackend; typedef struct HVFX86EmulatorState HVFX86EmulatorState; typedef struct I2CBus I2CBus; typedef struct I2SCodec I2SCodec; diff --git a/include/sysemu/hostmem.h b/include/sysemu/hostmem.h index 92fa0e458c..afeb5db1b1 100644 --- a/include/sysemu/hostmem.h +++ b/include/sysemu/hostmem.h @@ -27,7 +27,6 @@ #define MEMORY_BACKEND_CLASS(klass) \ OBJECT_CLASS_CHECK(HostMemoryBackendClass, (klass), TYPE_MEMORY_BACKEND) -typedef struct HostMemoryBackend HostMemoryBackend; typedef struct HostMemoryBackendClass HostMemoryBackendClass; /** From patchwork Fri Jul 26 12:05:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 11060879 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7D4CB746 for ; Fri, 26 Jul 2019 12:07:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6CF4628812 for ; Fri, 26 Jul 2019 12:07:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 60CFF28AA8; Fri, 26 Jul 2019 12:07:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id EA84128812 for ; Fri, 26 Jul 2019 12:07:21 +0000 (UTC) Received: from localhost ([::1]:39252 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqz0J-0002jk-Ft for patchwork-qemu-devel@patchwork.kernel.org; Fri, 26 Jul 2019 08:07:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58677) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqyyy-0005W6-Un for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:06:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqyys-000850-Ch for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55109) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqyyr-0007y6-N2 for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:49 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B418181F35; Fri, 26 Jul 2019 12:05:48 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 54D331001B14; Fri, 26 Jul 2019 12:05:48 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 3C0E7114641B; Fri, 26 Jul 2019 14:05:43 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 26 Jul 2019 14:05:39 +0200 Message-Id: <20190726120542.9894-26-armbru@redhat.com> In-Reply-To: <20190726120542.9894-1-armbru@redhat.com> References: <20190726120542.9894-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Fri, 26 Jul 2019 12:05:48 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 25/28] numa: Move remaining NUMA declarations from sysemu.h to numa.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Commit e35704ba9c "numa: Move NUMA declarations from sysemu.h to numa.h" left a few NUMA-related macros behind. Move them now. Cc: Eduardo Habkost Cc: Marcel Apfelbaum Signed-off-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Eduardo Habkost --- exec.c | 2 +- hw/core/numa.c | 1 + hw/mem/pc-dimm.c | 1 + hw/pci/pci.c | 2 +- hw/ppc/spapr.c | 1 + include/sysemu/hostmem.h | 2 +- include/sysemu/numa.h | 9 +++++++-- include/sysemu/sysemu.h | 7 ------- 8 files changed, 13 insertions(+), 12 deletions(-) diff --git a/exec.c b/exec.c index 4d9e146c79..f0ac29aa26 100644 --- a/exec.c +++ b/exec.c @@ -45,7 +45,7 @@ #include "exec/memory.h" #include "exec/ioport.h" #include "sysemu/dma.h" -#include "sysemu/numa.h" +#include "sysemu/hostmem.h" #include "sysemu/hw_accel.h" #include "exec/address-spaces.h" #include "sysemu/xen-mapcache.h" diff --git a/hw/core/numa.c b/hw/core/numa.c index d817f06ead..450c522dd8 100644 --- a/hw/core/numa.c +++ b/hw/core/numa.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "sysemu/hostmem.h" #include "sysemu/numa.h" #include "exec/cpu-common.h" #include "exec/ramlist.h" diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index fa90d4fc6c..938706d5a7 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -28,6 +28,7 @@ #include "qapi/error.h" #include "qapi/visitor.h" #include "qemu/module.h" +#include "sysemu/hostmem.h" #include "sysemu/numa.h" #include "trace.h" diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 9001b81daa..4b6ffab13d 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -34,7 +34,7 @@ #include "migration/vmstate.h" #include "monitor/monitor.h" #include "net/net.h" -#include "sysemu/sysemu.h" +#include "sysemu/numa.h" #include "hw/loader.h" #include "qemu/error-report.h" #include "qemu/range.h" diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 06d23a5004..4044e61a0c 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -29,6 +29,7 @@ #include "qapi/error.h" #include "qapi/visitor.h" #include "sysemu/sysemu.h" +#include "sysemu/hostmem.h" #include "sysemu/numa.h" #include "sysemu/qtest.h" #include "sysemu/reset.h" diff --git a/include/sysemu/hostmem.h b/include/sysemu/hostmem.h index afeb5db1b1..4dbdadd39e 100644 --- a/include/sysemu/hostmem.h +++ b/include/sysemu/hostmem.h @@ -13,7 +13,7 @@ #ifndef SYSEMU_HOSTMEM_H #define SYSEMU_HOSTMEM_H -#include "sysemu/sysemu.h" /* for MAX_NODES */ +#include "sysemu/numa.h" #include "qapi/qapi-types-machine.h" #include "qom/object.h" #include "exec/memory.h" diff --git a/include/sysemu/numa.h b/include/sysemu/numa.h index 4c4c1dee9b..7a4ce89765 100644 --- a/include/sysemu/numa.h +++ b/include/sysemu/numa.h @@ -2,13 +2,18 @@ #define SYSEMU_NUMA_H #include "qemu/bitmap.h" -#include "sysemu/sysemu.h" -#include "sysemu/hostmem.h" #include "qapi/qapi-types-machine.h" #include "exec/cpu-common.h" struct CPUArchId; +#define MAX_NODES 128 +#define NUMA_NODE_UNASSIGNED MAX_NODES +#define NUMA_DISTANCE_MIN 10 +#define NUMA_DISTANCE_DEFAULT 20 +#define NUMA_DISTANCE_MAX 254 +#define NUMA_DISTANCE_UNREACHABLE 255 + extern int nb_numa_nodes; /* Number of NUMA nodes */ extern bool have_numa_distance; diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index ac18a1184a..227202999d 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -117,13 +117,6 @@ extern QEMUClockType rtc_clock; extern const char *mem_path; extern int mem_prealloc; -#define MAX_NODES 128 -#define NUMA_NODE_UNASSIGNED MAX_NODES -#define NUMA_DISTANCE_MIN 10 -#define NUMA_DISTANCE_DEFAULT 20 -#define NUMA_DISTANCE_MAX 254 -#define NUMA_DISTANCE_UNREACHABLE 255 - #define MAX_OPTION_ROMS 16 typedef struct QEMUOptionRom { const char *name; From patchwork Fri Jul 26 12:05:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 11060927 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DD79813A0 for ; Fri, 26 Jul 2019 12:10:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C9A8728812 for ; Fri, 26 Jul 2019 12:10:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BDE3D288E2; Fri, 26 Jul 2019 12:10:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1194F28812 for ; Fri, 26 Jul 2019 12:10:55 +0000 (UTC) Received: from localhost ([::1]:39376 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqz3m-0000kZ-6m for patchwork-qemu-devel@patchwork.kernel.org; Fri, 26 Jul 2019 08:10:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58963) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqyz4-0005oD-4f for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:06:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqyys-00087A-R9 for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:06:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40574) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqyys-00080k-8X for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:50 -0400 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 3F1F2C025019 for ; Fri, 26 Jul 2019 12:05:49 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5DA1A60606 for ; Fri, 26 Jul 2019 12:05:48 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 43B091146430; Fri, 26 Jul 2019 14:05:43 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 26 Jul 2019 14:05:40 +0200 Message-Id: <20190726120542.9894-27-armbru@redhat.com> In-Reply-To: <20190726120542.9894-1-armbru@redhat.com> References: <20190726120542.9894-1-armbru@redhat.com> MIME-Version: 1.0 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]); Fri, 26 Jul 2019 12:05:49 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 26/28] Clean up inclusion of sysemu/sysemu.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP In my "build everything" tree, changing sysemu/sysemu.h triggers a recompile of some 5400 out of 6600 objects (not counting tests and objects that don't depend on qemu/osdep.h). 119 of 380 #include directives are actually superfluous. Delete them. Downgrade two more to qapi/qapi-types-run-state.h, and move one from char/serial.h to char/serial.c. This doesn't reduce actual use much, as it's still included into widely included headers. The next commits will tackle that. Signed-off-by: Markus Armbruster --- accel/tcg/tcg-all.c | 1 - block/nfs.c | 1 - blockdev-nbd.c | 1 - dump/win_dump.c | 1 - hw/acpi/pcihp.c | 1 - hw/acpi/vmgenid.c | 1 - hw/alpha/pci.c | 1 - hw/alpha/typhoon.c | 1 - hw/arm/nrf51_soc.c | 1 - hw/arm/smmu-common.c | 1 - hw/arm/smmuv3.c | 1 - hw/arm/sysbus-fdt.c | 1 - hw/arm/z2.c | 1 - hw/char/exynos4210_uart.c | 1 - hw/char/imx_serial.c | 1 - hw/char/serial.c | 1 + hw/core/loader-fit.c | 1 - hw/core/platform-bus.c | 1 - hw/core/qdev.c | 1 - hw/display/ramfb-standalone.c | 1 - hw/display/ramfb.c | 1 - hw/dma/xlnx-zynq-devcfg.c | 1 - hw/hppa/dino.c | 1 - hw/hppa/pci.c | 1 - hw/i2c/smbus_ich9.c | 1 - hw/ide/cmd646.c | 1 - hw/ide/ioport.c | 1 - hw/ide/piix.c | 1 - hw/ide/via.c | 1 - hw/input/adb-kbd.c | 1 - hw/intc/allwinner-a10-pic.c | 1 - hw/intc/mips_gic.c | 1 - hw/intc/xics_pnv.c | 1 - hw/ipmi/ipmi_bmc_extern.c | 1 - hw/isa/vt82c686.c | 1 - hw/misc/armsse-cpuid.c | 1 - hw/misc/armsse-mhu.c | 1 - hw/misc/imx6_src.c | 1 - hw/misc/imx7_gpr.c | 1 - hw/misc/iotkit-sysinfo.c | 1 - hw/misc/mips_cmgcr.c | 1 - hw/misc/mos6522.c | 1 - hw/misc/sga.c | 1 - hw/misc/zynq-xadc.c | 1 - hw/net/fsl_etsec/etsec.c | 1 - hw/net/lan9118.c | 1 - hw/net/ne2000.c | 1 - hw/net/opencores_eth.c | 1 - hw/net/pcnet.c | 1 - hw/nios2/generic_nommu.c | 1 - hw/pci-host/pam.c | 1 - hw/ppc/pnv_bmc.c | 1 - hw/ppc/pnv_core.c | 1 - hw/ppc/pnv_lpc.c | 1 - hw/ppc/pnv_occ.c | 1 - hw/ppc/ppce500_spin.c | 1 - hw/ppc/spapr_rng.c | 1 - hw/ppc/spapr_vio.c | 1 - hw/s390x/event-facility.c | 1 - hw/s390x/sclpcpu.c | 1 - hw/s390x/virtio-ccw.c | 1 - hw/scsi/scsi-disk.c | 1 - hw/sd/milkymist-memcard.c | 1 - hw/ssi/aspeed_smc.c | 1 - hw/ssi/imx_spi.c | 1 - hw/ssi/xilinx_spi.c | 1 - hw/ssi/xilinx_spips.c | 1 - hw/timer/allwinner-a10-pit.c | 1 - hw/timer/altera_timer.c | 1 - hw/timer/exynos4210_rtc.c | 1 - hw/tricore/tricore_testboard.c | 1 - hw/usb/hcd-ehci.h | 1 - hw/vfio/ap.c | 1 - hw/vfio/platform.c | 1 - hw/xen/xen_pt_load_rom.c | 1 - hw/xtensa/xtensa_memory.c | 1 - include/hw/arm/allwinner-a10.h | 1 - include/hw/char/serial.h | 1 - include/hw/i386/pc.h | 1 - include/hw/riscv/riscv_htif.h | 1 - include/hw/timer/stm32f2xx_timer.h | 1 - include/hw/virtio/virtio-bus.h | 1 - include/hw/xen/xen-legacy-backend.h | 1 - include/migration/global_state.h | 2 +- include/sysemu/kvm_int.h | 1 - include/sysemu/replay.h | 2 +- include/ui/spice-display.h | 1 - net/netmap.c | 1 - net/tap-bsd.c | 1 - net/tap-linux.c | 1 - net/tap-solaris.c | 1 - net/tap-win32.c | 1 - qemu-img.c | 1 - qom/cpu.c | 1 - replay/replay-audio.c | 1 - replay/replay-char.c | 1 - replay/replay-net.c | 1 - replay/replay-snapshot.c | 1 - stubs/replay.c | 1 - target/arm/cpu64.c | 1 - target/arm/helper-a64.c | 1 - target/arm/helper.c | 1 - target/arm/kvm32.c | 1 - target/arm/kvm64.c | 1 - target/arm/m_helper.c | 1 - target/i386/hvf/x86_task.c | 1 - target/lm32/helper.c | 1 - target/m68k/m68k-semi.c | 1 - target/nios2/nios2-semi.c | 1 - target/ppc/kvm.c | 1 - target/sparc/helper.c | 1 - target/xtensa/translate.c | 1 - target/xtensa/xtensa-semi.c | 1 - tests/migration-test.c | 1 - ui/input-keymap.c | 1 - ui/input-legacy.c | 1 - ui/input-linux.c | 1 - ui/keymaps.c | 1 - ui/sdl2-2d.c | 1 - ui/sdl2-gl.c | 1 - ui/sdl2-input.c | 1 - ui/spice-display.c | 1 - util/qemu-timer.c | 1 - 123 files changed, 3 insertions(+), 122 deletions(-) diff --git a/accel/tcg/tcg-all.c b/accel/tcg/tcg-all.c index c92d4c82ed..c59d5b0024 100644 --- a/accel/tcg/tcg-all.c +++ b/accel/tcg/tcg-all.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include "sysemu/accel.h" -#include "sysemu/sysemu.h" #include "sysemu/tcg.h" #include "qom/object.h" #include "cpu.h" diff --git a/block/nfs.c b/block/nfs.c index a1fe004c61..ed0cce63bb 100644 --- a/block/nfs.c +++ b/block/nfs.c @@ -37,7 +37,6 @@ #include "qemu/option.h" #include "qemu/uri.h" #include "qemu/cutils.h" -#include "sysemu/sysemu.h" #include "qapi/qapi-visit-block-core.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" diff --git a/blockdev-nbd.c b/blockdev-nbd.c index 66eebab318..7a71da447f 100644 --- a/blockdev-nbd.c +++ b/blockdev-nbd.c @@ -15,7 +15,6 @@ #include "hw/block/block.h" #include "qapi/error.h" #include "qapi/qapi-commands-block.h" -#include "sysemu/sysemu.h" #include "block/nbd.h" #include "io/channel-socket.h" #include "io/net-listener.h" diff --git a/dump/win_dump.c b/dump/win_dump.c index 0142655d3d..eda2a48974 100644 --- a/dump/win_dump.c +++ b/dump/win_dump.c @@ -17,7 +17,6 @@ #include "monitor/monitor.h" #include "sysemu/kvm.h" #include "sysemu/dump.h" -#include "sysemu/sysemu.h" #include "sysemu/memory_mapping.h" #include "sysemu/cpus.h" #include "qapi/error.h" diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c index ac49a5a77b..82d295b6e8 100644 --- a/hw/acpi/pcihp.c +++ b/hw/acpi/pcihp.c @@ -31,7 +31,6 @@ #include "hw/pci/pci.h" #include "hw/pci/pci_bridge.h" #include "hw/acpi/acpi.h" -#include "sysemu/sysemu.h" #include "exec/address-spaces.h" #include "hw/pci/pci_bus.h" #include "migration/vmstate.h" diff --git a/hw/acpi/vmgenid.c b/hw/acpi/vmgenid.c index 4eae426969..6e11b0fa9b 100644 --- a/hw/acpi/vmgenid.c +++ b/hw/acpi/vmgenid.c @@ -21,7 +21,6 @@ #include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "sysemu/reset.h" -#include "sysemu/sysemu.h" void vmgenid_build_acpi(VmGenIdState *vms, GArray *table_data, GArray *guid, BIOSLinker *linker) diff --git a/hw/alpha/pci.c b/hw/alpha/pci.c index fb902bb92d..72251fcdf0 100644 --- a/hw/alpha/pci.c +++ b/hw/alpha/pci.c @@ -9,7 +9,6 @@ #include "qemu/osdep.h" #include "alpha_sys.h" #include "qemu/log.h" -#include "sysemu/sysemu.h" #include "trace.h" diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c index 1c0565acc1..179e1f7658 100644 --- a/hw/alpha/typhoon.c +++ b/hw/alpha/typhoon.c @@ -13,7 +13,6 @@ #include "cpu.h" #include "hw/boards.h" #include "hw/irq.h" -#include "sysemu/sysemu.h" #include "alpha_sys.h" #include "exec/address-spaces.h" diff --git a/hw/arm/nrf51_soc.c b/hw/arm/nrf51_soc.c index d9e54fefbb..74029169d0 100644 --- a/hw/arm/nrf51_soc.c +++ b/hw/arm/nrf51_soc.c @@ -14,7 +14,6 @@ #include "hw/sysbus.h" #include "hw/misc/unimp.h" #include "exec/address-spaces.h" -#include "sysemu/sysemu.h" #include "qemu/log.h" #include "cpu.h" diff --git a/hw/arm/smmu-common.c b/hw/arm/smmu-common.c index 717d22bcbe..956ebe32c8 100644 --- a/hw/arm/smmu-common.c +++ b/hw/arm/smmu-common.c @@ -17,7 +17,6 @@ */ #include "qemu/osdep.h" -#include "sysemu/sysemu.h" #include "exec/address-spaces.h" #include "trace.h" #include "exec/target_page.h" diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c index 0ccc772390..2eaf07fb5f 100644 --- a/hw/arm/smmuv3.c +++ b/hw/arm/smmuv3.c @@ -18,7 +18,6 @@ #include "qemu/osdep.h" #include "hw/irq.h" -#include "sysemu/sysemu.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "hw/qdev-core.h" diff --git a/hw/arm/sysbus-fdt.c b/hw/arm/sysbus-fdt.c index 57f94e6581..022fc97ecd 100644 --- a/hw/arm/sysbus-fdt.c +++ b/hw/arm/sysbus-fdt.c @@ -31,7 +31,6 @@ #include "qemu/error-report.h" #include "sysemu/device_tree.h" #include "hw/platform-bus.h" -#include "sysemu/sysemu.h" #include "hw/vfio/vfio-platform.h" #include "hw/vfio/vfio-calxeda-xgmac.h" #include "hw/vfio/vfio-amd-xgbe.h" diff --git a/hw/arm/z2.c b/hw/arm/z2.c index 1e3db425ef..3923b87e4c 100644 --- a/hw/arm/z2.c +++ b/hw/arm/z2.c @@ -19,7 +19,6 @@ #include "hw/ssi/ssi.h" #include "migration/vmstate.h" #include "hw/boards.h" -#include "sysemu/sysemu.h" #include "hw/block/flash.h" #include "ui/console.h" #include "hw/audio/wm8750.h" diff --git a/hw/char/exynos4210_uart.c b/hw/char/exynos4210_uart.c index 49e279d5df..d6b6b62366 100644 --- a/hw/char/exynos4210_uart.c +++ b/hw/char/exynos4210_uart.c @@ -24,7 +24,6 @@ #include "migration/vmstate.h" #include "qemu/error-report.h" #include "qemu/module.h" -#include "sysemu/sysemu.h" #include "chardev/char-fe.h" #include "chardev/char-serial.h" diff --git a/hw/char/imx_serial.c b/hw/char/imx_serial.c index e49baa994c..fddde9b43d 100644 --- a/hw/char/imx_serial.c +++ b/hw/char/imx_serial.c @@ -23,7 +23,6 @@ #include "hw/irq.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" -#include "sysemu/sysemu.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/char/serial.c b/hw/char/serial.c index 4d54163a62..72580f19d0 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -31,6 +31,7 @@ #include "qapi/error.h" #include "qemu/timer.h" #include "sysemu/reset.h" +#include "sysemu/sysemu.h" #include "qemu/error-report.h" #include "trace.h" diff --git a/hw/core/loader-fit.c b/hw/core/loader-fit.c index f27b6af942..953b16bc82 100644 --- a/hw/core/loader-fit.c +++ b/hw/core/loader-fit.c @@ -26,7 +26,6 @@ #include "qemu/cutils.h" #include "qemu/error-report.h" #include "sysemu/device_tree.h" -#include "sysemu/sysemu.h" #include #include diff --git a/hw/core/platform-bus.c b/hw/core/platform-bus.c index 9c9a9c271f..edb0da1de8 100644 --- a/hw/core/platform-bus.c +++ b/hw/core/platform-bus.c @@ -24,7 +24,6 @@ #include "hw/qdev-properties.h" #include "qemu/error-report.h" #include "qemu/module.h" -#include "sysemu/sysemu.h" /* diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 8c055df1cb..60d66c2f39 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -26,7 +26,6 @@ this API directly. */ #include "qemu/osdep.h" -#include "sysemu/sysemu.h" #include "qapi/error.h" #include "qapi/qapi-events-qdev.h" #include "qapi/qmp/qerror.h" diff --git a/hw/display/ramfb-standalone.c b/hw/display/ramfb-standalone.c index ebd623a669..1f72450303 100644 --- a/hw/display/ramfb-standalone.c +++ b/hw/display/ramfb-standalone.c @@ -6,7 +6,6 @@ #include "hw/isa/isa.h" #include "hw/display/ramfb.h" #include "ui/console.h" -#include "sysemu/sysemu.h" #define RAMFB(obj) OBJECT_CHECK(RAMFBStandaloneState, (obj), TYPE_RAMFB_DEVICE) diff --git a/hw/display/ramfb.c b/hw/display/ramfb.c index 6026a35b11..cd94940223 100644 --- a/hw/display/ramfb.c +++ b/hw/display/ramfb.c @@ -18,7 +18,6 @@ #include "hw/display/ramfb.h" #include "ui/console.h" #include "sysemu/reset.h" -#include "sysemu/sysemu.h" struct QEMU_PACKED RAMFBCfg { uint64_t addr; diff --git a/hw/dma/xlnx-zynq-devcfg.c b/hw/dma/xlnx-zynq-devcfg.c index 89200ff15d..e33112b6f0 100644 --- a/hw/dma/xlnx-zynq-devcfg.c +++ b/hw/dma/xlnx-zynq-devcfg.c @@ -29,7 +29,6 @@ #include "hw/irq.h" #include "migration/vmstate.h" #include "qemu/bitops.h" -#include "sysemu/sysemu.h" #include "sysemu/dma.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/hppa/dino.c b/hw/hppa/dino.c index bb9d0e033c..e0466ee055 100644 --- a/hw/hppa/dino.c +++ b/hw/hppa/dino.c @@ -16,7 +16,6 @@ #include "qapi/error.h" #include "cpu.h" #include "hw/irq.h" -#include "sysemu/sysemu.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bus.h" #include "migration/vmstate.h" diff --git a/hw/hppa/pci.c b/hw/hppa/pci.c index b6606d9719..32609aba63 100644 --- a/hw/hppa/pci.c +++ b/hw/hppa/pci.c @@ -6,7 +6,6 @@ #include "qemu/osdep.h" #include "hppa_sys.h" #include "qemu/log.h" -#include "sysemu/sysemu.h" #include "trace.h" diff --git a/hw/i2c/smbus_ich9.c b/hw/i2c/smbus_ich9.c index 564198dae9..fd50fb851a 100644 --- a/hw/i2c/smbus_ich9.c +++ b/hw/i2c/smbus_ich9.c @@ -25,7 +25,6 @@ #include "hw/pci/pci.h" #include "migration/vmstate.h" #include "qemu/module.h" -#include "sysemu/sysemu.h" #include "hw/i386/ich9.h" diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index 3fbfc5ea45..f3ccd11c79 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -29,7 +29,6 @@ #include "migration/vmstate.h" #include "qemu/module.h" #include "hw/isa/isa.h" -#include "sysemu/sysemu.h" #include "sysemu/dma.h" #include "sysemu/reset.h" diff --git a/hw/ide/ioport.c b/hw/ide/ioport.c index e6085612d4..ab1f4e5d9c 100644 --- a/hw/ide/ioport.c +++ b/hw/ide/ioport.c @@ -27,7 +27,6 @@ #include "hw/isa/isa.h" #include "qemu/error-report.h" #include "qemu/timer.h" -#include "sysemu/sysemu.h" #include "sysemu/blockdev.h" #include "sysemu/dma.h" #include "hw/block/block.h" diff --git a/hw/ide/piix.c b/hw/ide/piix.c index bcfd119a8e..fba6bc8bff 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -28,7 +28,6 @@ #include "migration/vmstate.h" #include "qemu/module.h" #include "sysemu/block-backend.h" -#include "sysemu/sysemu.h" #include "sysemu/blockdev.h" #include "sysemu/dma.h" #include "sysemu/reset.h" diff --git a/hw/ide/via.c b/hw/ide/via.c index 45f929395f..7087dc676e 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -28,7 +28,6 @@ #include "hw/pci/pci.h" #include "migration/vmstate.h" #include "qemu/module.h" -#include "sysemu/sysemu.h" #include "sysemu/dma.h" #include "sysemu/reset.h" diff --git a/hw/input/adb-kbd.c b/hw/input/adb-kbd.c index b3c4aeded1..0ba8207589 100644 --- a/hw/input/adb-kbd.c +++ b/hw/input/adb-kbd.c @@ -28,7 +28,6 @@ #include "qemu/module.h" #include "ui/input.h" #include "hw/input/adb-keys.h" -#include "sysemu/sysemu.h" #include "adb-internal.h" #include "trace.h" diff --git a/hw/intc/allwinner-a10-pic.c b/hw/intc/allwinner-a10-pic.c index 79959a4d23..8cca124807 100644 --- a/hw/intc/allwinner-a10-pic.c +++ b/hw/intc/allwinner-a10-pic.c @@ -18,7 +18,6 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "migration/vmstate.h" -#include "sysemu/sysemu.h" #include "hw/intc/allwinner-a10-pic.h" #include "hw/irq.h" #include "qemu/log.h" diff --git a/hw/intc/mips_gic.c b/hw/intc/mips_gic.c index 524cc3ca45..54b3059f3f 100644 --- a/hw/intc/mips_gic.c +++ b/hw/intc/mips_gic.c @@ -15,7 +15,6 @@ #include "qapi/error.h" #include "hw/sysbus.h" #include "exec/memory.h" -#include "sysemu/sysemu.h" #include "sysemu/kvm.h" #include "sysemu/reset.h" #include "kvm_mips.h" diff --git a/hw/intc/xics_pnv.c b/hw/intc/xics_pnv.c index 67f2702e52..35f3811264 100644 --- a/hw/intc/xics_pnv.c +++ b/hw/intc/xics_pnv.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "sysemu/sysemu.h" #include "qemu/log.h" #include "qemu/module.h" #include "hw/ppc/xics.h" diff --git a/hw/ipmi/ipmi_bmc_extern.c b/hw/ipmi/ipmi_bmc_extern.c index 4405aa634e..573428eca1 100644 --- a/hw/ipmi/ipmi_bmc_extern.c +++ b/hw/ipmi/ipmi_bmc_extern.c @@ -33,7 +33,6 @@ #include "qapi/error.h" #include "qemu/timer.h" #include "chardev/char-fe.h" -#include "sysemu/sysemu.h" #include "hw/ipmi/ipmi.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 1bc915405b..50bd28fa82 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -24,7 +24,6 @@ #include "hw/acpi/acpi.h" #include "hw/i2c/pm_smbus.h" #include "sysemu/reset.h" -#include "sysemu/sysemu.h" #include "qemu/module.h" #include "qemu/timer.h" #include "exec/address-spaces.h" diff --git a/hw/misc/armsse-cpuid.c b/hw/misc/armsse-cpuid.c index 5f225096f6..8ab15fea81 100644 --- a/hw/misc/armsse-cpuid.c +++ b/hw/misc/armsse-cpuid.c @@ -23,7 +23,6 @@ #include "qemu/module.h" #include "trace.h" #include "qapi/error.h" -#include "sysemu/sysemu.h" #include "hw/sysbus.h" #include "hw/registerfields.h" #include "hw/misc/armsse-cpuid.h" diff --git a/hw/misc/armsse-mhu.c b/hw/misc/armsse-mhu.c index 34b6205f11..a45d97fada 100644 --- a/hw/misc/armsse-mhu.c +++ b/hw/misc/armsse-mhu.c @@ -20,7 +20,6 @@ #include "qemu/module.h" #include "trace.h" #include "qapi/error.h" -#include "sysemu/sysemu.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "hw/registerfields.h" diff --git a/hw/misc/imx6_src.c b/hw/misc/imx6_src.c index b9d86fe530..8ab18967b5 100644 --- a/hw/misc/imx6_src.c +++ b/hw/misc/imx6_src.c @@ -11,7 +11,6 @@ #include "qemu/osdep.h" #include "hw/misc/imx6_src.h" #include "migration/vmstate.h" -#include "sysemu/sysemu.h" #include "qemu/bitops.h" #include "qemu/log.h" #include "qemu/main-loop.h" diff --git a/hw/misc/imx7_gpr.c b/hw/misc/imx7_gpr.c index 09d57d4710..b03341a2eb 100644 --- a/hw/misc/imx7_gpr.c +++ b/hw/misc/imx7_gpr.c @@ -16,7 +16,6 @@ #include "hw/misc/imx7_gpr.h" #include "qemu/log.h" #include "qemu/module.h" -#include "sysemu/sysemu.h" #include "trace.h" diff --git a/hw/misc/iotkit-sysinfo.c b/hw/misc/iotkit-sysinfo.c index 0106fa48d3..783e613959 100644 --- a/hw/misc/iotkit-sysinfo.c +++ b/hw/misc/iotkit-sysinfo.c @@ -22,7 +22,6 @@ #include "qemu/module.h" #include "trace.h" #include "qapi/error.h" -#include "sysemu/sysemu.h" #include "hw/sysbus.h" #include "hw/registerfields.h" #include "hw/misc/iotkit-sysinfo.h" diff --git a/hw/misc/mips_cmgcr.c b/hw/misc/mips_cmgcr.c index 0feab092f1..8176d91c0c 100644 --- a/hw/misc/mips_cmgcr.c +++ b/hw/misc/mips_cmgcr.c @@ -14,7 +14,6 @@ #include "qemu/module.h" #include "hw/sysbus.h" #include "migration/vmstate.h" -#include "sysemu/sysemu.h" #include "hw/misc/mips_cmgcr.h" #include "hw/misc/mips_cpc.h" #include "hw/qdev-properties.h" diff --git a/hw/misc/mos6522.c b/hw/misc/mos6522.c index 4d99350e22..57f13db266 100644 --- a/hw/misc/mos6522.c +++ b/hw/misc/mos6522.c @@ -31,7 +31,6 @@ #include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/timer.h" -#include "sysemu/sysemu.h" #include "qemu/cutils.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/sga.c b/hw/misc/sga.c index da04924f5f..6866bf72cb 100644 --- a/hw/misc/sga.c +++ b/hw/misc/sga.c @@ -29,7 +29,6 @@ #include "hw/isa/isa.h" #include "hw/loader.h" #include "qemu/module.h" -#include "sysemu/sysemu.h" #define SGABIOS_FILENAME "sgabios.bin" diff --git a/hw/misc/zynq-xadc.c b/hw/misc/zynq-xadc.c index 7745df4c85..7b1972ce06 100644 --- a/hw/misc/zynq-xadc.c +++ b/hw/misc/zynq-xadc.c @@ -18,7 +18,6 @@ #include "hw/misc/zynq-xadc.h" #include "migration/vmstate.h" #include "qemu/timer.h" -#include "sysemu/sysemu.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c index e1556236b0..8451c17fb8 100644 --- a/hw/net/fsl_etsec/etsec.c +++ b/hw/net/fsl_etsec/etsec.c @@ -27,7 +27,6 @@ */ #include "qemu/osdep.h" -#include "sysemu/sysemu.h" #include "hw/sysbus.h" #include "hw/irq.h" #include "hw/ptimer.h" diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c index e7662f0575..8bba2a8056 100644 --- a/hw/net/lan9118.c +++ b/hw/net/lan9118.c @@ -18,7 +18,6 @@ #include "hw/hw.h" #include "hw/irq.h" #include "hw/net/lan9118.h" -#include "sysemu/sysemu.h" #include "hw/ptimer.h" #include "hw/qdev-properties.h" #include "qemu/log.h" diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c index a1a1046494..6c17ee1ae2 100644 --- a/hw/net/ne2000.c +++ b/hw/net/ne2000.c @@ -29,7 +29,6 @@ #include "hw/irq.h" #include "migration/vmstate.h" #include "ne2000.h" -#include "sysemu/sysemu.h" #include "trace.h" /* debug NE2000 card */ diff --git a/hw/net/opencores_eth.c b/hw/net/opencores_eth.c index aa13159464..84a95da1d5 100644 --- a/hw/net/opencores_eth.c +++ b/hw/net/opencores_eth.c @@ -39,7 +39,6 @@ #include "net/net.h" #include "qemu/module.h" #include "net/eth.h" -#include "sysemu/sysemu.h" #include "trace.h" /* RECSMALL is not used because it breaks tap networking in linux: diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c index 107ac680b2..f3f18d8598 100644 --- a/hw/net/pcnet.c +++ b/hw/net/pcnet.c @@ -43,7 +43,6 @@ #include "net/net.h" #include "net/eth.h" #include "qemu/timer.h" -#include "sysemu/sysemu.h" #include "trace.h" #include "pcnet.h" diff --git a/hw/nios2/generic_nommu.c b/hw/nios2/generic_nommu.c index 2ec91e899b..19899e2c1e 100644 --- a/hw/nios2/generic_nommu.c +++ b/hw/nios2/generic_nommu.c @@ -33,7 +33,6 @@ #include "hw/sysbus.h" #include "hw/char/serial.h" -#include "sysemu/sysemu.h" #include "hw/boards.h" #include "exec/memory.h" #include "exec/address-spaces.h" diff --git a/hw/pci-host/pam.c b/hw/pci-host/pam.c index aa5ecfd0c2..45c4333cd3 100644 --- a/hw/pci-host/pam.c +++ b/hw/pci-host/pam.c @@ -29,7 +29,6 @@ #include "qemu/osdep.h" #include "qom/object.h" -#include "sysemu/sysemu.h" #include "hw/pci-host/pam.h" void init_pam(DeviceState *dev, MemoryRegion *ram_memory, diff --git a/hw/ppc/pnv_bmc.c b/hw/ppc/pnv_bmc.c index a27776aa99..e5eb6e5a70 100644 --- a/hw/ppc/pnv_bmc.c +++ b/hw/ppc/pnv_bmc.c @@ -17,7 +17,6 @@ */ #include "qemu/osdep.h" -#include "sysemu/sysemu.h" #include "target/ppc/cpu.h" #include "qemu/log.h" #include "hw/ipmi/ipmi.h" diff --git a/hw/ppc/pnv_core.c b/hw/ppc/pnv_core.c index c6b0fee56f..b1a7489e7a 100644 --- a/hw/ppc/pnv_core.c +++ b/hw/ppc/pnv_core.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "sysemu/reset.h" -#include "sysemu/sysemu.h" #include "qapi/error.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/ppc/pnv_lpc.c b/hw/ppc/pnv_lpc.c index d4433d73e1..9466d4a1be 100644 --- a/hw/ppc/pnv_lpc.c +++ b/hw/ppc/pnv_lpc.c @@ -18,7 +18,6 @@ */ #include "qemu/osdep.h" -#include "sysemu/sysemu.h" #include "target/ppc/cpu.h" #include "qapi/error.h" #include "qemu/log.h" diff --git a/hw/ppc/pnv_occ.c b/hw/ppc/pnv_occ.c index 6120405379..8bead2c930 100644 --- a/hw/ppc/pnv_occ.c +++ b/hw/ppc/pnv_occ.c @@ -17,7 +17,6 @@ */ #include "qemu/osdep.h" -#include "sysemu/sysemu.h" #include "target/ppc/cpu.h" #include "qapi/error.h" #include "qemu/log.h" diff --git a/hw/ppc/ppce500_spin.c b/hw/ppc/ppce500_spin.c index 0060fcb43f..66c1065db2 100644 --- a/hw/ppc/ppce500_spin.c +++ b/hw/ppc/ppce500_spin.c @@ -33,7 +33,6 @@ #include "hw/hw.h" #include "hw/sysbus.h" #include "sysemu/hw_accel.h" -#include "sysemu/sysemu.h" #include "e500.h" #define MAX_CPUS 32 diff --git a/hw/ppc/spapr_rng.c b/hw/ppc/spapr_rng.c index 27198e0ced..954e4aec4b 100644 --- a/hw/ppc/spapr_rng.c +++ b/hw/ppc/spapr_rng.c @@ -23,7 +23,6 @@ #include "qemu/error-report.h" #include "qemu/main-loop.h" #include "qemu/module.h" -#include "sysemu/sysemu.h" #include "sysemu/device_tree.h" #include "sysemu/rng.h" #include "hw/ppc/spapr.h" diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c index 910c57fce5..0803649658 100644 --- a/hw/ppc/spapr_vio.c +++ b/hw/ppc/spapr_vio.c @@ -25,7 +25,6 @@ #include "qapi/visitor.h" #include "hw/irq.h" #include "qemu/log.h" -#include "sysemu/sysemu.h" #include "hw/loader.h" #include "elf.h" #include "hw/sysbus.h" diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c index 056f0711fa..797ecbb7a9 100644 --- a/hw/s390x/event-facility.c +++ b/hw/s390x/event-facility.c @@ -18,7 +18,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/module.h" -#include "sysemu/sysemu.h" #include "hw/s390x/sclp.h" #include "migration/vmstate.h" diff --git a/hw/s390x/sclpcpu.c b/hw/s390x/sclpcpu.c index a4aab7df51..62806d3273 100644 --- a/hw/s390x/sclpcpu.c +++ b/hw/s390x/sclpcpu.c @@ -14,7 +14,6 @@ */ #include "qemu/osdep.h" -#include "sysemu/sysemu.h" #include "hw/s390x/sclp.h" #include "qemu/module.h" #include "hw/s390x/event-facility.h" diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index a371370221..6580ce5907 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -12,7 +12,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "sysemu/sysemu.h" #include "sysemu/kvm.h" #include "net/net.h" #include "hw/virtio/virtio.h" diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index 2f30f4b206..1086339016 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -30,7 +30,6 @@ #include "migration/vmstate.h" #include "hw/scsi/emulation.h" #include "scsi/constants.h" -#include "sysemu/sysemu.h" #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" #include "hw/block/block.h" diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c index 79a9a5c52c..926e1af475 100644 --- a/hw/sd/milkymist-memcard.c +++ b/hw/sd/milkymist-memcard.c @@ -26,7 +26,6 @@ #include "qemu/module.h" #include "hw/sysbus.h" #include "migration/vmstate.h" -#include "sysemu/sysemu.h" #include "trace.h" #include "qapi/error.h" #include "sysemu/block-backend.h" diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c index b8332150f1..9f3cff5fb6 100644 --- a/hw/ssi/aspeed_smc.c +++ b/hw/ssi/aspeed_smc.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "migration/vmstate.h" -#include "sysemu/sysemu.h" #include "qemu/log.h" #include "qemu/module.h" #include "qemu/error-report.h" diff --git a/hw/ssi/imx_spi.c b/hw/ssi/imx_spi.c index c918e8cac8..2dd9a631e1 100644 --- a/hw/ssi/imx_spi.c +++ b/hw/ssi/imx_spi.c @@ -12,7 +12,6 @@ #include "hw/irq.h" #include "hw/ssi/imx_spi.h" #include "migration/vmstate.h" -#include "sysemu/sysemu.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/ssi/xilinx_spi.c b/hw/ssi/xilinx_spi.c index 24280dfeab..a1be0de039 100644 --- a/hw/ssi/xilinx_spi.c +++ b/hw/ssi/xilinx_spi.c @@ -27,7 +27,6 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "migration/vmstate.h" -#include "sysemu/sysemu.h" #include "qemu/log.h" #include "qemu/module.h" #include "qemu/fifo8.h" diff --git a/hw/ssi/xilinx_spips.c b/hw/ssi/xilinx_spips.c index 1605fa102b..a309c712ca 100644 --- a/hw/ssi/xilinx_spips.c +++ b/hw/ssi/xilinx_spips.c @@ -24,7 +24,6 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" -#include "sysemu/sysemu.h" #include "hw/irq.h" #include "hw/ptimer.h" #include "hw/qdev-properties.h" diff --git a/hw/timer/allwinner-a10-pit.c b/hw/timer/allwinner-a10-pit.c index 1e1f74f1a1..ca5a905059 100644 --- a/hw/timer/allwinner-a10-pit.c +++ b/hw/timer/allwinner-a10-pit.c @@ -19,7 +19,6 @@ #include "hw/irq.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" -#include "sysemu/sysemu.h" #include "hw/timer/allwinner-a10-pit.h" #include "migration/vmstate.h" #include "qemu/log.h" diff --git a/hw/timer/altera_timer.c b/hw/timer/altera_timer.c index c9988f67ac..936b31311d 100644 --- a/hw/timer/altera_timer.c +++ b/hw/timer/altera_timer.c @@ -24,7 +24,6 @@ #include "qapi/error.h" #include "hw/sysbus.h" -#include "sysemu/sysemu.h" #include "hw/irq.h" #include "hw/ptimer.h" #include "hw/qdev-properties.h" diff --git a/hw/timer/exynos4210_rtc.c b/hw/timer/exynos4210_rtc.c index 5c954cfa01..ea68904229 100644 --- a/hw/timer/exynos4210_rtc.c +++ b/hw/timer/exynos4210_rtc.c @@ -37,7 +37,6 @@ #include "hw/ptimer.h" #include "hw/irq.h" -#include "sysemu/sysemu.h" #include "hw/arm/exynos4210.h" diff --git a/hw/tricore/tricore_testboard.c b/hw/tricore/tricore_testboard.c index c6305dcdf1..aef3289f8c 100644 --- a/hw/tricore/tricore_testboard.c +++ b/hw/tricore/tricore_testboard.c @@ -23,7 +23,6 @@ #include "qapi/error.h" #include "cpu.h" #include "net/net.h" -#include "sysemu/sysemu.h" #include "hw/boards.h" #include "hw/loader.h" #include "exec/address-spaces.h" diff --git a/hw/usb/hcd-ehci.h b/hw/usb/hcd-ehci.h index fdbcfdcbeb..0298238f0b 100644 --- a/hw/usb/hcd-ehci.h +++ b/hw/usb/hcd-ehci.h @@ -21,7 +21,6 @@ #include "qemu/timer.h" #include "hw/usb.h" #include "sysemu/dma.h" -#include "sysemu/sysemu.h" #include "hw/pci/pci.h" #include "hw/sysbus.h" diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c index d53453aad6..da6a20669d 100644 --- a/hw/vfio/ap.c +++ b/hw/vfio/ap.c @@ -25,7 +25,6 @@ #include "cpu.h" #include "kvm_s390x.h" #include "migration/vmstate.h" -#include "sysemu/sysemu.h" #include "hw/qdev-properties.h" #include "hw/s390x/ap-bridge.h" #include "exec/address-spaces.h" diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c index d14f6b4a7a..d7598c6152 100644 --- a/hw/vfio/platform.c +++ b/hw/vfio/platform.c @@ -25,7 +25,6 @@ #include "qemu/main-loop.h" #include "qemu/module.h" #include "qemu/range.h" -#include "sysemu/sysemu.h" #include "exec/memory.h" #include "exec/address-spaces.h" #include "qemu/queue.h" diff --git a/hw/xen/xen_pt_load_rom.c b/hw/xen/xen_pt_load_rom.c index d111ecaf7e..307a5c93e2 100644 --- a/hw/xen/xen_pt_load_rom.c +++ b/hw/xen/xen_pt_load_rom.c @@ -9,7 +9,6 @@ #include "hw/loader.h" #include "monitor/monitor.h" #include "qemu/range.h" -#include "sysemu/sysemu.h" #include "hw/pci/pci.h" #include "xen_pt.h" diff --git a/hw/xtensa/xtensa_memory.c b/hw/xtensa/xtensa_memory.c index 40334db441..1c5f62b014 100644 --- a/hw/xtensa/xtensa_memory.c +++ b/hw/xtensa/xtensa_memory.c @@ -28,7 +28,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "cpu.h" -#include "sysemu/sysemu.h" #include "exec/memory.h" #include "qemu/error-report.h" #include "xtensa_memory.h" diff --git a/include/hw/arm/allwinner-a10.h b/include/hw/arm/allwinner-a10.h index 101b72a71d..7d2d215630 100644 --- a/include/hw/arm/allwinner-a10.h +++ b/include/hw/arm/allwinner-a10.h @@ -9,7 +9,6 @@ #include "hw/net/allwinner_emac.h" #include "hw/ide/ahci.h" -#include "sysemu/sysemu.h" #include "target/arm/cpu.h" diff --git a/include/hw/char/serial.h b/include/hw/char/serial.h index bfcbbb6e19..8be3d8a4f9 100644 --- a/include/hw/char/serial.h +++ b/include/hw/char/serial.h @@ -26,7 +26,6 @@ #ifndef HW_SERIAL_H #define HW_SERIAL_H -#include "sysemu/sysemu.h" #include "chardev/char-fe.h" #include "exec/memory.h" #include "qemu/fifo8.h" diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 859b64c51d..4bb9e29114 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -12,7 +12,6 @@ #include "qemu/range.h" #include "qemu/bitmap.h" #include "qemu/module.h" -#include "sysemu/sysemu.h" #include "hw/pci/pci.h" #include "hw/mem/pc-dimm.h" #include "hw/mem/nvdimm.h" diff --git a/include/hw/riscv/riscv_htif.h b/include/hw/riscv/riscv_htif.h index aabc059f32..fb9452cf51 100644 --- a/include/hw/riscv/riscv_htif.h +++ b/include/hw/riscv/riscv_htif.h @@ -22,7 +22,6 @@ #include "chardev/char.h" #include "chardev/char-fe.h" -#include "sysemu/sysemu.h" #include "exec/memory.h" #include "target/riscv/cpu.h" diff --git a/include/hw/timer/stm32f2xx_timer.h b/include/hw/timer/stm32f2xx_timer.h index e6a83237a5..a96bc08b1b 100644 --- a/include/hw/timer/stm32f2xx_timer.h +++ b/include/hw/timer/stm32f2xx_timer.h @@ -27,7 +27,6 @@ #include "hw/sysbus.h" #include "qemu/timer.h" -#include "sysemu/sysemu.h" #define TIM_CR1 0x00 #define TIM_CR2 0x04 diff --git a/include/hw/virtio/virtio-bus.h b/include/hw/virtio/virtio-bus.h index 8c9cc25b16..38c9399cd4 100644 --- a/include/hw/virtio/virtio-bus.h +++ b/include/hw/virtio/virtio-bus.h @@ -25,7 +25,6 @@ #ifndef VIRTIO_BUS_H #define VIRTIO_BUS_H -#include "sysemu/sysemu.h" #include "hw/qdev-core.h" #include "hw/virtio/virtio.h" diff --git a/include/hw/xen/xen-legacy-backend.h b/include/hw/xen/xen-legacy-backend.h index 07d4176ac1..5e6c56c4d6 100644 --- a/include/hw/xen/xen-legacy-backend.h +++ b/include/hw/xen/xen-legacy-backend.h @@ -3,7 +3,6 @@ #include "hw/xen/xen_common.h" #include "hw/xen/xen_pvdev.h" -#include "sysemu/sysemu.h" #include "net/net.h" #define TYPE_XENSYSDEV "xen-sysdev" diff --git a/include/migration/global_state.h b/include/migration/global_state.h index d307de8350..945eb35d5b 100644 --- a/include/migration/global_state.h +++ b/include/migration/global_state.h @@ -13,7 +13,7 @@ #ifndef QEMU_MIGRATION_GLOBAL_STATE_H #define QEMU_MIGRATION_GLOBAL_STATE_H -#include "sysemu/sysemu.h" +#include "qapi/qapi-types-run-state.h" void register_global_state(void); int global_state_store(void); diff --git a/include/sysemu/kvm_int.h b/include/sysemu/kvm_int.h index 5d341cc29b..72b2d1b3ae 100644 --- a/include/sysemu/kvm_int.h +++ b/include/sysemu/kvm_int.h @@ -10,7 +10,6 @@ #define QEMU_KVM_INT_H #include "exec/memory.h" -#include "sysemu/sysemu.h" #include "sysemu/accel.h" #include "sysemu/kvm.h" diff --git a/include/sysemu/replay.h b/include/sysemu/replay.h index 3a7c58e423..2f2ccdbc98 100644 --- a/include/sysemu/replay.h +++ b/include/sysemu/replay.h @@ -12,8 +12,8 @@ * */ -#include "sysemu.h" #include "qapi/qapi-types-misc.h" +#include "qapi/qapi-types-run-state.h" #include "qapi/qapi-types-ui.h" /* replay clock kinds */ diff --git a/include/ui/spice-display.h b/include/ui/spice-display.h index 58bb5b4c53..4a47ffdd4c 100644 --- a/include/ui/spice-display.h +++ b/include/ui/spice-display.h @@ -26,7 +26,6 @@ #include "qemu/thread.h" #include "ui/qemu-pixman.h" #include "ui/console.h" -#include "sysemu/sysemu.h" #if defined(CONFIG_OPENGL_DMABUF) # if SPICE_SERVER_VERSION >= 0x000d01 /* release 0.13.1 */ diff --git a/net/netmap.c b/net/netmap.c index 0cc8f545c5..e8e54c62d4 100644 --- a/net/netmap.c +++ b/net/netmap.c @@ -33,7 +33,6 @@ #include "net/net.h" #include "net/tap.h" #include "clients.h" -#include "sysemu/sysemu.h" #include "qemu/error-report.h" #include "qapi/error.h" #include "qemu/iov.h" diff --git a/net/tap-bsd.c b/net/tap-bsd.c index 5695e3dd1f..a5c3707f80 100644 --- a/net/tap-bsd.c +++ b/net/tap-bsd.c @@ -27,7 +27,6 @@ #include "qapi/error.h" #include "tap_int.h" #include "qemu/cutils.h" -#include "sysemu/sysemu.h" #include "qemu/error-report.h" #if defined(__NetBSD__) || defined(__FreeBSD__) diff --git a/net/tap-linux.c b/net/tap-linux.c index 941a45d7c3..e0dd442ee3 100644 --- a/net/tap-linux.c +++ b/net/tap-linux.c @@ -32,7 +32,6 @@ #include #include -#include "sysemu/sysemu.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/cutils.h" diff --git a/net/tap-solaris.c b/net/tap-solaris.c index 0e3f3e0a9b..4725d2314e 100644 --- a/net/tap-solaris.c +++ b/net/tap-solaris.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "tap_int.h" -#include "sysemu/sysemu.h" #include "qemu/ctype.h" #include "qemu/cutils.h" diff --git a/net/tap-win32.c b/net/tap-win32.c index 9cdef47286..2b5dcda36e 100644 --- a/net/tap-win32.c +++ b/net/tap-win32.c @@ -33,7 +33,6 @@ #include "clients.h" /* net_init_tap */ #include "net/net.h" #include "net/tap.h" /* tap_has_ufo, ... */ -#include "sysemu/sysemu.h" #include "qemu/error-report.h" #include "qemu/main-loop.h" #include diff --git a/qemu-img.c b/qemu-img.c index a398fd44d6..31c72dc746 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -42,7 +42,6 @@ #include "qemu/module.h" #include "qemu/units.h" #include "qom/object_interfaces.h" -#include "sysemu/sysemu.h" #include "sysemu/block-backend.h" #include "block/block_int.h" #include "block/blockjob.h" diff --git a/qom/cpu.c b/qom/cpu.c index cdb8c71b6b..aeb34f8c67 100644 --- a/qom/cpu.c +++ b/qom/cpu.c @@ -28,7 +28,6 @@ #include "exec/log.h" #include "qemu/error-report.h" #include "qemu/qemu-print.h" -#include "sysemu/sysemu.h" #include "sysemu/tcg.h" #include "hw/boards.h" #include "hw/qdev-properties.h" diff --git a/replay/replay-audio.c b/replay/replay-audio.c index b113836de4..178094e601 100644 --- a/replay/replay-audio.c +++ b/replay/replay-audio.c @@ -13,7 +13,6 @@ #include "qemu/error-report.h" #include "sysemu/replay.h" #include "replay-internal.h" -#include "sysemu/sysemu.h" #include "audio/audio.h" void replay_audio_out(int *played) diff --git a/replay/replay-char.c b/replay/replay-char.c index 736cc8c2e6..dc0002367e 100644 --- a/replay/replay-char.c +++ b/replay/replay-char.c @@ -13,7 +13,6 @@ #include "qemu/error-report.h" #include "sysemu/replay.h" #include "replay-internal.h" -#include "sysemu/sysemu.h" #include "chardev/char.h" /* Char drivers that generate qemu_chr_be_write events diff --git a/replay/replay-net.c b/replay/replay-net.c index 80b7054156..3b70f71cf1 100644 --- a/replay/replay-net.c +++ b/replay/replay-net.c @@ -13,7 +13,6 @@ #include "qemu/error-report.h" #include "sysemu/replay.h" #include "replay-internal.h" -#include "sysemu/sysemu.h" #include "net/net.h" #include "net/filter.h" #include "qemu/iov.h" diff --git a/replay/replay-snapshot.c b/replay/replay-snapshot.c index 756f48bc02..5dd8680480 100644 --- a/replay/replay-snapshot.c +++ b/replay/replay-snapshot.c @@ -13,7 +13,6 @@ #include "qapi/error.h" #include "sysemu/replay.h" #include "replay-internal.h" -#include "sysemu/sysemu.h" #include "monitor/monitor.h" #include "qapi/qmp/qstring.h" #include "qemu/error-report.h" diff --git a/stubs/replay.c b/stubs/replay.c index 4ac607895d..10b3925e2f 100644 --- a/stubs/replay.c +++ b/stubs/replay.c @@ -1,6 +1,5 @@ #include "qemu/osdep.h" #include "sysemu/replay.h" -#include "sysemu/sysemu.h" ReplayMode replay_mode; diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index 1901997a06..e4edff548e 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -25,7 +25,6 @@ #if !defined(CONFIG_USER_ONLY) #include "hw/loader.h" #endif -#include "sysemu/sysemu.h" #include "sysemu/kvm.h" #include "kvm_arm.h" #include "qapi/visitor.h" diff --git a/target/arm/helper-a64.c b/target/arm/helper-a64.c index 616d62c7fc..bca80bdc38 100644 --- a/target/arm/helper-a64.c +++ b/target/arm/helper-a64.c @@ -24,7 +24,6 @@ #include "qemu/host-utils.h" #include "qemu/log.h" #include "qemu/main-loop.h" -#include "sysemu/sysemu.h" #include "qemu/bitops.h" #include "internals.h" #include "qemu/crc32c.h" diff --git a/target/arm/helper.c b/target/arm/helper.c index ffe56696dd..12afe9b0a5 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -16,7 +16,6 @@ #include "exec/helper-proto.h" #include "qemu/host-utils.h" #include "qemu/main-loop.h" -#include "sysemu/sysemu.h" #include "qemu/bitops.h" #include "qemu/crc32c.h" #include "qemu/qemu-print.h" diff --git a/target/arm/kvm32.c b/target/arm/kvm32.c index 51f78f722b..2451a2d4bb 100644 --- a/target/arm/kvm32.c +++ b/target/arm/kvm32.c @@ -16,7 +16,6 @@ #include "qemu-common.h" #include "cpu.h" #include "qemu/timer.h" -#include "sysemu/sysemu.h" #include "sysemu/kvm.h" #include "kvm_arm.h" #include "internals.h" diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c index 22d19c9aec..2e5d8cbd29 100644 --- a/target/arm/kvm64.c +++ b/target/arm/kvm64.c @@ -22,7 +22,6 @@ #include "qemu/error-report.h" #include "qemu/host-utils.h" #include "exec/gdbstub.h" -#include "sysemu/sysemu.h" #include "sysemu/kvm.h" #include "kvm_arm.h" #include "internals.h" diff --git a/target/arm/m_helper.c b/target/arm/m_helper.c index cde5195d28..884d35d2b0 100644 --- a/target/arm/m_helper.c +++ b/target/arm/m_helper.c @@ -16,7 +16,6 @@ #include "exec/helper-proto.h" #include "qemu/host-utils.h" #include "qemu/main-loop.h" -#include "sysemu/sysemu.h" #include "qemu/bitops.h" #include "qemu/crc32c.h" #include "qemu/qemu-print.h" diff --git a/target/i386/hvf/x86_task.c b/target/i386/hvf/x86_task.c index 73cd5d2817..1daac6cc2b 100644 --- a/target/i386/hvf/x86_task.c +++ b/target/i386/hvf/x86_task.c @@ -29,7 +29,6 @@ #include "hw/i386/apic_internal.h" #include "qemu/main-loop.h" #include "sysemu/accel.h" -#include "sysemu/sysemu.h" #include "target/i386/cpu.h" // TODO: taskswitch handling diff --git a/target/lm32/helper.c b/target/lm32/helper.c index 9f3b107474..1130fc8884 100644 --- a/target/lm32/helper.c +++ b/target/lm32/helper.c @@ -21,7 +21,6 @@ #include "cpu.h" #include "exec/exec-all.h" #include "qemu/host-utils.h" -#include "sysemu/sysemu.h" #include "hw/semihosting/semihost.h" #include "exec/log.h" diff --git a/target/m68k/m68k-semi.c b/target/m68k/m68k-semi.c index 01627b42c9..8e5fbfc8fa 100644 --- a/target/m68k/m68k-semi.c +++ b/target/m68k/m68k-semi.c @@ -28,7 +28,6 @@ #include "exec/softmmu-semi.h" #endif #include "qemu/log.h" -#include "sysemu/sysemu.h" #define HOSTED_EXIT 0 #define HOSTED_INIT_SIM 1 diff --git a/target/nios2/nios2-semi.c b/target/nios2/nios2-semi.c index cc2777d2f8..d7a80dd303 100644 --- a/target/nios2/nios2-semi.c +++ b/target/nios2/nios2-semi.c @@ -32,7 +32,6 @@ #include "exec/softmmu-semi.h" #endif #include "qemu/log.h" -#include "sysemu/sysemu.h" #define HOSTED_EXIT 0 #define HOSTED_INIT_SIM 1 diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index dbe125bd31..c407e9fb71 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -27,7 +27,6 @@ #include "cpu.h" #include "cpu-models.h" #include "qemu/timer.h" -#include "sysemu/sysemu.h" #include "sysemu/hw_accel.h" #include "kvm_ppc.h" #include "sysemu/cpus.h" diff --git a/target/sparc/helper.c b/target/sparc/helper.c index 1a52061fbf..07d87efa4e 100644 --- a/target/sparc/helper.c +++ b/target/sparc/helper.c @@ -22,7 +22,6 @@ #include "exec/exec-all.h" #include "qemu/host-utils.h" #include "exec/helper-proto.h" -#include "sysemu/sysemu.h" void cpu_raise_exception_ra(CPUSPARCState *env, int tt, uintptr_t ra) { diff --git a/target/xtensa/translate.c b/target/xtensa/translate.c index 6f1da87875..fa12a576b2 100644 --- a/target/xtensa/translate.c +++ b/target/xtensa/translate.c @@ -36,7 +36,6 @@ #include "tcg-op.h" #include "qemu/log.h" #include "qemu/qemu-print.h" -#include "sysemu/sysemu.h" #include "exec/cpu_ldst.h" #include "hw/semihosting/semihost.h" #include "exec/translator.h" diff --git a/target/xtensa/xtensa-semi.c b/target/xtensa/xtensa-semi.c index 8862985e56..25f57a6500 100644 --- a/target/xtensa/xtensa-semi.c +++ b/target/xtensa/xtensa-semi.c @@ -32,7 +32,6 @@ #include "hw/semihosting/semihost.h" #include "qapi/error.h" #include "qemu/log.h" -#include "sysemu/sysemu.h" enum { TARGET_SYS_exit = 1, diff --git a/tests/migration-test.c b/tests/migration-test.c index a4feb9545d..225e661726 100644 --- a/tests/migration-test.c +++ b/tests/migration-test.c @@ -20,7 +20,6 @@ #include "qemu/range.h" #include "qemu/sockets.h" #include "chardev/char.h" -#include "sysemu/sysemu.h" #include "qapi/qapi-visit-sockets.h" #include "qapi/qobject-input-visitor.h" #include "qapi/qobject-output-visitor.h" diff --git a/ui/input-keymap.c b/ui/input-keymap.c index db5ccff5ad..c4301851bd 100644 --- a/ui/input-keymap.c +++ b/ui/input-keymap.c @@ -1,5 +1,4 @@ #include "qemu/osdep.h" -#include "sysemu/sysemu.h" #include "keymaps.h" #include "ui/input.h" diff --git a/ui/input-legacy.c b/ui/input-legacy.c index 549654e26a..9fc78a639b 100644 --- a/ui/input-legacy.c +++ b/ui/input-legacy.c @@ -24,7 +24,6 @@ #include "qemu/osdep.h" #include "qapi/qapi-commands-ui.h" -#include "sysemu/sysemu.h" #include "ui/console.h" #include "keymaps.h" #include "ui/input.h" diff --git a/ui/input-linux.c b/ui/input-linux.c index e3fa799c34..59456fe765 100644 --- a/ui/input-linux.c +++ b/ui/input-linux.c @@ -10,7 +10,6 @@ #include "qemu/main-loop.h" #include "qemu/module.h" #include "qemu/sockets.h" -#include "sysemu/sysemu.h" #include "ui/input.h" #include "qom/object_interfaces.h" #include "sysemu/iothread.h" diff --git a/ui/keymaps.c b/ui/keymaps.c index 6e8a321971..4e5fca57a8 100644 --- a/ui/keymaps.c +++ b/ui/keymaps.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "keymaps.h" -#include "sysemu/sysemu.h" #include "trace.h" #include "qemu/ctype.h" #include "qemu/error-report.h" diff --git a/ui/sdl2-2d.c b/ui/sdl2-2d.c index db191aaa79..a2ea85127d 100644 --- a/ui/sdl2-2d.c +++ b/ui/sdl2-2d.c @@ -27,7 +27,6 @@ #include "ui/console.h" #include "ui/input.h" #include "ui/sdl2.h" -#include "sysemu/sysemu.h" void sdl2_2d_update(DisplayChangeListener *dcl, int x, int y, int w, int h) diff --git a/ui/sdl2-gl.c b/ui/sdl2-gl.c index 7a37e7c995..c73d273bf8 100644 --- a/ui/sdl2-gl.c +++ b/ui/sdl2-gl.c @@ -29,7 +29,6 @@ #include "ui/console.h" #include "ui/input.h" #include "ui/sdl2.h" -#include "sysemu/sysemu.h" static void sdl2_set_scanout_mode(struct sdl2_console *scon, bool scanout) { diff --git a/ui/sdl2-input.c b/ui/sdl2-input.c index b1daae4111..1f9fe831b3 100644 --- a/ui/sdl2-input.c +++ b/ui/sdl2-input.c @@ -27,7 +27,6 @@ #include "ui/console.h" #include "ui/input.h" #include "ui/sdl2.h" -#include "sysemu/sysemu.h" void sdl2_process_key(struct sdl2_console *scon, SDL_KeyboardEvent *ev) diff --git a/ui/spice-display.c b/ui/spice-display.c index 0c65ae2fe3..6babe24909 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -22,7 +22,6 @@ #include "qemu/option.h" #include "qemu/queue.h" #include "ui/console.h" -#include "sysemu/sysemu.h" #include "trace.h" #include "ui/spice-display.h" diff --git a/util/qemu-timer.c b/util/qemu-timer.c index 1cc1b2f2c3..b0e40a9087 100644 --- a/util/qemu-timer.c +++ b/util/qemu-timer.c @@ -26,7 +26,6 @@ #include "qemu/main-loop.h" #include "qemu/timer.h" #include "sysemu/replay.h" -#include "sysemu/sysemu.h" #include "sysemu/cpus.h" #ifdef CONFIG_POSIX From patchwork Fri Jul 26 12:05:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 11060919 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8B9BA13A0 for ; Fri, 26 Jul 2019 12:09:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7BC7B28812 for ; Fri, 26 Jul 2019 12:09:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7057028AA8; Fri, 26 Jul 2019 12:09:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 06D3D28AA5 for ; Fri, 26 Jul 2019 12:09:57 +0000 (UTC) Received: from localhost ([::1]:39336 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqz2q-0005FC-As for patchwork-qemu-devel@patchwork.kernel.org; Fri, 26 Jul 2019 08:09:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58878) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqyz4-0005ex-09 for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:06:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqyyu-0008EB-4w for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51782) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqyyt-0007zW-CO for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:51 -0400 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 0B13730C34CA for ; Fri, 26 Jul 2019 12:05:49 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A70DF60A35 for ; Fri, 26 Jul 2019 12:05:48 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 4C0DB1146439; Fri, 26 Jul 2019 14:05:43 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 26 Jul 2019 14:05:41 +0200 Message-Id: <20190726120542.9894-28-armbru@redhat.com> In-Reply-To: <20190726120542.9894-1-armbru@redhat.com> References: <20190726120542.9894-1-armbru@redhat.com> MIME-Version: 1.0 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.40]); Fri, 26 Jul 2019 12:05:49 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 27/28] sysemu: Move the VMChangeStateEntry typedef to qemu/typedefs.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The previous commit deleted superfluous inclusions of sysemu/sysemu.h, but that didn't really help. Several headers include sysemu/sysemu.h just to get typedef VMChangeStateEntry. Move it from sysemu/sysemu.h to qemu/typedefs.h. Spell its structure tag the same while there. All these headers still include sysemu/sysemu.h indirectly, so this doesn't by itself reduce its use. It will together with the the next commit. Signed-off-by: Markus Armbruster --- include/hw/ide/internal.h | 3 ++- include/hw/ppc/spapr_xive.h | 1 - include/hw/scsi/scsi.h | 1 - include/hw/virtio/virtio.h | 1 - include/qemu/typedefs.h | 1 + include/sysemu/sysemu.h | 1 - vl.c | 6 +++--- 7 files changed, 6 insertions(+), 8 deletions(-) diff --git a/include/hw/ide/internal.h b/include/hw/ide/internal.h index c6954c1d56..52ec197da0 100644 --- a/include/hw/ide/internal.h +++ b/include/hw/ide/internal.h @@ -6,11 +6,12 @@ * only files in hw/ide/ are supposed to include this file. * non-internal declarations are in hw/ide.h */ + +#include "qapi/qapi-types-run-state.h" #include "hw/ide.h" #include "hw/irq.h" #include "hw/isa/isa.h" #include "sysemu/dma.h" -#include "sysemu/sysemu.h" #include "hw/block/block.h" #include "scsi/constants.h" diff --git a/include/hw/ppc/spapr_xive.h b/include/hw/ppc/spapr_xive.h index a39e672f27..bfd40f01d8 100644 --- a/include/hw/ppc/spapr_xive.h +++ b/include/hw/ppc/spapr_xive.h @@ -12,7 +12,6 @@ #include "hw/ppc/spapr_irq.h" #include "hw/ppc/xive.h" -#include "sysemu/sysemu.h" #define TYPE_SPAPR_XIVE "spapr-xive" #define SPAPR_XIVE(obj) OBJECT_CHECK(SpaprXive, (obj), TYPE_SPAPR_XIVE) diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h index 2bfaad0fe9..d77a92361b 100644 --- a/include/hw/scsi/scsi.h +++ b/include/hw/scsi/scsi.h @@ -4,7 +4,6 @@ #include "block/aio.h" #include "hw/block/block.h" #include "hw/qdev-core.h" -#include "sysemu/sysemu.h" #include "scsi/utils.h" #include "qemu/notify.h" diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h index df40a46d60..48e8d04ff6 100644 --- a/include/hw/virtio/virtio.h +++ b/include/hw/virtio/virtio.h @@ -17,7 +17,6 @@ #include "exec/memory.h" #include "hw/qdev-core.h" #include "net/net.h" -#include "sysemu/sysemu.h" #include "migration/vmstate.h" #include "qemu/event_notifier.h" #include "standard-headers/linux/virtio_config.h" diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index f569f5f270..3fcdde8bfc 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -102,6 +102,7 @@ typedef struct SHPCDevice SHPCDevice; typedef struct SSIBus SSIBus; typedef struct VirtIODevice VirtIODevice; typedef struct Visitor Visitor; +typedef struct VMChangeStateEntry VMChangeStateEntry; typedef struct VMStateDescription VMStateDescription; /* diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 227202999d..7e445e0683 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -22,7 +22,6 @@ void runstate_set(RunState new_state); int runstate_is_running(void); bool runstate_needs_reset(void); bool runstate_store(char *str, size_t size); -typedef struct vm_change_state_entry VMChangeStateEntry; typedef void VMChangeStateHandler(void *opaque, int running, RunState state); VMChangeStateEntry *qemu_add_vm_change_state_handler(VMChangeStateHandler *cb, diff --git a/vl.c b/vl.c index df23dd6913..91255acf71 100644 --- a/vl.c +++ b/vl.c @@ -1362,14 +1362,14 @@ static int machine_help_func(QemuOpts *opts, MachineState *machine) return 1; } -struct vm_change_state_entry { +struct VMChangeStateEntry { VMChangeStateHandler *cb; void *opaque; - QTAILQ_ENTRY(vm_change_state_entry) entries; + QTAILQ_ENTRY(VMChangeStateEntry) entries; int priority; }; -static QTAILQ_HEAD(, vm_change_state_entry) vm_change_state_head; +static QTAILQ_HEAD(, VMChangeStateEntry) vm_change_state_head; /** * qemu_add_vm_change_state_handler_prio: From patchwork Fri Jul 26 12:05:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 11060931 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 370781580 for ; Fri, 26 Jul 2019 12:11:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2382128AA5 for ; Fri, 26 Jul 2019 12:11:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 17AFE28AAA; Fri, 26 Jul 2019 12:11:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4DD0928AA5 for ; Fri, 26 Jul 2019 12:11:10 +0000 (UTC) Received: from localhost ([::1]:39380 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqz41-0001jk-HF for patchwork-qemu-devel@patchwork.kernel.org; Fri, 26 Jul 2019 08:11:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59154) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqyz9-00067q-TN for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:06:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqyyv-0008Kc-Sd for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:06:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56452) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqyyv-00081T-DQ for qemu-devel@nongnu.org; Fri, 26 Jul 2019 08:05:53 -0400 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 61196C049598 for ; Fri, 26 Jul 2019 12:05:49 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A73B55DE6F; Fri, 26 Jul 2019 12:05:48 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 5959F114643C; Fri, 26 Jul 2019 14:05:43 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 26 Jul 2019 14:05:42 +0200 Message-Id: <20190726120542.9894-29-armbru@redhat.com> In-Reply-To: <20190726120542.9894-1-armbru@redhat.com> References: <20190726120542.9894-1-armbru@redhat.com> MIME-Version: 1.0 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.31]); Fri, 26 Jul 2019 12:05:49 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 28/28] Include sysemu/sysemu.h a lot less X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Hajnoczi Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP In my "build everything" tree, changing sysemu/sysemu.h triggers a recompile of some 5400 out of 6600 objects (not counting tests and objects that don't depend on qemu/osdep.h). hw/qdev-core.h includes sysemu/sysemu.h since recent commit e965ffa70a "qdev: add qdev_add_vm_change_state_handler()". This is a bad idea: hw/qdev-core.h is widely included, and sysemu/sysemu.h pulls in some 100 headers. Collect everything related to vm_state_notify() in new sysemu/vmstate-notify.h, and drop the problematic include from hw/qdev-core.h. Touching sysemu/sysemu.h now recompiles some 1100 objects. qemu/uuid.h also drops from 5400 to 1100. A few more headers show smaller improvement: qemu/notify.h drops from 5600 to 5200, qemu/timer.h from 5600 to 4400, and qapi/qapi-types-run-state.h from 5500 to 4400. Cc: Stefan Hajnoczi Signed-off-by: Markus Armbruster --- accel/kvm/kvm-all.c | 1 + audio/audio.c | 2 +- backends/hostmem.c | 1 + block/block-backend.c | 1 + cpus.c | 2 ++ gdbstub.c | 1 + hw/arm/allwinner-a10.c | 1 + hw/arm/aspeed_soc.c | 1 + hw/arm/kzm.c | 1 + hw/arm/msf2-soc.c | 1 + hw/arm/stm32f205_soc.c | 1 + hw/block/pflash_cfi01.c | 2 +- hw/block/vhost-user-blk.c | 2 ++ hw/block/virtio-blk.c | 2 ++ hw/char/serial-isa.c | 1 + hw/char/xen_console.c | 1 + hw/core/numa.c | 1 + hw/core/vm-change-state-handler.c | 1 + hw/display/qxl-render.c | 1 + hw/display/qxl.c | 1 + hw/display/virtio-gpu.c | 1 + hw/i386/kvm/clock.c | 1 + hw/i386/kvm/i8254.c | 1 + hw/i386/kvmvapic.c | 1 + hw/i386/xen/xen-hvm.c | 2 ++ hw/i386/xen/xen-mapcache.c | 1 + hw/ide/core.c | 2 +- hw/ide/qdev.c | 1 + hw/intc/ioapic.c | 1 + hw/misc/macio/macio.c | 1 + hw/net/e1000e_core.c | 2 +- hw/net/virtio-net.c | 1 + hw/nvram/spapr_nvram.c | 1 + hw/pci/pci.c | 1 + hw/ppc/ppc_booke.c | 1 + hw/ppc/spapr.c | 1 + hw/riscv/sifive_e.c | 1 + hw/riscv/sifive_u.c | 1 + hw/riscv/spike.c | 1 + hw/riscv/virt.c | 1 + hw/s390x/s390-ccw.c | 1 + hw/s390x/s390-virtio-ccw.c | 1 + hw/scsi/scsi-bus.c | 2 ++ hw/scsi/vhost-scsi.c | 1 + hw/scsi/vhost-user-scsi.c | 1 + hw/sparc64/niagara.c | 2 +- hw/usb/hcd-ehci.c | 1 + hw/usb/host-libusb.c | 1 + hw/usb/redirect.c | 1 + hw/virtio/virtio-rng.c | 2 ++ hw/virtio/virtio.c | 2 ++ hw/xen/xen-common.c | 1 + hw/xen/xen_devconfig.c | 1 + hw/xenpv/xen_machine_pv.c | 1 + include/hw/qdev-core.h | 5 ----- include/sysemu/sysemu.h | 8 -------- include/sysemu/vmstate-notify.h | 18 ++++++++++++++++++ memory.c | 1 + migration/global_state.c | 1 + migration/migration.c | 1 + migration/savevm.c | 1 + net/net.c | 2 ++ stubs/change-state-handler.c | 2 +- target/i386/kvm.c | 1 + target/i386/sev.c | 1 + ui/gtk.c | 1 + ui/spice-core.c | 2 +- vl.c | 1 + 68 files changed, 91 insertions(+), 20 deletions(-) create mode 100644 include/sysemu/vmstate-notify.h diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index db4d215e0c..423a215266 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -29,6 +29,7 @@ #include "exec/gdbstub.h" #include "sysemu/kvm_int.h" #include "sysemu/cpus.h" +#include "sysemu/sysemu.h" #include "qemu/bswap.h" #include "exec/memory.h" #include "exec/ram_addr.h" diff --git a/audio/audio.c b/audio/audio.c index b9b2d07e54..e8b752dafe 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -30,10 +30,10 @@ #include "qapi/error.h" #include "qapi/qobject-input-visitor.h" #include "qapi/qapi-visit-audio.h" -#include "sysemu/sysemu.h" #include "qemu/cutils.h" #include "qemu/module.h" #include "sysemu/replay.h" +#include "sysemu/vmstate-notify.h" #include "trace.h" #define AUDIO_CAP "audio" diff --git a/backends/hostmem.c b/backends/hostmem.c index 463102aa15..6d333dc23c 100644 --- a/backends/hostmem.c +++ b/backends/hostmem.c @@ -12,6 +12,7 @@ #include "qemu/osdep.h" #include "sysemu/hostmem.h" +#include "sysemu/sysemu.h" #include "hw/boards.h" #include "qapi/error.h" #include "qapi/qapi-builtin-visit.h" diff --git a/block/block-backend.c b/block/block-backend.c index 4991ab5574..e4f43a0293 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -17,6 +17,7 @@ #include "block/throttle-groups.h" #include "hw/qdev-core.h" #include "sysemu/blockdev.h" +#include "sysemu/vmstate-notify.h" #include "sysemu/sysemu.h" #include "qapi/error.h" #include "qapi/qapi-events-block.h" diff --git a/cpus.c b/cpus.c index e70cc58e31..cd98d1c166 100644 --- a/cpus.c +++ b/cpus.c @@ -41,6 +41,8 @@ #include "sysemu/kvm.h" #include "sysemu/hax.h" #include "sysemu/hvf.h" +#include "sysemu/sysemu.h" +#include "sysemu/vmstate-notify.h" #include "sysemu/whpx.h" #include "exec/exec-all.h" diff --git a/gdbstub.c b/gdbstub.c index b470aec8ea..66d80a1b22 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -38,6 +38,7 @@ #include "chardev/char.h" #include "chardev/char-fe.h" #include "sysemu/sysemu.h" +#include "sysemu/vmstate-notify.h" #include "exec/gdbstub.h" #include "hw/cpu/cluster.h" #include "hw/boards.h" diff --git a/hw/arm/allwinner-a10.c b/hw/arm/allwinner-a10.c index 3b0d3eccdd..73810a4440 100644 --- a/hw/arm/allwinner-a10.c +++ b/hw/arm/allwinner-a10.c @@ -23,6 +23,7 @@ #include "hw/sysbus.h" #include "hw/arm/allwinner-a10.h" #include "hw/misc/unimp.h" +#include "sysemu/sysemu.h" static void aw_a10_init(Object *obj) { diff --git a/hw/arm/aspeed_soc.c b/hw/arm/aspeed_soc.c index c6fb3700f2..9ee8104832 100644 --- a/hw/arm/aspeed_soc.c +++ b/hw/arm/aspeed_soc.c @@ -22,6 +22,7 @@ #include "qemu/error-report.h" #include "hw/i2c/aspeed_i2c.h" #include "net/net.h" +#include "sysemu/sysemu.h" #define ASPEED_SOC_IOMEM_SIZE 0x00200000 diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c index 59d2102dc5..2f052e1f8c 100644 --- a/hw/arm/kzm.c +++ b/hw/arm/kzm.c @@ -24,6 +24,7 @@ #include "hw/net/lan9118.h" #include "hw/char/serial.h" #include "sysemu/qtest.h" +#include "sysemu/sysemu.h" /* Memory map for Kzm Emulation Baseboard: * 0x00000000-0x7fffffff See i.MX31 SOC for support diff --git a/hw/arm/msf2-soc.c b/hw/arm/msf2-soc.c index 8ae763f99f..76cc3e09b0 100644 --- a/hw/arm/msf2-soc.c +++ b/hw/arm/msf2-soc.c @@ -30,6 +30,7 @@ #include "hw/irq.h" #include "hw/arm/msf2-soc.h" #include "hw/misc/unimp.h" +#include "sysemu/sysemu.h" #define MSF2_TIMER_BASE 0x40004000 #define MSF2_SYSREG_BASE 0x40038000 diff --git a/hw/arm/stm32f205_soc.c b/hw/arm/stm32f205_soc.c index be8b7df679..f5a5c2d80c 100644 --- a/hw/arm/stm32f205_soc.c +++ b/hw/arm/stm32f205_soc.c @@ -29,6 +29,7 @@ #include "exec/address-spaces.h" #include "hw/arm/stm32f205_soc.h" #include "hw/qdev-properties.h" +#include "sysemu/sysemu.h" /* At the moment only Timer 2 to 5 are modelled */ static const uint32_t timer_addr[STM_NUM_TIMERS] = { 0x40000000, 0x40000400, diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index a406e75242..6da00c5bfc 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -52,7 +52,7 @@ #include "hw/sysbus.h" #include "migration/vmstate.h" #include "sysemu/blockdev.h" -#include "sysemu/sysemu.h" +#include "sysemu/vmstate-notify.h" #include "trace.h" /* #define PFLASH_DEBUG */ diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c index 7b44cca6d9..ce64b05abd 100644 --- a/hw/block/vhost-user-blk.c +++ b/hw/block/vhost-user-blk.c @@ -28,6 +28,8 @@ #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-access.h" +#include "sysemu/sysemu.h" +#include "sysemu/vmstate-notify.h" static const int user_feature_bits[] = { VIRTIO_BLK_F_SIZE_MAX, diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index 8cc2a232e0..8fe7540675 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -20,6 +20,8 @@ #include "hw/block/block.h" #include "hw/qdev-properties.h" #include "sysemu/blockdev.h" +#include "sysemu/sysemu.h" +#include "sysemu/vmstate-notify.h" #include "hw/virtio/virtio-blk.h" #include "dataplane/virtio-blk.h" #include "scsi/constants.h" diff --git a/hw/char/serial-isa.c b/hw/char/serial-isa.c index 5a0ae02ee7..9e31c51bb6 100644 --- a/hw/char/serial-isa.c +++ b/hw/char/serial-isa.c @@ -26,6 +26,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/module.h" +#include "sysemu/sysemu.h" #include "hw/char/serial.h" #include "hw/isa/isa.h" #include "hw/qdev-properties.h" diff --git a/hw/char/xen_console.c b/hw/char/xen_console.c index 8cc9328b3f..63153dfde4 100644 --- a/hw/char/xen_console.c +++ b/hw/char/xen_console.c @@ -24,6 +24,7 @@ #include #include "qapi/error.h" +#include "sysemu/sysemu.h" #include "chardev/char-fe.h" #include "hw/xen/xen-legacy-backend.h" diff --git a/hw/core/numa.c b/hw/core/numa.c index 450c522dd8..7a63ddc4c6 100644 --- a/hw/core/numa.c +++ b/hw/core/numa.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "sysemu/hostmem.h" #include "sysemu/numa.h" +#include "sysemu/sysemu.h" #include "exec/cpu-common.h" #include "exec/ramlist.h" #include "qemu/bitmap.h" diff --git a/hw/core/vm-change-state-handler.c b/hw/core/vm-change-state-handler.c index e27ea45977..e184ec5e0e 100644 --- a/hw/core/vm-change-state-handler.c +++ b/hw/core/vm-change-state-handler.c @@ -17,6 +17,7 @@ #include "qemu/osdep.h" #include "hw/qdev-core.h" +#include "sysemu/vmstate-notify.h" static int qdev_get_dev_tree_depth(DeviceState *dev) { diff --git a/hw/display/qxl-render.c b/hw/display/qxl-render.c index 14ad2b352d..473e333475 100644 --- a/hw/display/qxl-render.c +++ b/hw/display/qxl-render.c @@ -21,6 +21,7 @@ #include "qemu/osdep.h" #include "qxl.h" +#include "sysemu/sysemu.h" #include "trace.h" static void qxl_blit(PCIQXLDevice *qxl, QXLRect *rect) diff --git a/hw/display/qxl.c b/hw/display/qxl.c index 971c2d0568..3a1d2bb6a7 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -30,6 +30,7 @@ #include "qemu/module.h" #include "sysemu/sysemu.h" #include "hw/qdev-properties.h" +#include "sysemu/vmstate-notify.h" #include "migration/blocker.h" #include "migration/vmstate.h" #include "trace.h" diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index 6de9689a30..28e868c021 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -17,6 +17,7 @@ #include "ui/console.h" #include "trace.h" #include "sysemu/dma.h" +#include "sysemu/sysemu.h" #include "hw/virtio/virtio.h" #include "migration/qemu-file-types.h" #include "hw/virtio/virtio-gpu.h" diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c index d6a5325f0b..f6dd14f0ee 100644 --- a/hw/i386/kvm/clock.c +++ b/hw/i386/kvm/clock.c @@ -20,6 +20,7 @@ #include "sysemu/sysemu.h" #include "sysemu/kvm.h" #include "sysemu/hw_accel.h" +#include "sysemu/vmstate-notify.h" #include "kvm_i386.h" #include "migration/vmstate.h" #include "hw/sysbus.h" diff --git a/hw/i386/kvm/i8254.c b/hw/i386/kvm/i8254.c index 27e36a2abf..456bdb4966 100644 --- a/hw/i386/kvm/i8254.c +++ b/hw/i386/kvm/i8254.c @@ -30,6 +30,7 @@ #include "qemu/module.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" +#include "sysemu/vmstate-notify.h" #include "hw/timer/i8254.h" #include "hw/timer/i8254_internal.h" #include "sysemu/kvm.h" diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c index 44e40478c8..5602aa41c4 100644 --- a/hw/i386/kvmvapic.c +++ b/hw/i386/kvmvapic.c @@ -16,6 +16,7 @@ #include "sysemu/cpus.h" #include "sysemu/hw_accel.h" #include "sysemu/kvm.h" +#include "sysemu/vmstate-notify.h" #include "hw/i386/apic_internal.h" #include "hw/sysbus.h" #include "hw/boards.h" diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c index 3e15ffc828..b25da4cf9d 100644 --- a/hw/i386/xen/xen-hvm.c +++ b/hw/i386/xen/xen-hvm.c @@ -25,6 +25,8 @@ #include "qemu/error-report.h" #include "qemu/main-loop.h" #include "qemu/range.h" +#include "sysemu/sysemu.h" +#include "sysemu/vmstate-notify.h" #include "sysemu/xen-mapcache.h" #include "trace.h" #include "exec/address-spaces.h" diff --git a/hw/i386/xen/xen-mapcache.c b/hw/i386/xen/xen-mapcache.c index dc73c86c61..09656f9f11 100644 --- a/hw/i386/xen/xen-mapcache.c +++ b/hw/i386/xen/xen-mapcache.c @@ -17,6 +17,7 @@ #include "hw/xen/xen-legacy-backend.h" #include "qemu/bitmap.h" +#include "sysemu/sysemu.h" #include "sysemu/xen-mapcache.h" #include "trace.h" diff --git a/hw/ide/core.c b/hw/ide/core.c index 61cb3b26ab..b12118d268 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -37,7 +37,7 @@ #include "qapi/error.h" #include "qemu/cutils.h" #include "sysemu/replay.h" - +#include "sysemu/vmstate-notify.h" #include "hw/ide/internal.h" #include "trace.h" diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c index 39957dd39f..d08a7c5de0 100644 --- a/hw/ide/qdev.c +++ b/hw/ide/qdev.c @@ -30,6 +30,7 @@ #include "sysemu/blockdev.h" #include "hw/block/block.h" #include "sysemu/sysemu.h" +#include "sysemu/vmstate-notify.h" #include "qapi/visitor.h" /* --------------------------------- */ diff --git a/hw/intc/ioapic.c b/hw/intc/ioapic.c index f89677174a..8f2165801a 100644 --- a/hw/intc/ioapic.c +++ b/hw/intc/ioapic.c @@ -30,6 +30,7 @@ #include "hw/pci/msi.h" #include "hw/qdev-properties.h" #include "sysemu/kvm.h" +#include "sysemu/sysemu.h" #include "hw/i386/apic-msidef.h" #include "hw/i386/x86-iommu.h" #include "trace.h" diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c index b59df4e3b8..50f20d8206 100644 --- a/hw/misc/macio/macio.c +++ b/hw/misc/macio/macio.c @@ -35,6 +35,7 @@ #include "hw/char/escc.h" #include "hw/misc/macio/macio.h" #include "hw/intc/heathrow_pic.h" +#include "sysemu/sysemu.h" #include "trace.h" /* Note: this code is strongly inspirated from the corresponding code diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c index 40e41fdd92..cb3f2e4c59 100644 --- a/hw/net/e1000e_core.c +++ b/hw/net/e1000e_core.c @@ -34,12 +34,12 @@ */ #include "qemu/osdep.h" -#include "sysemu/sysemu.h" #include "net/net.h" #include "net/tap.h" #include "hw/hw.h" #include "hw/pci/msi.h" #include "hw/pci/msix.h" +#include "sysemu/vmstate-notify.h" #include "net_tx_pkt.h" #include "net_rx_pkt.h" diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 4113729fcf..9f11422337 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -31,6 +31,7 @@ #include "hw/virtio/virtio-access.h" #include "migration/misc.h" #include "standard-headers/linux/ethtool.h" +#include "sysemu/sysemu.h" #include "trace.h" #define VIRTIO_NET_VM_VERSION 11 diff --git a/hw/nvram/spapr_nvram.c b/hw/nvram/spapr_nvram.c index c7bcd29e15..fe685a42b3 100644 --- a/hw/nvram/spapr_nvram.c +++ b/hw/nvram/spapr_nvram.c @@ -31,6 +31,7 @@ #include "sysemu/block-backend.h" #include "sysemu/device_tree.h" +#include "sysemu/vmstate-notify.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "hw/nvram/chrp_nvram.h" diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 4b6ffab13d..aa05c2b9b2 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -35,6 +35,7 @@ #include "monitor/monitor.h" #include "net/net.h" #include "sysemu/numa.h" +#include "sysemu/sysemu.h" #include "hw/loader.h" #include "qemu/error-report.h" #include "qemu/range.h" diff --git a/hw/ppc/ppc_booke.c b/hw/ppc/ppc_booke.c index ce0e1406e1..344267019c 100644 --- a/hw/ppc/ppc_booke.c +++ b/hw/ppc/ppc_booke.c @@ -28,6 +28,7 @@ #include "qemu/timer.h" #include "sysemu/reset.h" #include "sysemu/sysemu.h" +#include "sysemu/vmstate-notify.h" #include "qemu/log.h" #include "hw/loader.h" #include "kvm_ppc.h" diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 4044e61a0c..f32bdcbb65 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -33,6 +33,7 @@ #include "sysemu/numa.h" #include "sysemu/qtest.h" #include "sysemu/reset.h" +#include "sysemu/vmstate-notify.h" #include "qemu/log.h" #include "hw/fw-path-provider.h" #include "elf.h" diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c index 862903d6b5..792d75a1a3 100644 --- a/hw/riscv/sifive_e.c +++ b/hw/riscv/sifive_e.c @@ -46,6 +46,7 @@ #include "hw/riscv/boot.h" #include "chardev/char.h" #include "sysemu/arch_init.h" +#include "sysemu/sysemu.h" #include "exec/address-spaces.h" static const struct MemmapEntry { diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 0b3c5dff97..9910fa6708 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -44,6 +44,7 @@ #include "chardev/char.h" #include "sysemu/arch_init.h" #include "sysemu/device_tree.h" +#include "sysemu/sysemu.h" #include "exec/address-spaces.h" #include diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c index 9cc786b6b6..7c04bd554f 100644 --- a/hw/riscv/spike.c +++ b/hw/riscv/spike.c @@ -40,6 +40,7 @@ #include "sysemu/arch_init.h" #include "sysemu/device_tree.h" #include "sysemu/qtest.h" +#include "sysemu/sysemu.h" #include "exec/address-spaces.h" #include diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index c72198b720..9bced28486 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -37,6 +37,7 @@ #include "chardev/char.h" #include "sysemu/arch_init.h" #include "sysemu/device_tree.h" +#include "sysemu/sysemu.h" #include "exec/address-spaces.h" #include "hw/pci/pci.h" #include "hw/pci-host/gpex.h" diff --git a/hw/s390x/s390-ccw.c b/hw/s390x/s390-ccw.c index 22c6878b84..0c5a5b60bd 100644 --- a/hw/s390x/s390-ccw.c +++ b/hw/s390x/s390-ccw.c @@ -19,6 +19,7 @@ #include "hw/s390x/css.h" #include "hw/s390x/css-bridge.h" #include "hw/s390x/s390-ccw.h" +#include "sysemu/sysemu.h" IOInstEnding s390_ccw_cmd_request(SubchDev *sch) { diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index a543b64e56..434d933ec9 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -40,6 +40,7 @@ #include "hw/nmi.h" #include "hw/qdev-properties.h" #include "hw/s390x/tod.h" +#include "sysemu/sysemu.h" S390CPU *s390_cpu_addr2state(uint16_t cpu_addr) { diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index db785e6001..034f2ba9ba 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -10,6 +10,8 @@ #include "scsi/constants.h" #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" +#include "sysemu/sysemu.h" +#include "sysemu/vmstate-notify.h" #include "trace.h" #include "sysemu/dma.h" #include "qemu/cutils.h" diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c index fc25fb87a2..eaf6866490 100644 --- a/hw/scsi/vhost-scsi.c +++ b/hw/scsi/vhost-scsi.c @@ -30,6 +30,7 @@ #include "hw/fw-path-provider.h" #include "hw/qdev-properties.h" #include "qemu/cutils.h" +#include "sysemu/sysemu.h" /* Features supported by host kernel. */ static const int kernel_feature_bits[] = { diff --git a/hw/scsi/vhost-user-scsi.c b/hw/scsi/vhost-user-scsi.c index 0bb8e0dfdd..8f18c1475a 100644 --- a/hw/scsi/vhost-user-scsi.c +++ b/hw/scsi/vhost-user-scsi.c @@ -28,6 +28,7 @@ #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-access.h" #include "chardev/char-fe.h" +#include "sysemu/sysemu.h" /* Features supported by the host application */ static const int user_feature_bits[] = { diff --git a/hw/sparc64/niagara.c b/hw/sparc64/niagara.c index 1efcff628a..167143bffe 100644 --- a/hw/sparc64/niagara.c +++ b/hw/sparc64/niagara.c @@ -35,7 +35,7 @@ #include "sysemu/block-backend.h" #include "qemu/error-report.h" #include "sysemu/qtest.h" - +#include "sysemu/sysemu.h" typedef struct NiagaraBoardState { MemoryRegion hv_ram; diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c index d7d1ecd45d..75c0de9120 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -35,6 +35,7 @@ #include "trace.h" #include "qemu/error-report.h" #include "qemu/main-loop.h" +#include "sysemu/vmstate-notify.h" #define FRAME_TIMER_FREQ 1000 #define FRAME_TIMER_NS (NANOSECONDS_PER_SECOND / FRAME_TIMER_FREQ) diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c index 80fd1e9a80..ca12d308ca 100644 --- a/hw/usb/host-libusb.c +++ b/hw/usb/host-libusb.c @@ -46,6 +46,7 @@ #include "qemu/main-loop.h" #include "qemu/module.h" #include "sysemu/sysemu.h" +#include "sysemu/vmstate-notify.h" #include "trace.h" #include "hw/qdev-properties.h" diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index 8db2c68a1e..ecaf53d19e 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -31,6 +31,7 @@ #include "qapi/error.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" +#include "sysemu/vmstate-notify.h" #include "qapi/qmp/qerror.h" #include "qemu/error-report.h" #include "qemu/iov.h" diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c index 34b4619fd3..b4bb28d8ba 100644 --- a/hw/virtio/virtio-rng.c +++ b/hw/virtio/virtio-rng.c @@ -17,6 +17,8 @@ #include "hw/qdev-properties.h" #include "hw/virtio/virtio-rng.h" #include "sysemu/rng.h" +#include "sysemu/sysemu.h" +#include "sysemu/vmstate-notify.h" #include "qom/object_interfaces.h" #include "trace.h" diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 721dcccc96..fb7a184d2e 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -26,6 +26,8 @@ #include "hw/qdev-properties.h" #include "hw/virtio/virtio-access.h" #include "sysemu/dma.h" +#include "sysemu/sysemu.h" +#include "sysemu/vmstate-notify.h" /* * The alignment to use between consumer and producer parts of vring. diff --git a/hw/xen/xen-common.c b/hw/xen/xen-common.c index 32503cfc1c..9d407ed2da 100644 --- a/hw/xen/xen-common.c +++ b/hw/xen/xen-common.c @@ -14,6 +14,7 @@ #include "hw/xen/xen-legacy-backend.h" #include "chardev/char.h" #include "sysemu/accel.h" +#include "sysemu/vmstate-notify.h" #include "migration/misc.h" #include "migration/global_state.h" diff --git a/hw/xen/xen_devconfig.c b/hw/xen/xen_devconfig.c index 315dbc9c51..46ee4a7f02 100644 --- a/hw/xen/xen_devconfig.c +++ b/hw/xen/xen_devconfig.c @@ -2,6 +2,7 @@ #include "hw/xen/xen-legacy-backend.h" #include "qemu/option.h" #include "sysemu/blockdev.h" +#include "sysemu/sysemu.h" /* ------------------------------------------------------------- */ diff --git a/hw/xenpv/xen_machine_pv.c b/hw/xenpv/xen_machine_pv.c index 524d608eab..3a8af1a1e0 100644 --- a/hw/xenpv/xen_machine_pv.c +++ b/hw/xenpv/xen_machine_pv.c @@ -28,6 +28,7 @@ #include "hw/xen/xen-legacy-backend.h" #include "hw/xen/xen-bus.h" #include "sysemu/block-backend.h" +#include "sysemu/sysemu.h" static void xen_init_pv(MachineState *machine) { diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 80fdb38d94..7f6a6ed2d9 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -5,7 +5,6 @@ #include "qemu/bitmap.h" #include "qom/object.h" #include "hw/hotplug.h" -#include "sysemu/sysemu.h" enum { DEV_NVECTORS_UNSPECIFIED = -1, @@ -448,8 +447,4 @@ static inline bool qbus_is_hotpluggable(BusState *bus) void device_listener_register(DeviceListener *listener); void device_listener_unregister(DeviceListener *listener); -VMChangeStateEntry *qdev_add_vm_change_state_handler(DeviceState *dev, - VMChangeStateHandler *cb, - void *opaque); - #endif diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 7e445e0683..ceeef1ff8a 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -22,14 +22,6 @@ void runstate_set(RunState new_state); int runstate_is_running(void); bool runstate_needs_reset(void); bool runstate_store(char *str, size_t size); -typedef void VMChangeStateHandler(void *opaque, int running, RunState state); - -VMChangeStateEntry *qemu_add_vm_change_state_handler(VMChangeStateHandler *cb, - void *opaque); -VMChangeStateEntry *qemu_add_vm_change_state_handler_prio( - VMChangeStateHandler *cb, void *opaque, int priority); -void qemu_del_vm_change_state_handler(VMChangeStateEntry *e); -void vm_state_notify(int running, RunState state); static inline bool shutdown_caused_by_guest(ShutdownCause cause) { diff --git a/include/sysemu/vmstate-notify.h b/include/sysemu/vmstate-notify.h new file mode 100644 index 0000000000..09f9d4194b --- /dev/null +++ b/include/sysemu/vmstate-notify.h @@ -0,0 +1,18 @@ +#ifndef SYSEMU_VMSTATE_NOTIFY_H +#define SYSEMU_VMSTATE_NOTIFY_H + +#include "qapi/qapi-types-run-state.h" + +typedef void VMChangeStateHandler(void *opaque, int running, RunState state); + +VMChangeStateEntry *qemu_add_vm_change_state_handler(VMChangeStateHandler *cb, + void *opaque); +VMChangeStateEntry *qemu_add_vm_change_state_handler_prio( + VMChangeStateHandler *cb, void *opaque, int priority); +VMChangeStateEntry *qdev_add_vm_change_state_handler(DeviceState *dev, + VMChangeStateHandler *cb, + void *opaque); +void qemu_del_vm_change_state_handler(VMChangeStateEntry *e); +void vm_state_notify(int running, RunState state); + +#endif diff --git a/memory.c b/memory.c index e5683eed91..8b4e42c54d 100644 --- a/memory.c +++ b/memory.c @@ -30,6 +30,7 @@ #include "exec/ram_addr.h" #include "sysemu/kvm.h" #include "sysemu/sysemu.h" +#include "sysemu/vmstate-notify.h" #include "sysemu/tcg.h" #include "migration/vmstate.h" diff --git a/migration/global_state.c b/migration/global_state.c index 2c8c447239..7cba868979 100644 --- a/migration/global_state.c +++ b/migration/global_state.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "qemu/cutils.h" #include "qemu/error-report.h" +#include "sysemu/sysemu.h" #include "qapi/error.h" #include "migration.h" #include "migration/global_state.h" diff --git a/migration/migration.c b/migration/migration.c index 3a6340f602..2986b8b164 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -21,6 +21,7 @@ #include "exec.h" #include "fd.h" #include "socket.h" +#include "sysemu/sysemu.h" #include "rdma.h" #include "ram.h" #include "migration/global_state.h" diff --git a/migration/savevm.c b/migration/savevm.c index b8f734537a..33da39f0ea 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -57,6 +57,7 @@ #include "io/channel-buffer.h" #include "io/channel-file.h" #include "sysemu/replay.h" +#include "sysemu/sysemu.h" #include "qjson.h" #include "migration/colo.h" #include "qemu/bitmap.h" diff --git a/net/net.c b/net/net.c index 11b505a6fd..44bdf4d079 100644 --- a/net/net.c +++ b/net/net.c @@ -50,6 +50,8 @@ #include "qapi/opts-visitor.h" #include "sysemu/sysemu.h" #include "sysemu/qtest.h" +#include "sysemu/sysemu.h" +#include "sysemu/vmstate-notify.h" #include "net/filter.h" #include "qapi/string-output-visitor.h" diff --git a/stubs/change-state-handler.c b/stubs/change-state-handler.c index d14194b36b..655ffefe01 100644 --- a/stubs/change-state-handler.c +++ b/stubs/change-state-handler.c @@ -1,5 +1,5 @@ #include "qemu/osdep.h" -#include "sysemu/sysemu.h" +#include "sysemu/vmstate-notify.h" VMChangeStateEntry *qemu_add_vm_change_state_handler(VMChangeStateHandler *cb, void *opaque) diff --git a/target/i386/kvm.c b/target/i386/kvm.c index e568ff6671..e23a050949 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -25,6 +25,7 @@ #include "sysemu/hw_accel.h" #include "sysemu/kvm_int.h" #include "sysemu/reset.h" +#include "sysemu/vmstate-notify.h" #include "kvm_i386.h" #include "hyperv.h" #include "hyperv-proto.h" diff --git a/target/i386/sev.c b/target/i386/sev.c index 5ba1384ea1..3c4d824e16 100644 --- a/target/i386/sev.c +++ b/target/i386/sev.c @@ -25,6 +25,7 @@ #include "sysemu/kvm.h" #include "sev_i386.h" #include "sysemu/sysemu.h" +#include "sysemu/vmstate-notify.h" #include "trace.h" #include "migration/blocker.h" diff --git a/ui/gtk.c b/ui/gtk.c index ad6963d4f5..73d0dd147e 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -48,6 +48,7 @@ #include "trace.h" #include "ui/input.h" #include "sysemu/sysemu.h" +#include "sysemu/vmstate-notify.h" #include "keymaps.h" #include "chardev/char.h" #include "qom/object.h" diff --git a/ui/spice-core.c b/ui/spice-core.c index a395d7ccd4..83d18b4150 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -19,7 +19,7 @@ #include #include "sysemu/sysemu.h" - +#include "sysemu/vmstate-notify.h" #include "ui/qemu-spice.h" #include "qemu/error-report.h" #include "qemu/main-loop.h" diff --git a/vl.c b/vl.c index 91255acf71..a70f6221aa 100644 --- a/vl.c +++ b/vl.c @@ -76,6 +76,7 @@ int main(int argc, char **argv) #include "ui/input.h" #include "sysemu/sysemu.h" #include "sysemu/numa.h" +#include "sysemu/vmstate-notify.h" #include "exec/gdbstub.h" #include "qemu/timer.h" #include "chardev/char.h"