diff options
Diffstat (limited to 'hw/arm')
51 files changed, 93 insertions, 25 deletions
diff --git a/hw/arm/allwinner-a10.c b/hw/arm/allwinner-a10.c index 35e906ca54..73810a4440 100644 --- a/hw/arm/allwinner-a10.c +++ b/hw/arm/allwinner-a10.c @@ -16,12 +16,14 @@ */ #include "qemu/osdep.h" +#include "exec/address-spaces.h" #include "qapi/error.h" #include "qemu/module.h" #include "cpu.h" #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/armsse.c b/hw/arm/armsse.c index b5c614cc3a..e5263aa33d 100644 --- a/hw/arm/armsse.c +++ b/hw/arm/armsse.c @@ -16,9 +16,11 @@ #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" +#include "hw/irq.h" /* Format of the System Information block SYS_CONFIG register */ typedef enum SysConfigFormat { diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c index b9efad6bac..7a3c48f002 100644 --- a/hw/arm/armv7m.c +++ b/hw/arm/armv7m.c @@ -14,8 +14,10 @@ #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" #include "qemu/error-report.h" #include "qemu/module.h" #include "exec/address-spaces.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/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/boot.c b/hw/arm/boot.c index c2b89b3bb9..eff89ab80e 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -12,13 +12,12 @@ #include "qemu/error-report.h" #include "qapi/error.h" #include <libfdt.h> -#include "hw/hw.h" #include "hw/arm/boot.h" #include "hw/arm/linux-boot-if.h" #include "sysemu/kvm.h" #include "sysemu/sysemu.h" #include "sysemu/numa.h" -#include "hw/boards.h" +#include "sysemu/reset.h" #include "hw/loader.h" #include "elf.h" #include "sysemu/device_tree.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/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/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 becd864c19..a9f8a5c868 100644 --- a/hw/arm/exynos4210.c +++ b/hw/arm/exynos4210.c @@ -26,11 +26,13 @@ #include "qemu/log.h" #include "cpu.h" #include "hw/cpu/a9mpcore.h" -#include "hw/boards.h" +#include "hw/irq.h" +#include "sysemu/blockdev.h" #include "sysemu/sysemu.h" #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 ac0b0dc2a9..f69358a5ba 100644 --- a/hw/arm/exynos4_boards.c +++ b/hw/arm/exynos4_boards.c @@ -33,7 +33,9 @@ #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" #define SMDK_LAN9118_BASE_ADDR 0x05000000 diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c index 869ee89b15..532d088298 100644 --- a/hw/arm/fsl-imx25.c +++ b/hw/arm/fsl-imx25.c @@ -28,7 +28,7 @@ #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" static void fsl_imx25_init(Object *obj) diff --git a/hw/arm/fsl-imx31.c b/hw/arm/fsl-imx31.c index 662fe78f1b..1a37a7b997 100644 --- a/hw/arm/fsl-imx31.c +++ b/hw/arm/fsl-imx31.c @@ -25,7 +25,7 @@ #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" 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/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/highbank.c b/hw/arm/highbank.c index def0f1ce6a..362e5ba044 100644 --- a/hw/arm/highbank.c +++ b/hw/arm/highbank.c @@ -21,10 +21,12 @@ #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" #include "sysemu/kvm.h" +#include "sysemu/runstate.h" #include "sysemu/sysemu.h" #include "hw/boards.h" #include "exec/address-spaces.h" diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index 200c0107f0..200568b42a 100644 --- a/hw/arm/integratorcp.c +++ b/hw/arm/integratorcp.c @@ -11,15 +11,19 @@ #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" #include "hw/net/smc91c111.h" #include "net/net.h" #include "exec/address-spaces.h" +#include "sysemu/runstate.h" #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" #define INTEGRATOR_CM(obj) \ 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/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/mcimx6ul-evk.c b/hw/arm/mcimx6ul-evk.c index 1f6f4aed97..0276875f02 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-soc.c b/hw/arm/msf2-soc.c index 1ccb644df7..008fd9327a 100644 --- a/hw/arm/msf2-soc.c +++ b/hw/arm/msf2-soc.c @@ -27,9 +27,11 @@ #include "qapi/error.h" #include "exec/address-spaces.h" #include "hw/char/serial.h" -#include "hw/boards.h" +#include "hw/irq.h" #include "hw/arm/msf2-soc.h" #include "hw/misc/unimp.h" +#include "sysemu/runstate.h" +#include "sysemu/sysemu.h" #define MSF2_TIMER_BASE 0x40004000 #define MSF2_SYSREG_BASE 0x40038000 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 95d56f3208..8ae4751d75 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -13,18 +13,23 @@ #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" #include "hw/boards.h" #include "hw/char/serial.h" +#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" +#include "hw/irq.h" #include "hw/audio/wm8750.h" #include "sysemu/block-backend.h" +#include "sysemu/runstate.h" #include "exec/address-spaces.h" #include "ui/pixel_ops.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/nrf51_soc.c b/hw/arm/nrf51_soc.c index fc067cd8ee..74029169d0 100644 --- a/hw/arm/nrf51_soc.c +++ b/hw/arm/nrf51_soc.c @@ -12,10 +12,8 @@ #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" #include "qemu/log.h" #include "cpu.h" diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c index 4a79f5c88b..a6c4085337 100644 --- a/hw/arm/nseries.c +++ b/hw/arm/nseries.c @@ -23,6 +23,8 @@ #include "cpu.h" #include "qemu/cutils.h" #include "qemu/bswap.h" +#include "sysemu/reset.h" +#include "sysemu/runstate.h" #include "sysemu/sysemu.h" #include "hw/arm/omap.h" #include "hw/arm/boot.h" @@ -34,6 +36,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 28fbe275a8..0400593805 100644 --- a/hw/arm/omap1.c +++ b/hw/arm/omap1.c @@ -19,16 +19,22 @@ #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" #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/blockdev.h" #include "sysemu/sysemu.h" #include "hw/arm/soc_dma.h" #include "sysemu/qtest.h" +#include "sysemu/reset.h" +#include "sysemu/runstate.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..bd7ddff983 100644 --- a/hw/arm/omap2.c +++ b/hw/arm/omap2.c @@ -22,9 +22,13 @@ #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 "sysemu/runstate.h" #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/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 9eb9612bce..bea47b917d 100644 --- a/hw/arm/palm.c +++ b/hw/arm/palm.c @@ -16,9 +16,9 @@ * You should have received a copy of the GNU General Public License along * with this program; if not, see <http://www.gnu.org/licenses/>. */ + #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/hw.h" #include "audio/audio.h" #include "sysemu/sysemu.h" #include "sysemu/qtest.h" @@ -27,6 +27,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..cdafde2f76 100644 --- a/hw/arm/pxa2xx.c +++ b/hw/arm/pxa2xx.c @@ -14,10 +14,13 @@ #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" #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 d1fc9cba67..86a0e86c4c 100644 --- a/hw/arm/pxa2xx_gpio.c +++ b/hw/arm/pxa2xx_gpio.c @@ -10,7 +10,10 @@ #include "qemu/osdep.h" #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" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/arm/pxa2xx_pic.c b/hw/arm/pxa2xx_pic.c index 2f4b461562..203d4d28af 100644 --- a/hw/arm/pxa2xx_pic.c +++ b/hw/arm/pxa2xx_pic.c @@ -11,9 +11,9 @@ #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" #define ICIP 0x00 /* Interrupt Controller IRQ Pending register */ #define ICMR 0x04 /* Interrupt Controller Mask register */ 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/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..e98e9a5170 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -24,6 +24,7 @@ #include "qemu/units.h" #include "sysemu/device_tree.h" #include "sysemu/numa.h" +#include "sysemu/runstate.h" #include "sysemu/sysemu.h" #include "exec/address-spaces.h" #include "exec/hwaddr.h" @@ -36,6 +37,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/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 e96d5beb9a..2eaf07fb5f 100644 --- a/hw/arm/smmuv3.c +++ b/hw/arm/smmuv3.c @@ -17,9 +17,9 @@ */ #include "qemu/osdep.h" -#include "hw/boards.h" -#include "sysemu/sysemu.h" +#include "hw/irq.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 723cf5d592..59348123b5 100644 --- a/hw/arm/spitz.c +++ b/hw/arm/spitz.c @@ -12,12 +12,14 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/hw.h" #include "hw/arm/pxa.h" #include "hw/arm/boot.h" +#include "sysemu/runstate.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" #include "hw/block/flash.h" #include "qemu/timer.h" @@ -27,6 +29,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 499035f5c8..b198066b54 100644 --- a/hw/arm/stellaris.c +++ b/hw/arm/stellaris.c @@ -18,11 +18,14 @@ #include "hw/boards.h" #include "qemu/log.h" #include "exec/address-spaces.h" +#include "sysemu/runstate.h" #include "sysemu/sysemu.h" #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 "migration/vmstate.h" #include "hw/misc/unimp.h" #include "cpu.h" diff --git a/hw/arm/stm32f205_soc.c b/hw/arm/stm32f205_soc.c index c08041a1c5..f5a5c2d80c 100644 --- a/hw/arm/stm32f205_soc.c +++ b/hw/arm/stm32f205_soc.c @@ -28,6 +28,8 @@ #include "hw/arm/boot.h" #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/arm/strongarm.c b/hw/arm/strongarm.c index fed51a8183..dc65d88a65 100644 --- a/hw/arm/strongarm.c +++ b/hw/arm/strongarm.c @@ -31,7 +31,10 @@ #include "qemu-common.h" #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" #include "qemu/error-report.h" #include "hw/arm/boot.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/tosa.c b/hw/arm/tosa.c index 7843d68d46..e9627e356e 100644 --- a/hw/arm/tosa.c +++ b/hw/arm/tosa.c @@ -13,7 +13,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/hw.h" +#include "sysemu/runstate.h" #include "hw/arm/pxa.h" #include "hw/arm/boot.h" #include "hw/arm/sharpsl.h" @@ -21,10 +21,10 @@ #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" -#include "sysemu/sysemu.h" #define TOSA_RAM 0x04000000 #define TOSA_ROM 0x00800000 diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c index e5857117ac..e25561705f 100644 --- a/hw/arm/versatilepb.c +++ b/hw/arm/versatilepb.c @@ -11,12 +11,14 @@ #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" #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-acpi-build.c b/hw/arm/virt-acpi-build.c index 0afb372769..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" @@ -44,7 +43,9 @@ #include "hw/pci/pci.h" #include "hw/arm/virt.h" #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/virt.c b/hw/arm/virt.c index d9496c9363..02510acb81 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" @@ -44,6 +45,7 @@ #include "net/net.h" #include "sysemu/device_tree.h" #include "sysemu/numa.h" +#include "sysemu/runstate.h" #include "sysemu/sysemu.h" #include "sysemu/kvm.h" #include "hw/loader.h" @@ -54,9 +56,11 @@ #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" +#include "hw/irq.h" #include "kvm_arm.h" #include "hw/firmware/smbios.h" #include "qapi/visitor.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/arm/z2.c b/hw/arm/z2.c index 44aa748d39..3923b87e4c 100644 --- a/hw/arm/z2.c +++ b/hw/arm/z2.c @@ -12,13 +12,13 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #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 "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" |