diff options
Diffstat (limited to 'hw')
684 files changed, 748 insertions, 172 deletions
diff --git a/hw/9pfs/9p-proxy.c b/hw/9pfs/9p-proxy.c index 47a94e088d..57a8c1c808 100644 --- a/hw/9pfs/9p-proxy.c +++ b/hw/9pfs/9p-proxy.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include <sys/socket.h> #include <sys/un.h> +#include "qemu-common.h" #include "9p.h" #include "qapi/error.h" #include "qemu/cutils.h" diff --git a/hw/9pfs/coth.c b/hw/9pfs/coth.c index 89018de6bf..c3b43368f8 100644 --- a/hw/9pfs/coth.c +++ b/hw/9pfs/coth.c @@ -13,7 +13,6 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "block/thread-pool.h" #include "qemu/coroutine.h" #include "coth.h" diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c index 775e8ff766..a3288cbe56 100644 --- a/hw/9pfs/virtio-9p-device.c +++ b/hw/9pfs/virtio-9p-device.c @@ -19,6 +19,7 @@ #include "coth.h" #include "hw/virtio/virtio-access.h" #include "qemu/iov.h" +#include "qemu/module.h" static void virtio_9p_push_and_notify(V9fsPDU *pdu) { diff --git a/hw/9pfs/xen-9pfs.h b/hw/9pfs/xen-9pfs.h index 2d6ef7828c..fbdee3d843 100644 --- a/hw/9pfs/xen-9pfs.h +++ b/hw/9pfs/xen-9pfs.h @@ -8,9 +8,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. - * */ +#ifndef HW_9PFS_XEN_9PFS_H +#define HW_9PFS_XEN_9PFS_H + #include <xen/io/protocols.h> #include "hw/xen/io/ring.h" @@ -19,3 +21,5 @@ * inline functions in c files. */ DEFINE_XEN_FLEX_RING_AND_INTF(xen_9pfs); + +#endif diff --git a/hw/acpi/bios-linker-loader.c b/hw/acpi/bios-linker-loader.c index 626c04a39f..108061828b 100644 --- a/hw/acpi/bios-linker-loader.c +++ b/hw/acpi/bios-linker-loader.c @@ -19,7 +19,6 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "hw/acpi/bios-linker-loader.h" #include "hw/nvram/fw_cfg.h" diff --git a/hw/acpi/core.c b/hw/acpi/core.c index 9ed1629f36..228828a494 100644 --- a/hw/acpi/core.c +++ b/hw/acpi/core.c @@ -30,6 +30,7 @@ #include "qapi/qapi-events-run-state.h" #include "qapi/qapi-visit-misc.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "qemu/option.h" struct acpi_table_header { diff --git a/hw/acpi/tco.c b/hw/acpi/tco.c index a9143963ab..acfb65e8f2 100644 --- a/hw/acpi/tco.c +++ b/hw/acpi/tco.c @@ -7,7 +7,6 @@ * See the COPYING file in the top-level directory. */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "sysemu/watchdog.h" #include "hw/i386/ich9.h" diff --git a/hw/acpi/vmgenid.c b/hw/acpi/vmgenid.c index 02717a8b0d..b891df375f 100644 --- a/hw/acpi/vmgenid.c +++ b/hw/acpi/vmgenid.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qapi/qapi-commands-misc.h" +#include "qemu/module.h" #include "hw/acpi/acpi.h" #include "hw/acpi/aml-build.h" #include "hw/acpi/vmgenid.h" diff --git a/hw/adc/stm32f2xx_adc.c b/hw/adc/stm32f2xx_adc.c index 329a8aa673..c93b60e22e 100644 --- a/hw/adc/stm32f2xx_adc.c +++ b/hw/adc/stm32f2xx_adc.c @@ -26,6 +26,7 @@ #include "hw/sysbus.h" #include "hw/hw.h" #include "qemu/log.h" +#include "qemu/module.h" #include "hw/adc/stm32f2xx_adc.h" #ifndef STM_ADC_ERR_DEBUG diff --git a/hw/alpha/pci.c b/hw/alpha/pci.c index 8dde637bfe..fb902bb92d 100644 --- a/hw/alpha/pci.c +++ b/hw/alpha/pci.c @@ -7,7 +7,6 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "alpha_sys.h" #include "qemu/log.h" #include "sysemu/sysemu.h" diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c index 9d57361c67..3f34a5153f 100644 --- a/hw/alpha/typhoon.c +++ b/hw/alpha/typhoon.c @@ -7,6 +7,7 @@ */ #include "qemu/osdep.h" +#include "qemu/module.h" #include "qemu/units.h" #include "qapi/error.h" #include "cpu.h" diff --git a/hw/arm/allwinner-a10.c b/hw/arm/allwinner-a10.c index 06ec6f4dc8..35e906ca54 100644 --- a/hw/arm/allwinner-a10.c +++ b/hw/arm/allwinner-a10.c @@ -17,7 +17,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" +#include "qemu/module.h" #include "cpu.h" #include "hw/sysbus.h" #include "hw/arm/allwinner-a10.h" diff --git a/hw/arm/armsse.c b/hw/arm/armsse.c index 83b920334d..47d13312dc 100644 --- a/hw/arm/armsse.c +++ b/hw/arm/armsse.c @@ -11,6 +11,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" +#include "qemu/module.h" #include "qemu/bitops.h" #include "qapi/error.h" #include "trace.h" diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c index 029572258f..1a8a6c8bf9 100644 --- a/hw/arm/armv7m.c +++ b/hw/arm/armv7m.c @@ -10,7 +10,6 @@ #include "qemu/osdep.h" #include "hw/arm/armv7m.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "hw/sysbus.h" #include "hw/arm/boot.h" @@ -18,6 +17,7 @@ #include "elf.h" #include "sysemu/qtest.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "exec/address-spaces.h" #include "target/arm/idau.h" diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index 33070a6df8..d2ad2da24b 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -11,7 +11,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "exec/address-spaces.h" #include "hw/arm/boot.h" diff --git a/hw/arm/aspeed_soc.c b/hw/arm/aspeed_soc.c index faff42b84a..a2ea8c7484 100644 --- a/hw/arm/aspeed_soc.c +++ b/hw/arm/aspeed_soc.c @@ -12,13 +12,13 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "exec/address-spaces.h" #include "hw/misc/unimp.h" #include "hw/arm/aspeed_soc.h" #include "hw/char/serial.h" #include "qemu/log.h" +#include "qemu/module.h" #include "hw/i2c/aspeed_i2c.h" #include "net/net.h" diff --git a/hw/arm/bcm2835_peripherals.c b/hw/arm/bcm2835_peripherals.c index 0fb54c7964..8984e2e91f 100644 --- a/hw/arm/bcm2835_peripherals.c +++ b/hw/arm/bcm2835_peripherals.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/module.h" #include "hw/arm/bcm2835_peripherals.h" #include "hw/misc/bcm2835_mbox_defs.h" #include "hw/arm/raspi_platform.h" diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c index 6a09c339d3..493a913f89 100644 --- a/hw/arm/bcm2836.c +++ b/hw/arm/bcm2836.c @@ -10,7 +10,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" +#include "qemu/module.h" #include "cpu.h" #include "hw/arm/bcm2836.h" #include "hw/arm/raspi_platform.h" diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 7279185bd9..0261fdabab 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -8,6 +8,7 @@ */ #include "qemu/osdep.h" +#include "qemu-common.h" #include "qemu/error-report.h" #include "qapi/error.h" #include <libfdt.h> diff --git a/hw/arm/cubieboard.c b/hw/arm/cubieboard.c index 84187d3916..f7c8a5985a 100644 --- a/hw/arm/cubieboard.c +++ b/hw/arm/cubieboard.c @@ -17,7 +17,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "hw/sysbus.h" #include "hw/boards.h" diff --git a/hw/arm/digic.c b/hw/arm/digic.c index 6ef26c6bac..9015b60c23 100644 --- a/hw/arm/digic.c +++ b/hw/arm/digic.c @@ -22,6 +22,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/module.h" #include "hw/arm/digic.h" #include "sysemu/sysemu.h" diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c index e99e9cd11b..becd864c19 100644 --- a/hw/arm/exynos4210.c +++ b/hw/arm/exynos4210.c @@ -23,7 +23,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "qemu/log.h" #include "cpu.h" #include "hw/cpu/a9mpcore.h" diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c index 71f58586c1..ac0b0dc2a9 100644 --- a/hw/arm/exynos4_boards.c +++ b/hw/arm/exynos4_boards.c @@ -25,7 +25,6 @@ #include "qemu/units.h" #include "qapi/error.h" #include "qemu/error-report.h" -#include "qemu-common.h" #include "cpu.h" #include "sysemu/sysemu.h" #include "hw/sysbus.h" diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c index bd07040a4a..869ee89b15 100644 --- a/hw/arm/fsl-imx25.c +++ b/hw/arm/fsl-imx25.c @@ -24,7 +24,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "hw/arm/fsl-imx25.h" #include "sysemu/sysemu.h" diff --git a/hw/arm/fsl-imx31.c b/hw/arm/fsl-imx31.c index ec8239a967..662fe78f1b 100644 --- a/hw/arm/fsl-imx31.c +++ b/hw/arm/fsl-imx31.c @@ -21,7 +21,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "hw/arm/fsl-imx31.h" #include "sysemu/sysemu.h" diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c index 7b7b97f74c..7129517378 100644 --- a/hw/arm/fsl-imx6.c +++ b/hw/arm/fsl-imx6.c @@ -21,11 +21,11 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "hw/arm/fsl-imx6.h" #include "sysemu/sysemu.h" #include "chardev/char.h" #include "qemu/error-report.h" +#include "qemu/module.h" #define IMX6_ESDHC_CAPABILITIES 0x057834b4 diff --git a/hw/arm/fsl-imx6ul.c b/hw/arm/fsl-imx6ul.c index 4b56bfa8d1..05505bac56 100644 --- a/hw/arm/fsl-imx6ul.c +++ b/hw/arm/fsl-imx6ul.c @@ -18,11 +18,11 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "hw/arm/fsl-imx6ul.h" #include "hw/misc/unimp.h" #include "sysemu/sysemu.h" #include "qemu/error-report.h" +#include "qemu/module.h" #define NAME_SIZE 20 diff --git a/hw/arm/fsl-imx7.c b/hw/arm/fsl-imx7.c index 7663ad6861..b7e3526b4f 100644 --- a/hw/arm/fsl-imx7.c +++ b/hw/arm/fsl-imx7.c @@ -20,11 +20,11 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "hw/arm/fsl-imx7.h" #include "hw/misc/unimp.h" #include "sysemu/sysemu.h" #include "qemu/error-report.h" +#include "qemu/module.h" #define NAME_SIZE 20 diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c index a89a1d3a7c..72ca78108a 100644 --- a/hw/arm/highbank.c +++ b/hw/arm/highbank.c @@ -18,6 +18,7 @@ */ #include "qemu/osdep.h" +#include "qemu-common.h" #include "qapi/error.h" #include "hw/sysbus.h" #include "hw/arm/boot.h" diff --git a/hw/arm/imx25_pdk.c b/hw/arm/imx25_pdk.c index a0423ffb67..5d673e47bc 100644 --- a/hw/arm/imx25_pdk.c +++ b/hw/arm/imx25_pdk.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "hw/arm/fsl-imx25.h" #include "hw/boards.h" diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index d18caab8bd..200c0107f0 100644 --- a/hw/arm/integratorcp.c +++ b/hw/arm/integratorcp.c @@ -9,7 +9,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "hw/sysbus.h" #include "hw/boards.h" diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c index 44cba8782b..59d2102dc5 100644 --- a/hw/arm/kzm.c +++ b/hw/arm/kzm.c @@ -15,7 +15,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "hw/arm/fsl-imx31.h" #include "hw/boards.h" diff --git a/hw/arm/mcimx6ul-evk.c b/hw/arm/mcimx6ul-evk.c index fb2b015bf6..31511059e4 100644 --- a/hw/arm/mcimx6ul-evk.c +++ b/hw/arm/mcimx6ul-evk.c @@ -12,7 +12,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "hw/arm/fsl-imx6ul.h" #include "hw/boards.h" #include "sysemu/sysemu.h" diff --git a/hw/arm/mcimx7d-sabre.c b/hw/arm/mcimx7d-sabre.c index 9c5f0e70c3..d6b190d85d 100644 --- a/hw/arm/mcimx7d-sabre.c +++ b/hw/arm/mcimx7d-sabre.c @@ -14,7 +14,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "hw/arm/fsl-imx7.h" #include "hw/boards.h" #include "sysemu/sysemu.h" diff --git a/hw/arm/msf2-soc.c b/hw/arm/msf2-soc.c index d700b212f8..1ccb644df7 100644 --- a/hw/arm/msf2-soc.c +++ b/hw/arm/msf2-soc.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "qapi/error.h" -#include "qemu-common.h" #include "exec/address-spaces.h" #include "hw/char/serial.h" #include "hw/boards.h" diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index 5645997b56..95d56f3208 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -11,7 +11,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "hw/sysbus.h" #include "hw/arm/boot.h" diff --git a/hw/arm/nrf51_soc.c b/hw/arm/nrf51_soc.c index ce618edc7b..fc067cd8ee 100644 --- a/hw/arm/nrf51_soc.c +++ b/hw/arm/nrf51_soc.c @@ -10,7 +10,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "hw/arm/boot.h" #include "hw/sysbus.h" #include "hw/boards.h" diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c index 23e72db79e..87ced7f3a2 100644 --- a/hw/arm/omap2.c +++ b/hw/arm/omap2.c @@ -21,7 +21,6 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "sysemu/qtest.h" #include "hw/boards.h" diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c index 3d7c88910e..e2e43ae6e8 100644 --- a/hw/arm/pxa2xx.c +++ b/hw/arm/pxa2xx.c @@ -8,9 +8,10 @@ */ #include "qemu/osdep.h" +#include "qemu-common.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "hw/sysbus.h" #include "hw/arm/pxa.h" diff --git a/hw/arm/pxa2xx_gpio.c b/hw/arm/pxa2xx_gpio.c index e15070188e..d1fc9cba67 100644 --- a/hw/arm/pxa2xx_gpio.c +++ b/hw/arm/pxa2xx_gpio.c @@ -13,6 +13,7 @@ #include "hw/sysbus.h" #include "hw/arm/pxa.h" #include "qemu/log.h" +#include "qemu/module.h" #define PXA2XX_GPIO_BANKS 4 diff --git a/hw/arm/pxa2xx_pic.c b/hw/arm/pxa2xx_pic.c index 61275fa040..2f4b461562 100644 --- a/hw/arm/pxa2xx_pic.c +++ b/hw/arm/pxa2xx_pic.c @@ -9,7 +9,7 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" +#include "qemu/module.h" #include "cpu.h" #include "hw/hw.h" #include "hw/arm/pxa.h" diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index 8c249fcabb..cb23330940 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -14,7 +14,6 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "hw/arm/bcm2836.h" #include "qemu/error-report.h" diff --git a/hw/arm/realview.c b/hw/arm/realview.c index d42a76e7a1..12d6e93a35 100644 --- a/hw/arm/realview.c +++ b/hw/arm/realview.c @@ -9,7 +9,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "hw/sysbus.h" #include "hw/arm/boot.h" diff --git a/hw/arm/sabrelite.c b/hw/arm/sabrelite.c index f1b00de229..97230ac827 100644 --- a/hw/arm/sabrelite.c +++ b/hw/arm/sabrelite.c @@ -12,7 +12,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "hw/arm/fsl-imx6.h" #include "hw/boards.h" #include "sysemu/sysemu.h" diff --git a/hw/arm/smmu-common.c b/hw/arm/smmu-common.c index e94be6db6c..717d22bcbe 100644 --- a/hw/arm/smmu-common.c +++ b/hw/arm/smmu-common.c @@ -25,6 +25,7 @@ #include "hw/qdev-properties.h" #include "qapi/error.h" #include "qemu/jhash.h" +#include "qemu/module.h" #include "qemu/error-report.h" #include "hw/arm/smmu-common.h" diff --git a/hw/arm/stm32f205_soc.c b/hw/arm/stm32f205_soc.c index a5b6f7bda2..c08041a1c5 100644 --- a/hw/arm/stm32f205_soc.c +++ b/hw/arm/stm32f205_soc.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" +#include "qemu/module.h" #include "hw/arm/boot.h" #include "exec/address-spaces.h" #include "hw/arm/stm32f205_soc.h" diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c index a1ecbddaab..fed51a8183 100644 --- a/hw/arm/strongarm.c +++ b/hw/arm/strongarm.c @@ -28,6 +28,7 @@ */ #include "qemu/osdep.h" +#include "qemu-common.h" #include "cpu.h" #include "hw/boards.h" #include "hw/sysbus.h" diff --git a/hw/arm/sysbus-fdt.c b/hw/arm/sysbus-fdt.c index ad698d4832..57f94e6581 100644 --- a/hw/arm/sysbus-fdt.c +++ b/hw/arm/sysbus-fdt.c @@ -24,7 +24,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include <libfdt.h> -#include "qemu-common.h" #ifdef CONFIG_LINUX #include <linux/vfio.h> #endif diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c index f471fb7025..e5857117ac 100644 --- a/hw/arm/versatilepb.c +++ b/hw/arm/versatilepb.c @@ -9,7 +9,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "hw/sysbus.h" #include "hw/arm/boot.h" diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 4a64f9985c..9e8b84988d 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -28,7 +28,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "qemu/bitmap.h" #include "trace.h" #include "qom/cpu.h" diff --git a/hw/arm/virt.c b/hw/arm/virt.c index bf54f10b51..431e2900fd 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -29,6 +29,7 @@ */ #include "qemu/osdep.h" +#include "qemu-common.h" #include "qemu/units.h" #include "qemu/option.h" #include "qapi/error.h" @@ -49,6 +50,7 @@ #include "exec/address-spaces.h" #include "qemu/bitops.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "hw/pci-host/gpex.h" #include "hw/arm/sysbus-fdt.h" #include "hw/platform-bus.h" diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index 198e3f9763..89da34808b 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -17,7 +17,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "hw/sysbus.h" #include "hw/arm/boot.h" diff --git a/hw/arm/xlnx-versal.c b/hw/arm/xlnx-versal.c index e8e4278eb3..98163eb1aa 100644 --- a/hw/arm/xlnx-versal.c +++ b/hw/arm/xlnx-versal.c @@ -11,8 +11,8 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "qemu/log.h" +#include "qemu/module.h" #include "hw/sysbus.h" #include "net/net.h" #include "sysemu/sysemu.h" diff --git a/hw/arm/xlnx-zcu102.c b/hw/arm/xlnx-zcu102.c index c802f26fbd..044d3394c0 100644 --- a/hw/arm/xlnx-zcu102.c +++ b/hw/arm/xlnx-zcu102.c @@ -17,7 +17,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "hw/arm/xlnx-zynqmp.h" #include "hw/boards.h" diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index 6e99190302..a1ca9b5adf 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -17,7 +17,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" +#include "qemu/module.h" #include "cpu.h" #include "hw/arm/xlnx-zynqmp.h" #include "hw/intc/arm_gic_common.h" diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c index a4e8d99e77..fb98da2678 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 "qemu/module.h" #include "sysemu/dma.h" enum { diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c index 0957780a3d..7dd9a89b89 100644 --- a/hw/audio/adlib.c +++ b/hw/audio/adlib.c @@ -24,6 +24,7 @@ #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" diff --git a/hw/audio/cs4231.c b/hw/audio/cs4231.c index 30690f96ae..8372299ebb 100644 --- a/hw/audio/cs4231.c +++ b/hw/audio/cs4231.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "qemu/module.h" #include "trace.h" /* diff --git a/hw/audio/cs4231a.c b/hw/audio/cs4231a.c index 62da75eefe..7216b41cc1 100644 --- a/hw/audio/cs4231a.c +++ b/hw/audio/cs4231a.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 "hw/audio/soundhw.h" #include "audio/audio.h" #include "hw/isa/isa.h" #include "hw/qdev.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 a5314d66fd..260c142b70 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 "qemu/module.h" #include "sysemu/dma.h" /* Missing stuff: diff --git a/hw/audio/gus.c b/hw/audio/gus.c index b3e2a7fdd5..9ab51631d9 100644 --- a/hw/audio/gus.c +++ b/hw/audio/gus.c @@ -21,8 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/module.h" #include "hw/hw.h" #include "hw/audio/soundhw.h" #include "audio/audio.h" diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c index c25bfa38b1..84639b5424 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 "qemu/module.h" #include "intel-hda-defs.h" #include "audio/audio.h" #include "trace.h" diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c index 33e333cc26..b78baac295 100644 --- a/hw/audio/intel-hda.c +++ b/hw/audio/intel-hda.c @@ -24,6 +24,7 @@ #include "qemu/timer.h" #include "qemu/bitops.h" #include "qemu/log.h" +#include "qemu/module.h" #include "hw/audio/soundhw.h" #include "intel-hda.h" #include "intel-hda-defs.h" diff --git a/hw/audio/marvell_88w8618.c b/hw/audio/marvell_88w8618.c index 035dd76cbf..ff1a0d0d8f 100644 --- a/hw/audio/marvell_88w8618.c +++ b/hw/audio/marvell_88w8618.c @@ -9,12 +9,14 @@ * Contributions after 2012-01-13 are licensed under the terms of the * GNU GPL, version 2 or (at your option) any later version. */ + #include "qemu/osdep.h" #include "hw/sysbus.h" #include "hw/hw.h" #include "hw/audio/wm8750.h" #include "audio/audio.h" #include "qapi/error.h" +#include "qemu/module.h" #define MP_AUDIO_SIZE 0x00001000 diff --git a/hw/audio/milkymist-ac97.c b/hw/audio/milkymist-ac97.c index 90cce1e6ed..bf6a5a6b96 100644 --- a/hw/audio/milkymist-ac97.c +++ b/hw/audio/milkymist-ac97.c @@ -27,6 +27,7 @@ #include "trace.h" #include "audio/audio.h" #include "qemu/error-report.h" +#include "qemu/module.h" enum { R_AC97_CTRL = 0, diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c index 9c7fd74aeb..a7b3ab0c2b 100644 --- a/hw/audio/pcspk.c +++ b/hw/audio/pcspk.c @@ -27,6 +27,7 @@ #include "hw/isa/isa.h" #include "hw/audio/soundhw.h" #include "audio/audio.h" +#include "qemu/module.h" #include "qemu/timer.h" #include "hw/timer/i8254.h" #include "hw/audio/pcspk.h" diff --git a/hw/audio/pl041.c b/hw/audio/pl041.c index c8cc503236..59c6ce1f2e 100644 --- a/hw/audio/pl041.c +++ b/hw/audio/pl041.c @@ -23,6 +23,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "qemu/log.h" +#include "qemu/module.h" #include "pl041.h" #include "lm4549.h" diff --git a/hw/audio/sb16.c b/hw/audio/sb16.c index 65ea0cd938..a2db06a2bb 100644 --- a/hw/audio/sb16.c +++ b/hw/audio/sb16.c @@ -21,6 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/audio/soundhw.h" @@ -30,6 +31,7 @@ #include "qemu/timer.h" #include "qemu/host-utils.h" #include "qemu/log.h" +#include "qemu/module.h" #include "qapi/error.h" #define dolog(...) AUD_log ("sb16", __VA_ARGS__) diff --git a/hw/audio/soundhw.c b/hw/audio/soundhw.c index e698909d34..c750473c8f 100644 --- a/hw/audio/soundhw.c +++ b/hw/audio/soundhw.c @@ -22,7 +22,6 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "qemu/help_option.h" #include "qemu/error-report.h" #include "qom/object.h" diff --git a/hw/audio/wm8750.c b/hw/audio/wm8750.c index ca0ad73caf..81f83eea88 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 "qemu/module.h" #include "hw/audio/wm8750.h" #include "audio/audio.h" diff --git a/hw/block/cdrom.c b/hw/block/cdrom.c index da937fe33a..c6bfa50ad0 100644 --- a/hw/block/cdrom.c +++ b/hw/block/cdrom.c @@ -26,7 +26,6 @@ here. */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "hw/scsi/scsi.h" static void lba_to_msf(uint8_t *buf, int lba) diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 37ccedc9f7..a64378f84b 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -40,6 +40,7 @@ #include "sysemu/blockdev.h" #include "sysemu/sysemu.h" #include "qemu/log.h" +#include "qemu/module.h" #include "trace.h" /********************************************************/ diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index e8dfa14b33..dd87affcf5 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -28,6 +28,7 @@ #include "hw/ssi/ssi.h" #include "qemu/bitops.h" #include "qemu/log.h" +#include "qemu/module.h" #include "qemu/error-report.h" #include "qapi/error.h" diff --git a/hw/block/nand.c b/hw/block/nand.c index 919cb9b803..0a2736b50e 100644 --- a/hw/block/nand.c +++ b/hw/block/nand.c @@ -25,6 +25,7 @@ #include "hw/qdev.h" #include "qapi/error.h" #include "qemu/error-report.h" +#include "qemu/module.h" # define NAND_CMD_READ0 0x00 # define NAND_CMD_READ1 0x01 diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 30e50f7a38..107a719b95 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -37,6 +37,7 @@ #include "sysemu/block-backend.h" #include "qemu/log.h" +#include "qemu/module.h" #include "qemu/cutils.h" #include "trace.h" #include "nvme.h" diff --git a/hw/block/onenand.c b/hw/block/onenand.c index f11118a687..b3644f7e89 100644 --- a/hw/block/onenand.c +++ b/hw/block/onenand.c @@ -20,7 +20,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "hw/hw.h" #include "hw/block/flash.h" #include "hw/irq.h" @@ -29,6 +28,7 @@ #include "hw/sysbus.h" #include "qemu/error-report.h" #include "qemu/log.h" +#include "qemu/module.h" /* 11 for 2kB-page OneNAND ("2nd generation") and 10 for 1kB-page chips */ #define PAGE_SHIFT 11 diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index 333b736277..35080d915f 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -47,6 +47,7 @@ #include "qemu/error-report.h" #include "qemu/host-utils.h" #include "qemu/log.h" +#include "qemu/module.h" #include "qemu/option.h" #include "hw/sysbus.h" #include "sysemu/blockdev.h" diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index f2c6201f81..eb106f4996 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -43,6 +43,7 @@ #include "qemu/timer.h" #include "sysemu/block-backend.h" #include "qemu/host-utils.h" +#include "qemu/module.h" #include "hw/sysbus.h" #include "trace.h" diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index 06e57a4d39..cbb3729158 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -13,8 +13,8 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "qemu/iov.h" +#include "qemu/module.h" #include "qemu/error-report.h" #include "trace.h" #include "hw/block/block.h" diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c index 31b0f5ccc8..4de537aef4 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/module.h" #include "qemu/option.h" #include "qapi/error.h" #include "qapi/qapi-commands-block-core.h" diff --git a/hw/bt/core.c b/hw/bt/core.c index 78370e64f5..dfb196e2a4 100644 --- a/hw/bt/core.c +++ b/hw/bt/core.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" -#include "qemu-common.h" #include "sysemu/bt.h" #include "hw/bt.h" diff --git a/hw/bt/hci-csr.c b/hw/bt/hci-csr.c index fa6660a113..3d60654f44 100644 --- a/hw/bt/hci-csr.c +++ b/hw/bt/hci-csr.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" -#include "qemu-common.h" +#include "qemu/module.h" #include "chardev/char-serial.h" #include "qemu/timer.h" #include "qemu/bswap.h" diff --git a/hw/bt/hci.c b/hw/bt/hci.c index c6b2cc1d48..c7958f6c35 100644 --- a/hw/bt/hci.c +++ b/hw/bt/hci.c @@ -21,7 +21,6 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" #include "qapi/error.h" -#include "qemu-common.h" #include "qemu/timer.h" #include "hw/usb.h" #include "sysemu/bt.h" diff --git a/hw/bt/hid.c b/hw/bt/hid.c index 056291f9b5..066ca99ed2 100644 --- a/hw/bt/hid.c +++ b/hw/bt/hid.c @@ -19,7 +19,6 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "qemu/timer.h" #include "ui/console.h" #include "hw/input/hid.h" diff --git a/hw/bt/l2cap.c b/hw/bt/l2cap.c index 9cf27f0df6..d67098a719 100644 --- a/hw/bt/l2cap.c +++ b/hw/bt/l2cap.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" -#include "qemu-common.h" #include "qemu/timer.h" #include "qemu/bswap.h" #include "hw/bt.h" diff --git a/hw/bt/sdp.c b/hw/bt/sdp.c index f4aba9d74f..2860d76c85 100644 --- a/hw/bt/sdp.c +++ b/hw/bt/sdp.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" -#include "qemu-common.h" #include "qemu/host-utils.h" #include "hw/bt.h" diff --git a/hw/char/bcm2835_aux.c b/hw/char/bcm2835_aux.c index 0364596c55..94679d276c 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 "qemu/log.h" +#include "qemu/module.h" #define AUX_IRQ 0x0 #define AUX_ENABLES 0x4 diff --git a/hw/char/cadence_uart.c b/hw/char/cadence_uart.c index fbdbd463bb..fa25fe24da 100644 --- a/hw/char/cadence_uart.c +++ b/hw/char/cadence_uart.c @@ -27,6 +27,7 @@ #include "chardev/char-serial.h" #include "qemu/timer.h" #include "qemu/log.h" +#include "qemu/module.h" #include "hw/char/cadence_uart.h" #ifdef CADENCE_UART_ERR_DEBUG diff --git a/hw/char/cmsdk-apb-uart.c b/hw/char/cmsdk-apb-uart.c index ddfbb25c24..606c9cc7d6 100644 --- a/hw/char/cmsdk-apb-uart.c +++ b/hw/char/cmsdk-apb-uart.c @@ -17,6 +17,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" +#include "qemu/module.h" #include "qapi/error.h" #include "trace.h" #include "hw/sysbus.h" diff --git a/hw/char/debugcon.c b/hw/char/debugcon.c index e2abc61b04..e1b6d1190f 100644 --- a/hw/char/debugcon.c +++ b/hw/char/debugcon.c @@ -26,6 +26,7 @@ #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 ccc75eaa4d..e4ac8435c8 100644 --- a/hw/char/digic-uart.c +++ b/hw/char/digic-uart.c @@ -31,6 +31,7 @@ #include "hw/sysbus.h" #include "chardev/char-fe.h" #include "qemu/log.h" +#include "qemu/module.h" #include "hw/char/digic-uart.h" diff --git a/hw/char/escc.c b/hw/char/escc.c index c5b05a63f1..8ddbb4be4f 100644 --- a/hw/char/escc.c +++ b/hw/char/escc.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/sysbus.h" +#include "qemu/module.h" #include "hw/char/escc.h" #include "ui/console.h" #include "trace.h" diff --git a/hw/char/etraxfs_ser.c b/hw/char/etraxfs_ser.c index a184026410..9745bca86c 100644 --- a/hw/char/etraxfs_ser.c +++ b/hw/char/etraxfs_ser.c @@ -26,6 +26,7 @@ #include "hw/sysbus.h" #include "chardev/char-fe.h" #include "qemu/log.h" +#include "qemu/module.h" #define D(x) diff --git a/hw/char/exynos4210_uart.c b/hw/char/exynos4210_uart.c index a5a285655f..c5700eeaec 100644 --- a/hw/char/exynos4210_uart.c +++ b/hw/char/exynos4210_uart.c @@ -22,6 +22,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.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/grlib_apbuart.c b/hw/char/grlib_apbuart.c index 9623016d56..c2bb3ac153 100644 --- a/hw/char/grlib_apbuart.c +++ b/hw/char/grlib_apbuart.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/sparc/grlib.h" #include "hw/sysbus.h" +#include "qemu/module.h" #include "chardev/char-fe.h" #include "trace.h" diff --git a/hw/char/imx_serial.c b/hw/char/imx_serial.c index 1e363190e3..0655a9571b 100644 --- a/hw/char/imx_serial.c +++ b/hw/char/imx_serial.c @@ -22,6 +22,7 @@ #include "hw/char/imx_serial.h" #include "sysemu/sysemu.h" #include "qemu/log.h" +#include "qemu/module.h" #ifndef DEBUG_IMX_UART #define DEBUG_IMX_UART 0 diff --git a/hw/char/ipoctal232.c b/hw/char/ipoctal232.c index 5e09caf851..5ab731e408 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 "qemu/bitops.h" +#include "qemu/module.h" #include "chardev/char-fe.h" /* #define DEBUG_IPOCTAL */ diff --git a/hw/char/lm32_juart.c b/hw/char/lm32_juart.c index d75c835ad2..41a3ec81e3 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 "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 c4a3b9b275..d047a44e34 100644 --- a/hw/char/lm32_uart.c +++ b/hw/char/lm32_uart.c @@ -28,6 +28,7 @@ #include "trace.h" #include "chardev/char-fe.h" #include "qemu/error-report.h" +#include "qemu/module.h" enum { R_RXTX = 0, diff --git a/hw/char/mcf_uart.c b/hw/char/mcf_uart.c index 787f985db6..7b06110c4d 100644 --- a/hw/char/mcf_uart.c +++ b/hw/char/mcf_uart.c @@ -5,9 +5,11 @@ * * This code is licensed under the GPL */ + #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/sysbus.h" +#include "qemu/module.h" #include "hw/m68k/mcf.h" #include "chardev/char-fe.h" diff --git a/hw/char/milkymist-uart.c b/hw/char/milkymist-uart.c index 548ee27bca..8a78fcca8f 100644 --- a/hw/char/milkymist-uart.c +++ b/hw/char/milkymist-uart.c @@ -27,6 +27,7 @@ #include "trace.h" #include "chardev/char-fe.h" #include "qemu/error-report.h" +#include "qemu/module.h" enum { R_RXTX = 0, diff --git a/hw/char/nrf51_uart.c b/hw/char/nrf51_uart.c index 2f5fae6167..c90b491477 100644 --- a/hw/char/nrf51_uart.c +++ b/hw/char/nrf51_uart.c @@ -14,6 +14,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" +#include "qemu/module.h" #include "hw/char/nrf51_uart.h" #include "trace.h" diff --git a/hw/char/parallel.c b/hw/char/parallel.c index a80da47ecf..1cd4c54a02 100644 --- a/hw/char/parallel.c +++ b/hw/char/parallel.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 "qapi/error.h" +#include "qemu/module.h" #include "hw/hw.h" #include "chardev/char-parallel.h" #include "chardev/char-fe.h" diff --git a/hw/char/pl011.c b/hw/char/pl011.c index e5dd448f85..c1ae2f31f5 100644 --- a/hw/char/pl011.c +++ b/hw/char/pl011.c @@ -23,6 +23,7 @@ #include "hw/sysbus.h" #include "chardev/char-fe.h" #include "qemu/log.h" +#include "qemu/module.h" #include "trace.h" #define PL011_INT_TX 0x20 diff --git a/hw/char/sclpconsole-lm.c b/hw/char/sclpconsole-lm.c index dbc91a1e5b..691dc870ed 100644 --- a/hw/char/sclpconsole-lm.c +++ b/hw/char/sclpconsole-lm.c @@ -17,6 +17,7 @@ #include "hw/qdev.h" #include "qemu/thread.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "chardev/char-fe.h" #include "hw/s390x/sclp.h" diff --git a/hw/char/sclpconsole.c b/hw/char/sclpconsole.c index 1fa16e9055..09b1d45d7a 100644 --- a/hw/char/sclpconsole.c +++ b/hw/char/sclpconsole.c @@ -16,6 +16,7 @@ #include "hw/qdev.h" #include "qemu/thread.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "hw/s390x/sclp.h" #include "hw/s390x/event-facility.h" diff --git a/hw/char/serial-isa.c b/hw/char/serial-isa.c index 116b7b2e69..610426111a 100644 --- a/hw/char/serial-isa.c +++ b/hw/char/serial-isa.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/module.h" #include "hw/char/serial.h" #include "hw/isa/isa.h" diff --git a/hw/char/serial-pci.c b/hw/char/serial-pci.c index 2d5ffae5cf..9028efbda8 100644 --- a/hw/char/serial-pci.c +++ b/hw/char/serial-pci.c @@ -27,6 +27,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/module.h" #include "hw/char/serial.h" #include "hw/pci/pci.h" diff --git a/hw/char/spapr_vty.c b/hw/char/spapr_vty.c index 617303dbaf..871d2666f3 100644 --- a/hw/char/spapr_vty.c +++ b/hw/char/spapr_vty.c @@ -1,7 +1,7 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "hw/qdev.h" #include "chardev/char-fe.h" diff --git a/hw/char/stm32f2xx_usart.c b/hw/char/stm32f2xx_usart.c index 10392c70e2..40c365b908 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 "qemu/log.h" +#include "qemu/module.h" #ifndef STM_USART_ERR_DEBUG #define STM_USART_ERR_DEBUG 0 diff --git a/hw/char/terminal3270.c b/hw/char/terminal3270.c index 35b079d5c4..3785886c25 100644 --- a/hw/char/terminal3270.c +++ b/hw/char/terminal3270.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/module.h" #include "chardev/char-fe.h" #include "hw/s390x/3270-ccw.h" diff --git a/hw/char/virtio-console.c b/hw/char/virtio-console.c index 2cbe1d4ed5..1bbeb00fae 100644 --- a/hw/char/virtio-console.c +++ b/hw/char/virtio-console.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "chardev/char-fe.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "trace.h" #include "hw/virtio/virtio-serial.h" #include "qapi/error.h" diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c index bdd917bbb8..f7a54f261b 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/module.h" #include "monitor/monitor.h" #include "qemu/error-report.h" #include "qemu/queue.h" diff --git a/hw/char/xilinx_uartlite.c b/hw/char/xilinx_uartlite.c index 2a8bc1e497..880962a756 100644 --- a/hw/char/xilinx_uartlite.c +++ b/hw/char/xilinx_uartlite.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "qemu/module.h" #include "chardev/char-fe.h" #define DUART(x) diff --git a/hw/core/bus.c b/hw/core/bus.c index e09843f6ab..e6baa04e52 100644 --- a/hw/core/bus.c +++ b/hw/core/bus.c @@ -18,7 +18,8 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" +#include "qemu/ctype.h" +#include "qemu/module.h" #include "hw/qdev.h" #include "qapi/error.h" diff --git a/hw/core/empty_slot.c b/hw/core/empty_slot.c index 239f78e2a7..c694532046 100644 --- a/hw/core/empty_slot.c +++ b/hw/core/empty_slot.c @@ -12,6 +12,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/sysbus.h" +#include "qemu/module.h" #include "hw/empty_slot.h" //#define DEBUG_EMPTY_SLOT diff --git a/hw/core/fw-path-provider.c b/hw/core/fw-path-provider.c index 33b99830e7..4840faefd1 100644 --- a/hw/core/fw-path-provider.c +++ b/hw/core/fw-path-provider.c @@ -17,6 +17,7 @@ #include "qemu/osdep.h" #include "hw/fw-path-provider.h" +#include "qemu/module.h" char *fw_path_provider_get_dev_path(FWPathProvider *p, BusState *bus, DeviceState *dev) diff --git a/hw/core/generic-loader.c b/hw/core/generic-loader.c index 3695dd439c..79a493e577 100644 --- a/hw/core/generic-loader.c +++ b/hw/core/generic-loader.c @@ -36,6 +36,7 @@ #include "sysemu/dma.h" #include "hw/loader.h" #include "qapi/error.h" +#include "qemu/module.h" #include "hw/core/generic-loader.h" #define CPU_NONE 0xFFFFFFFF diff --git a/hw/core/irq.c b/hw/core/irq.c index b98d1d69f5..7cc0295d0e 100644 --- a/hw/core/irq.c +++ b/hw/core/irq.c @@ -23,7 +23,6 @@ */ #include "qemu/osdep.h" #include "qemu/main-loop.h" -#include "qemu-common.h" #include "hw/irq.h" #include "qom/object.h" diff --git a/hw/core/loader.c b/hw/core/loader.c index a097bbe30a..425bf69a99 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -43,6 +43,7 @@ */ #include "qemu/osdep.h" +#include "qemu-common.h" #include "qapi/error.h" #include "hw/hw.h" #include "disas/disas.h" diff --git a/hw/core/nmi.c b/hw/core/nmi.c index bfd0896daf..481c4b3c7e 100644 --- a/hw/core/nmi.c +++ b/hw/core/nmi.c @@ -23,6 +23,7 @@ #include "hw/nmi.h" #include "qapi/error.h" #include "qapi/qmp/qerror.h" +#include "qemu/module.h" #include "monitor/monitor.h" struct do_nmi_s { diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c index 76d3f8e39c..04a1e2b02a 100644 --- a/hw/core/null-machine.c +++ b/hw/core/null-machine.c @@ -12,7 +12,6 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "qemu/error-report.h" #include "hw/hw.h" #include "hw/boards.h" diff --git a/hw/core/or-irq.c b/hw/core/or-irq.c index a86901b673..123a8c644a 100644 --- a/hw/core/or-irq.c +++ b/hw/core/or-irq.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "hw/or-irq.h" +#include "qemu/module.h" static void or_irq_handler(void *opaque, int n, int level) { diff --git a/hw/core/platform-bus.c b/hw/core/platform-bus.c index e473a44746..5fecb29239 100644 --- a/hw/core/platform-bus.c +++ b/hw/core/platform-bus.c @@ -22,6 +22,7 @@ #include "qemu/osdep.h" #include "hw/platform-bus.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "sysemu/sysemu.h" diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index 5da1439a8b..81c97f48a7 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -4,6 +4,7 @@ #include "qapi/error.h" #include "hw/pci/pci.h" #include "qapi/qmp/qerror.h" +#include "qemu/ctype.h" #include "qemu/error-report.h" #include "hw/block/block.h" #include "net/hub.h" diff --git a/hw/core/register.c b/hw/core/register.c index d2d1636250..bb5ab9d479 100644 --- a/hw/core/register.c +++ b/hw/core/register.c @@ -19,6 +19,7 @@ #include "hw/register.h" #include "hw/qdev.h" #include "qemu/log.h" +#include "qemu/module.h" static inline void register_write_val(RegisterInfo *reg, uint64_t val) { diff --git a/hw/core/split-irq.c b/hw/core/split-irq.c index 7e64cd4969..c606f4a802 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 "qapi/error.h" +#include "qemu/module.h" static void split_irq_handler(void *opaque, int n, int level) { diff --git a/hw/core/stream.c b/hw/core/stream.c index 4439ecdf0b..39b1e595cd 100644 --- a/hw/core/stream.c +++ b/hw/core/stream.c @@ -1,5 +1,6 @@ #include "qemu/osdep.h" #include "hw/stream.h" +#include "qemu/module.h" size_t stream_push(StreamSlave *sink, uint8_t *buf, size_t len) diff --git a/hw/core/sysbus.c b/hw/core/sysbus.c index 689a867a22..9e69c83aed 100644 --- a/hw/core/sysbus.c +++ b/hw/core/sysbus.c @@ -19,6 +19,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/module.h" #include "hw/sysbus.h" #include "monitor/monitor.h" #include "exec/address-spaces.h" diff --git a/hw/cpu/a15mpcore.c b/hw/cpu/a15mpcore.c index 5649843cd8..980f230d75 100644 --- a/hw/cpu/a15mpcore.c +++ b/hw/cpu/a15mpcore.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/module.h" #include "hw/cpu/a15mpcore.h" #include "sysemu/kvm.h" #include "kvm_arm.h" diff --git a/hw/cpu/a9mpcore.c b/hw/cpu/a9mpcore.c index a5b867872c..187e4d939e 100644 --- a/hw/cpu/a9mpcore.c +++ b/hw/cpu/a9mpcore.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/module.h" #include "hw/cpu/a9mpcore.h" #include "qom/cpu.h" diff --git a/hw/cpu/arm11mpcore.c b/hw/cpu/arm11mpcore.c index 8aead3794e..2404f93a3e 100644 --- a/hw/cpu/arm11mpcore.c +++ b/hw/cpu/arm11mpcore.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/module.h" #include "hw/cpu/arm11mpcore.h" #include "hw/intc/realview_gic.h" diff --git a/hw/cpu/core.c b/hw/cpu/core.c index 7e42e2c87a..e57c73f0ce 100644 --- a/hw/cpu/core.c +++ b/hw/cpu/core.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 "hw/cpu/core.h" #include "qapi/visitor.h" +#include "qemu/module.h" #include "qapi/error.h" #include "sysemu/cpus.h" diff --git a/hw/cpu/realview_mpcore.c b/hw/cpu/realview_mpcore.c index 9d3f8378fb..f06294bb5e 100644 --- a/hw/cpu/realview_mpcore.c +++ b/hw/cpu/realview_mpcore.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/module.h" #include "hw/cpu/arm11mpcore.h" #include "hw/intc/realview_gic.h" diff --git a/hw/cris/axis_dev88.c b/hw/cris/axis_dev88.c index 191292eebf..940c7dd122 100644 --- a/hw/cris/axis_dev88.c +++ b/hw/cris/axis_dev88.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "hw/sysbus.h" #include "net/net.h" diff --git a/hw/cris/boot.c b/hw/cris/boot.c index 95cba2151b..602f538ef6 100644 --- a/hw/cris/boot.c +++ b/hw/cris/boot.c @@ -23,7 +23,6 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "cpu.h" #include "hw/hw.h" #include "hw/loader.h" diff --git a/hw/display/ads7846.c b/hw/display/ads7846.c index 166edade7d..1a97e97638 100644 --- a/hw/display/ads7846.c +++ b/hw/display/ads7846.c @@ -12,6 +12,7 @@ #include "qemu/osdep.h" #include "hw/ssi/ssi.h" +#include "qemu/module.h" #include "ui/console.h" typedef struct { diff --git a/hw/display/ati.c b/hw/display/ati.c index 75716dd944..76595d9511 100644 --- a/hw/display/ati.c +++ b/hw/display/ati.c @@ -21,6 +21,7 @@ #include "ati_regs.h" #include "vga_regs.h" #include "qemu/log.h" +#include "qemu/module.h" #include "qemu/error-report.h" #include "qapi/error.h" #include "hw/hw.h" diff --git a/hw/display/bcm2835_fb.c b/hw/display/bcm2835_fb.c index 599863e4e1..2311ec75b8 100644 --- a/hw/display/bcm2835_fb.c +++ b/hw/display/bcm2835_fb.c @@ -30,6 +30,7 @@ #include "ui/pixel_ops.h" #include "hw/misc/bcm2835_mbox_defs.h" #include "qemu/log.h" +#include "qemu/module.h" #define DEFAULT_VCRAM_SIZE 0x4000000 #define BCM2835_FB_OFFSET 0x00100000 diff --git a/hw/display/blizzard.c b/hw/display/blizzard.c index 471bd0ed99..359e399c2a 100644 --- a/hw/display/blizzard.c +++ b/hw/display/blizzard.c @@ -19,7 +19,6 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "ui/console.h" #include "hw/display/blizzard.h" #include "ui/pixel_ops.h" diff --git a/hw/display/bochs-display.c b/hw/display/bochs-display.c index 3d439eb240..0a2a3e27c4 100644 --- a/hw/display/bochs-display.c +++ b/hw/display/bochs-display.c @@ -4,7 +4,9 @@ * 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 "qemu/module.h" #include "qemu/units.h" #include "hw/hw.h" #include "hw/pci/pci.h" diff --git a/hw/display/cg3.c b/hw/display/cg3.c index e50d97e48c..a7340dc1c2 100644 --- a/hw/display/cg3.c +++ b/hw/display/cg3.c @@ -24,13 +24,14 @@ */ #include "qemu/osdep.h" -#include "qapi/error.h" #include "qemu-common.h" +#include "qapi/error.h" #include "qemu/error-report.h" #include "ui/console.h" #include "hw/sysbus.h" #include "hw/loader.h" #include "qemu/log.h" +#include "qemu/module.h" /* Change to 1 to enable debugging */ #define DEBUG_CG3 0 diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c index 76c052c702..2e4911a1e3 100644 --- a/hw/display/cirrus_vga.c +++ b/hw/display/cirrus_vga.c @@ -31,7 +31,9 @@ * * https://pdos.csail.mit.edu/6.828/2005/readings/hardware/vgadoc */ + #include "qemu/osdep.h" +#include "qemu/module.h" #include "qemu/units.h" #include "qapi/error.h" #include "trace.h" diff --git a/hw/display/cirrus_vga_isa.c b/hw/display/cirrus_vga_isa.c index fa10b74230..69cdb9e066 100644 --- a/hw/display/cirrus_vga_isa.c +++ b/hw/display/cirrus_vga_isa.c @@ -25,6 +25,7 @@ #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" diff --git a/hw/display/dpcd.c b/hw/display/dpcd.c index 943002bee5..88cde54821 100644 --- a/hw/display/dpcd.c +++ b/hw/display/dpcd.c @@ -28,6 +28,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" +#include "qemu/module.h" #include "hw/misc/auxbus.h" #include "hw/display/dpcd.h" diff --git a/hw/display/edid-generate.c b/hw/display/edid-generate.c index 77d9127344..75c945a948 100644 --- a/hw/display/edid-generate.c +++ b/hw/display/edid-generate.c @@ -5,7 +5,6 @@ * See the COPYING file in the top-level directory. */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "qemu/bswap.h" #include "hw/display/edid.h" diff --git a/hw/display/edid-region.c b/hw/display/edid-region.c index 9a15734d3a..d0d31bad3d 100644 --- a/hw/display/edid-region.c +++ b/hw/display/edid-region.c @@ -1,5 +1,4 @@ #include "qemu/osdep.h" -#include "qemu-common.h" #include "hw/display/edid.h" static uint64_t edid_region_read(void *ptr, hwaddr addr, unsigned size) diff --git a/hw/display/exynos4210_fimd.c b/hw/display/exynos4210_fimd.c index 083b3172da..61f7408b1c 100644 --- a/hw/display/exynos4210_fimd.c +++ b/hw/display/exynos4210_fimd.c @@ -23,11 +23,11 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "hw/sysbus.h" #include "ui/console.h" #include "ui/pixel_ops.h" #include "qemu/bswap.h" +#include "qemu/module.h" /* Debug messages configuration */ #define EXYNOS4210_FIMD_DEBUG 0 diff --git a/hw/display/g364fb.c b/hw/display/g364fb.c index 3407adf98d..1774b4452e 100644 --- a/hw/display/g364fb.c +++ b/hw/display/g364fb.c @@ -21,6 +21,7 @@ #include "qemu/units.h" #include "hw/hw.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "ui/console.h" #include "ui/pixel_ops.h" #include "trace.h" diff --git a/hw/display/i2c-ddc.c b/hw/display/i2c-ddc.c index 9fe5403a92..041fc4f408 100644 --- a/hw/display/i2c-ddc.c +++ b/hw/display/i2c-ddc.c @@ -17,8 +17,8 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "qemu/log.h" +#include "qemu/module.h" #include "hw/i2c/i2c.h" #include "hw/display/i2c-ddc.h" diff --git a/hw/display/jazz_led.c b/hw/display/jazz_led.c index eb7933d2a3..783189ebcd 100644 --- a/hw/display/jazz_led.c +++ b/hw/display/jazz_led.c @@ -23,7 +23,7 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" +#include "qemu/module.h" #include "ui/console.h" #include "ui/pixel_ops.h" #include "trace.h" diff --git a/hw/display/milkymist-tmu2.c b/hw/display/milkymist-tmu2.c index b33fc234e9..e1ed018b8f 100644 --- a/hw/display/milkymist-tmu2.c +++ b/hw/display/milkymist-tmu2.c @@ -30,6 +30,7 @@ #include "trace.h" #include "qapi/error.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "qapi/error.h" #include "hw/display/milkymist_tmu2.h" diff --git a/hw/display/milkymist-vgafb.c b/hw/display/milkymist-vgafb.c index 177fdac7d8..dce1dd7ad6 100644 --- a/hw/display/milkymist-vgafb.c +++ b/hw/display/milkymist-vgafb.c @@ -30,6 +30,7 @@ #include "framebuffer.h" #include "ui/pixel_ops.h" #include "qemu/error-report.h" +#include "qemu/module.h" #define BITS 8 #include "milkymist-vgafb_template.h" diff --git a/hw/display/pl110.c b/hw/display/pl110.c index cf68457fd1..2bdfc3cc49 100644 --- a/hw/display/pl110.c +++ b/hw/display/pl110.c @@ -14,6 +14,7 @@ #include "ui/pixel_ops.h" #include "qemu/timer.h" #include "qemu/log.h" +#include "qemu/module.h" #define PL110_CR_EN 0x001 #define PL110_CR_BGR 0x100 diff --git a/hw/display/qxl.c b/hw/display/qxl.c index 3880a7410b..98c7410032 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -23,10 +23,10 @@ #include <zlib.h> #include "qapi/error.h" -#include "qemu-common.h" #include "qemu/timer.h" #include "qemu/queue.h" #include "qemu/atomic.h" +#include "qemu/module.h" #include "sysemu/sysemu.h" #include "migration/blocker.h" #include "trace.h" diff --git a/hw/display/qxl.h b/hw/display/qxl.h index 6f9d1f21fa..4adfdb1e5d 100644 --- a/hw/display/qxl.h +++ b/hw/display/qxl.h @@ -1,7 +1,6 @@ #ifndef HW_QXL_H #define HW_QXL_H -#include "qemu-common.h" #include "hw/hw.h" #include "hw/pci/pci.h" diff --git a/hw/display/ramfb-standalone.c b/hw/display/ramfb-standalone.c index 6441449e7b..56215ef88c 100644 --- a/hw/display/ramfb-standalone.c +++ b/hw/display/ramfb-standalone.c @@ -1,5 +1,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/module.h" #include "hw/loader.h" #include "hw/isa/isa.h" #include "hw/display/ramfb.h" diff --git a/hw/display/sii9022.c b/hw/display/sii9022.c index 9c36e4c17e..0bebb85a58 100644 --- a/hw/display/sii9022.c +++ b/hw/display/sii9022.c @@ -14,7 +14,7 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" +#include "qemu/module.h" #include "hw/i2c/i2c.h" #include "hw/display/i2c-ddc.h" #include "trace.h" diff --git a/hw/display/sm501.c b/hw/display/sm501.c index 1e2709b2d0..5918f59b2b 100644 --- a/hw/display/sm501.c +++ b/hw/display/sm501.c @@ -27,7 +27,7 @@ #include "qemu/units.h" #include "qapi/error.h" #include "qemu/log.h" -#include "qemu-common.h" +#include "qemu/module.h" #include "cpu.h" #include "hw/hw.h" #include "hw/char/serial.h" diff --git a/hw/display/ssd0303.c b/hw/display/ssd0303.c index 8edf34986c..f2a60c44c9 100644 --- a/hw/display/ssd0303.c +++ b/hw/display/ssd0303.c @@ -10,8 +10,10 @@ /* The controller can support a variety of different displays, but we only implement one. Most of the commends relating to brightness and geometry setup are ignored. */ + #include "qemu/osdep.h" #include "hw/i2c/i2c.h" +#include "qemu/module.h" #include "ui/console.h" //#define DEBUG_SSD0303 1 diff --git a/hw/display/ssd0323.c b/hw/display/ssd0323.c index e182893157..ac373f1e78 100644 --- a/hw/display/ssd0323.c +++ b/hw/display/ssd0323.c @@ -10,8 +10,10 @@ /* The controller can support a variety of different displays, but we only implement one. Most of the commends relating to brightness and geometry setup are ignored. */ + #include "qemu/osdep.h" #include "hw/ssi/ssi.h" +#include "qemu/module.h" #include "ui/console.h" //#define DEBUG_SSD0323 1 diff --git a/hw/display/tcx.c b/hw/display/tcx.c index 66f2459226..cdabcbc746 100644 --- a/hw/display/tcx.c +++ b/hw/display/tcx.c @@ -23,13 +23,14 @@ */ #include "qemu/osdep.h" -#include "qapi/error.h" #include "qemu-common.h" +#include "qapi/error.h" #include "ui/console.h" #include "ui/pixel_ops.h" #include "hw/loader.h" #include "hw/sysbus.h" #include "qemu/error-report.h" +#include "qemu/module.h" #define TCX_ROM_FILE "QEMU,tcx.bin" #define FCODE_MAX_ROM_SIZE 0x10000 diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c index fa44242e0d..945952a9b0 100644 --- a/hw/display/vga-isa.c +++ b/hw/display/vga-isa.c @@ -23,11 +23,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 "hw/isa/isa.h" #include "vga_int.h" #include "ui/pixel_ops.h" +#include "qemu/module.h" #include "qemu/timer.h" #include "hw/loader.h" diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c index a17c96e703..c66d9ec7ee 100644 --- a/hw/display/vga-pci.c +++ b/hw/display/vga-pci.c @@ -23,11 +23,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 "hw/pci/pci.h" #include "vga_int.h" #include "ui/pixel_ops.h" +#include "qemu/module.h" #include "qemu/timer.h" #include "hw/loader.h" #include "hw/display/edid.h" diff --git a/hw/display/virtio-gpu-3d.c b/hw/display/virtio-gpu-3d.c index b918167aec..96621576c2 100644 --- a/hw/display/virtio-gpu-3d.c +++ b/hw/display/virtio-gpu-3d.c @@ -12,7 +12,6 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "qemu/iov.h" #include "trace.h" #include "hw/virtio/virtio.h" diff --git a/hw/display/virtio-gpu-pci.c b/hw/display/virtio-gpu-pci.c index 206870cd4c..d6f01b4a98 100644 --- a/hw/display/virtio-gpu-pci.c +++ b/hw/display/virtio-gpu-pci.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/module.h" #include "hw/pci/pci.h" #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-bus.h" diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index 4a49da5ecb..2b0f66b1d6 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -13,7 +13,6 @@ #include "qemu/osdep.h" #include "qemu/units.h" -#include "qemu-common.h" #include "qemu/iov.h" #include "ui/console.h" #include "trace.h" @@ -25,6 +24,7 @@ #include "hw/virtio/virtio-bus.h" #include "hw/display/edid.h" #include "qemu/log.h" +#include "qemu/module.h" #include "qapi/error.h" #include "qemu/error-report.h" diff --git a/hw/display/virtio-vga.c b/hw/display/virtio-vga.c index 67e34935c2..416e7fec87 100644 --- a/hw/display/virtio-vga.c +++ b/hw/display/virtio-vga.c @@ -3,6 +3,7 @@ #include "hw/pci/pci.h" #include "hw/virtio/virtio-gpu.h" #include "qapi/error.h" +#include "qemu/module.h" #include "virtio-vga.h" static void virtio_vga_base_invalidate_display(void *opaque) diff --git a/hw/display/virtio-vga.h b/hw/display/virtio-vga.h index c10bf390aa..c41281a010 100644 --- a/hw/display/virtio-vga.h +++ b/hw/display/virtio-vga.h @@ -1,5 +1,5 @@ -#ifndef VIRTIO_VGA_H_ -#define VIRTIO_VGA_H_ +#ifndef VIRTIO_VGA_H +#define VIRTIO_VGA_H #include "hw/virtio/virtio-gpu-pci.h" #include "vga_int.h" @@ -29,4 +29,4 @@ typedef struct VirtIOVGABaseClass { DeviceReset parent_reset; } VirtIOVGABaseClass; -#endif /* VIRTIO_VGA_H_ */ +#endif /* VIRTIO_VGA_H */ diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c index afbf1c5973..249a179bf6 100644 --- a/hw/display/vmware_vga.c +++ b/hw/display/vmware_vga.c @@ -21,7 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" +#include "qemu/module.h" #include "qemu/units.h" #include "qapi/error.h" #include "hw/hw.h" diff --git a/hw/display/xlnx_dp.c b/hw/display/xlnx_dp.c index 11b09bd18c..cfd4c700b7 100644 --- a/hw/display/xlnx_dp.c +++ b/hw/display/xlnx_dp.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/log.h" +#include "qemu/module.h" #include "hw/display/xlnx_dp.h" #ifndef DEBUG_DP diff --git a/hw/dma/bcm2835_dma.c b/hw/dma/bcm2835_dma.c index 5d144a2633..a39e8f4968 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 "qemu/log.h" +#include "qemu/module.h" /* DMA CS Control and Status bits */ #define BCM2708_DMA_ACTIVE (1 << 0) diff --git a/hw/dma/etraxfs_dma.c b/hw/dma/etraxfs_dma.c index d5650eb885..85783eb847 100644 --- a/hw/dma/etraxfs_dma.c +++ b/hw/dma/etraxfs_dma.c @@ -24,7 +24,6 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "exec/address-spaces.h" -#include "qemu-common.h" #include "sysemu/sysemu.h" #include "hw/cris/etraxfs_dma.h" diff --git a/hw/dma/i82374.c b/hw/dma/i82374.c index 892f655a7e..68fad2dd12 100644 --- a/hw/dma/i82374.c +++ b/hw/dma/i82374.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/module.h" #include "hw/isa/isa.h" #include "hw/dma/i8257.h" diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c index 3e1f13a4aa..30a3442437 100644 --- a/hw/dma/i8257.c +++ b/hw/dma/i8257.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 "hw/hw.h" #include "hw/isa/isa.h" #include "hw/dma/i8257.h" #include "qemu/main-loop.h" +#include "qemu/module.h" #include "qemu/log.h" #include "trace.h" diff --git a/hw/dma/omap_dma.c b/hw/dma/omap_dma.c index cbb920f31d..eab83c5c3a 100644 --- a/hw/dma/omap_dma.c +++ b/hw/dma/omap_dma.c @@ -19,7 +19,6 @@ */ #include "qemu/osdep.h" #include "qemu/log.h" -#include "qemu-common.h" #include "qemu/timer.h" #include "hw/arm/omap.h" #include "hw/irq.h" diff --git a/hw/dma/pl080.c b/hw/dma/pl080.c index ef15d3e628..7e5762457b 100644 --- a/hw/dma/pl080.c +++ b/hw/dma/pl080.c @@ -11,6 +11,7 @@ #include "hw/sysbus.h" #include "exec/address-spaces.h" #include "qemu/log.h" +#include "qemu/module.h" #include "hw/dma/pl080.h" #include "qapi/error.h" diff --git a/hw/dma/pl330.c b/hw/dma/pl330.c index d071049233..58df965a46 100644 --- a/hw/dma/pl330.c +++ b/hw/dma/pl330.c @@ -15,11 +15,13 @@ */ #include "qemu/osdep.h" +#include "qemu-common.h" #include "hw/sysbus.h" #include "qapi/error.h" #include "qemu/timer.h" #include "sysemu/dma.h" #include "qemu/log.h" +#include "qemu/module.h" #ifndef PL330_ERR_DEBUG #define PL330_ERR_DEBUG 0 diff --git a/hw/dma/puv3_dma.c b/hw/dma/puv3_dma.c index c89eade029..122f87aff1 100644 --- a/hw/dma/puv3_dma.c +++ b/hw/dma/puv3_dma.c @@ -8,12 +8,14 @@ * published by the Free Software Foundation, or any later version. * See the COPYING file in the top-level directory. */ + #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/sysbus.h" #undef DEBUG_PUV3 #include "hw/unicore32/puv3.h" +#include "qemu/module.h" #define PUV3_DMA_CH_NR (6) #define PUV3_DMA_CH_MASK (0xff) diff --git a/hw/dma/pxa2xx_dma.c b/hw/dma/pxa2xx_dma.c index d498de8ffe..d6fb957417 100644 --- a/hw/dma/pxa2xx_dma.c +++ b/hw/dma/pxa2xx_dma.c @@ -13,6 +13,7 @@ #include "hw/arm/pxa.h" #include "hw/sysbus.h" #include "qapi/error.h" +#include "qemu/module.h" #define PXA255_DMA_NUM_CHANNELS 16 #define PXA27X_DMA_NUM_CHANNELS 32 diff --git a/hw/dma/rc4030.c b/hw/dma/rc4030.c index ccd8612888..6ccafece18 100644 --- a/hw/dma/rc4030.c +++ b/hw/dma/rc4030.c @@ -28,6 +28,7 @@ #include "hw/sysbus.h" #include "qemu/timer.h" #include "qemu/log.h" +#include "qemu/module.h" #include "exec/address-spaces.h" #include "trace.h" diff --git a/hw/dma/soc_dma.c b/hw/dma/soc_dma.c index 58502721fa..c3e41581b6 100644 --- a/hw/dma/soc_dma.c +++ b/hw/dma/soc_dma.c @@ -19,7 +19,6 @@ */ #include "qemu/osdep.h" #include "qemu/error-report.h" -#include "qemu-common.h" #include "qemu/timer.h" #include "hw/arm/soc_dma.h" diff --git a/hw/dma/sparc32_dma.c b/hw/dma/sparc32_dma.c index 7b00a27de6..88765d0c25 100644 --- a/hw/dma/sparc32_dma.c +++ b/hw/dma/sparc32_dma.c @@ -32,6 +32,7 @@ #include "hw/sysbus.h" #include "sysemu/dma.h" #include "qapi/error.h" +#include "qemu/module.h" #include "trace.h" /* diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c index 401a328e27..921be178d9 100644 --- a/hw/dma/xilinx_axidma.c +++ b/hw/dma/xilinx_axidma.c @@ -29,6 +29,7 @@ #include "hw/ptimer.h" #include "qemu/log.h" #include "qemu/main-loop.h" +#include "qemu/module.h" #include "hw/stream.h" diff --git a/hw/dma/xlnx-zdma.c b/hw/dma/xlnx-zdma.c index b6745f5bcf..51e1ead4fa 100644 --- a/hw/dma/xlnx-zdma.c +++ b/hw/dma/xlnx-zdma.c @@ -30,6 +30,7 @@ #include "hw/dma/xlnx-zdma.h" #include "qemu/bitops.h" #include "qemu/log.h" +#include "qemu/module.h" #include "qapi/error.h" #ifndef XLNX_ZDMA_ERR_DEBUG diff --git a/hw/dma/xlnx-zynq-devcfg.c b/hw/dma/xlnx-zynq-devcfg.c index 12bb2e3716..7a03ce1b02 100644 --- a/hw/dma/xlnx-zynq-devcfg.c +++ b/hw/dma/xlnx-zynq-devcfg.c @@ -30,6 +30,7 @@ #include "sysemu/sysemu.h" #include "sysemu/dma.h" #include "qemu/log.h" +#include "qemu/module.h" #define FREQ_HZ 900000000 diff --git a/hw/dma/xlnx_dpdma.c b/hw/dma/xlnx_dpdma.c index 077c7da9cc..e834f81e17 100644 --- a/hw/dma/xlnx_dpdma.c +++ b/hw/dma/xlnx_dpdma.c @@ -23,7 +23,9 @@ */ #include "qemu/osdep.h" +#include "qemu-common.h" #include "qemu/log.h" +#include "qemu/module.h" #include "hw/dma/xlnx_dpdma.h" #ifndef DEBUG_DPDMA diff --git a/hw/gpio/bcm2835_gpio.c b/hw/gpio/bcm2835_gpio.c index acc2e3cf9e..ba8dd6c393 100644 --- a/hw/gpio/bcm2835_gpio.c +++ b/hw/gpio/bcm2835_gpio.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" +#include "qemu/module.h" #include "qemu/timer.h" #include "qapi/error.h" #include "hw/sysbus.h" diff --git a/hw/gpio/gpio_key.c b/hw/gpio/gpio_key.c index b34aa49dfb..7d5510257e 100644 --- a/hw/gpio/gpio_key.c +++ b/hw/gpio/gpio_key.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "qemu/module.h" #include "qemu/timer.h" #define TYPE_GPIOKEY "gpio-key" diff --git a/hw/gpio/imx_gpio.c b/hw/gpio/imx_gpio.c index c36c394fda..a51af72c1f 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 "qemu/log.h" +#include "qemu/module.h" #ifndef DEBUG_IMX_GPIO #define DEBUG_IMX_GPIO 0 diff --git a/hw/gpio/max7310.c b/hw/gpio/max7310.c index c6f686c3eb..273da622ca 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 "qemu/module.h" #define TYPE_MAX7310 "max7310" #define MAX7310(obj) OBJECT_CHECK(MAX7310State, (obj), TYPE_MAX7310) diff --git a/hw/gpio/mpc8xxx.c b/hw/gpio/mpc8xxx.c index e12edb4933..6ff56dc3f2 100644 --- a/hw/gpio/mpc8xxx.c +++ b/hw/gpio/mpc8xxx.c @@ -21,6 +21,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "qemu/module.h" #define TYPE_MPC8XXX_GPIO "mpc8xxx_gpio" #define MPC8XXX_GPIO(obj) OBJECT_CHECK(MPC8XXXGPIOState, (obj), TYPE_MPC8XXX_GPIO) diff --git a/hw/gpio/nrf51_gpio.c b/hw/gpio/nrf51_gpio.c index 87a2f2a0dc..dd6c16a841 100644 --- a/hw/gpio/nrf51_gpio.c +++ b/hw/gpio/nrf51_gpio.c @@ -12,6 +12,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" +#include "qemu/module.h" #include "hw/gpio/nrf51_gpio.h" #include "trace.h" diff --git a/hw/gpio/omap_gpio.c b/hw/gpio/omap_gpio.c index 08472193b5..e2785c5dc7 100644 --- a/hw/gpio/omap_gpio.c +++ b/hw/gpio/omap_gpio.c @@ -23,6 +23,7 @@ #include "hw/arm/omap.h" #include "hw/sysbus.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "qapi/error.h" struct omap_gpio_s { diff --git a/hw/gpio/pl061.c b/hw/gpio/pl061.c index 4ae2aa1566..02c01fd521 100644 --- a/hw/gpio/pl061.c +++ b/hw/gpio/pl061.c @@ -11,6 +11,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "qemu/log.h" +#include "qemu/module.h" //#define DEBUG_PL061 1 diff --git a/hw/gpio/puv3_gpio.c b/hw/gpio/puv3_gpio.c index 33241b8564..54d30cada2 100644 --- a/hw/gpio/puv3_gpio.c +++ b/hw/gpio/puv3_gpio.c @@ -8,12 +8,14 @@ * published by the Free Software Foundation, or any later version. * See the COPYING file in the top-level directory. */ + #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/sysbus.h" #undef DEBUG_PUV3 #include "hw/unicore32/puv3.h" +#include "qemu/module.h" #define TYPE_PUV3_GPIO "puv3_gpio" #define PUV3_GPIO(obj) OBJECT_CHECK(PUV3GPIOState, (obj), TYPE_PUV3_GPIO) diff --git a/hw/gpio/zaurus.c b/hw/gpio/zaurus.c index 15865e1081..f2f1f67266 100644 --- a/hw/gpio/zaurus.c +++ b/hw/gpio/zaurus.c @@ -15,10 +15,12 @@ * 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 "hw/hw.h" #include "hw/arm/sharpsl.h" #include "hw/sysbus.h" +#include "qemu/module.h" #undef REG_FMT #define REG_FMT "0x%02lx" diff --git a/hw/hppa/dino.c b/hw/hppa/dino.c index 4d1380c51f..e94614abbd 100644 --- a/hw/hppa/dino.c +++ b/hw/hppa/dino.c @@ -11,6 +11,7 @@ */ #include "qemu/osdep.h" +#include "qemu/module.h" #include "qemu/units.h" #include "qapi/error.h" #include "cpu.h" diff --git a/hw/hppa/hppa_hardware.h b/hw/hppa/hppa_hardware.h index af2f5ee2bd..507f91e05d 100644 --- a/hw/hppa/hppa_hardware.h +++ b/hw/hppa/hppa_hardware.h @@ -1,5 +1,8 @@ /* HPPA cores and system support chips. */ +#ifndef HW_HPPA_HPPA_HARDWARE_H +#define HW_HPPA_HPPA_HARDWARE_H + #define FIRMWARE_START 0xf0000000 #define FIRMWARE_END 0xf0800000 @@ -38,3 +41,5 @@ #define HPPA_MAX_CPUS 8 /* max. number of SMP CPUs */ #define CPU_CLOCK_MHZ 250 /* emulate a 250 MHz CPU */ + +#endif diff --git a/hw/hppa/pci.c b/hw/hppa/pci.c index 766420254e..b6606d9719 100644 --- a/hw/hppa/pci.c +++ b/hw/hppa/pci.c @@ -4,7 +4,6 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "hppa_sys.h" #include "qemu/log.h" #include "sysemu/sysemu.h" diff --git a/hw/hyperv/hyperv.c b/hw/hyperv/hyperv.c index 8758635227..6ebf31c310 100644 --- a/hw/hyperv/hyperv.c +++ b/hw/hyperv/hyperv.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "qemu/main-loop.h" +#include "qemu/module.h" #include "qapi/error.h" #include "exec/address-spaces.h" #include "sysemu/kvm.h" diff --git a/hw/hyperv/hyperv_testdev.c b/hw/hyperv/hyperv_testdev.c index 4880333cf5..0d343a8bc0 100644 --- a/hw/hyperv/hyperv_testdev.c +++ b/hw/hyperv/hyperv_testdev.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "qemu/main-loop.h" +#include "qemu/module.h" #include "qemu/queue.h" #include "hw/qdev.h" #include "hw/isa/isa.h" diff --git a/hw/i2c/aspeed_i2c.c b/hw/i2c/aspeed_i2c.c index a085510cfd..219ad3806f 100644 --- a/hw/i2c/aspeed_i2c.c +++ b/hw/i2c/aspeed_i2c.c @@ -21,6 +21,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "qemu/log.h" +#include "qemu/module.h" #include "hw/i2c/aspeed_i2c.h" /* I2C Global Register */ diff --git a/hw/i2c/bitbang_i2c.c b/hw/i2c/bitbang_i2c.c index 8be88ee265..5dfc72d9d7 100644 --- a/hw/i2c/bitbang_i2c.c +++ b/hw/i2c/bitbang_i2c.c @@ -9,10 +9,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 "hw/hw.h" #include "bitbang_i2c.h" #include "hw/sysbus.h" +#include "qemu/module.h" //#define DEBUG_BITBANG_I2C diff --git a/hw/i2c/core.c b/hw/i2c/core.c index 15237ad073..20f36f1d55 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 "qemu/module.h" #include "trace.h" #define I2C_BROADCAST 0x00 diff --git a/hw/i2c/exynos4210_i2c.c b/hw/i2c/exynos4210_i2c.c index d154b05739..70a97a3e2d 100644 --- a/hw/i2c/exynos4210_i2c.c +++ b/hw/i2c/exynos4210_i2c.c @@ -21,6 +21,7 @@ */ #include "qemu/osdep.h" +#include "qemu/module.h" #include "qemu/timer.h" #include "hw/sysbus.h" #include "hw/i2c/i2c.h" diff --git a/hw/i2c/imx_i2c.c b/hw/i2c/imx_i2c.c index 6da5224e2e..ce7a94c282 100644 --- a/hw/i2c/imx_i2c.c +++ b/hw/i2c/imx_i2c.c @@ -22,6 +22,7 @@ #include "hw/i2c/imx_i2c.h" #include "hw/i2c/i2c.h" #include "qemu/log.h" +#include "qemu/module.h" #ifndef DEBUG_IMX_I2C #define DEBUG_IMX_I2C 0 diff --git a/hw/i2c/microbit_i2c.c b/hw/i2c/microbit_i2c.c index 793f1b0f8b..214be07c5a 100644 --- a/hw/i2c/microbit_i2c.c +++ b/hw/i2c/microbit_i2c.c @@ -19,6 +19,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" +#include "qemu/module.h" #include "hw/i2c/microbit_i2c.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 693ca7ef6b..e9a1127050 100644 --- a/hw/i2c/mpc_i2c.c +++ b/hw/i2c/mpc_i2c.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "hw/i2c/i2c.h" #include "qemu/log.h" +#include "qemu/module.h" #include "hw/sysbus.h" /* #define DEBUG_I2C */ diff --git a/hw/i2c/omap_i2c.c b/hw/i2c/omap_i2c.c index d02e734ea8..d7ebeae8e2 100644 --- a/hw/i2c/omap_i2c.c +++ b/hw/i2c/omap_i2c.c @@ -16,8 +16,10 @@ * 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 "qemu/log.h" +#include "qemu/module.h" #include "hw/hw.h" #include "hw/i2c/i2c.h" #include "hw/arm/omap.h" diff --git a/hw/i2c/ppc4xx_i2c.c b/hw/i2c/ppc4xx_i2c.c index d6dfafab31..d606d3dbeb 100644 --- a/hw/i2c/ppc4xx_i2c.c +++ b/hw/i2c/ppc4xx_i2c.c @@ -25,8 +25,8 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "qemu/log.h" +#include "qemu/module.h" #include "cpu.h" #include "hw/hw.h" #include "hw/i2c/ppc4xx_i2c.h" diff --git a/hw/i2c/smbus_ich9.c b/hw/i2c/smbus_ich9.c index 251d3d142f..51a03046a6 100644 --- a/hw/i2c/smbus_ich9.c +++ b/hw/i2c/smbus_ich9.c @@ -19,10 +19,12 @@ * 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 "hw/hw.h" #include "hw/i2c/pm_smbus.h" #include "hw/pci/pci.h" +#include "qemu/module.h" #include "sysemu/sysemu.h" #include "hw/i386/ich9.h" diff --git a/hw/i2c/smbus_slave.c b/hw/i2c/smbus_slave.c index 9a2d314d1a..a9908c1a9b 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 "qemu/module.h" //#define DEBUG_SMBUS 1 diff --git a/hw/i2c/versatile_i2c.c b/hw/i2c/versatile_i2c.c index da9f298ee5..e07be9890c 100644 --- a/hw/i2c/versatile_i2c.c +++ b/hw/i2c/versatile_i2c.c @@ -25,6 +25,7 @@ #include "hw/sysbus.h" #include "bitbang_i2c.h" #include "qemu/log.h" +#include "qemu/module.h" #define TYPE_VERSATILE_I2C "versatile_i2c" #define VERSATILE_I2C(obj) \ diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 85dc1640bc..45c369c923 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -24,7 +24,6 @@ #include "qapi/error.h" #include "qapi/qmp/qnum.h" #include "acpi-build.h" -#include "qemu-common.h" #include "qemu/bitmap.h" #include "qemu/error-report.h" #include "hw/pci/pci.h" diff --git a/hw/i386/kvm/apic.c b/hw/i386/kvm/apic.c index 1df6d26816..91fb622d63 100644 --- a/hw/i386/kvm/apic.c +++ b/hw/i386/kvm/apic.c @@ -9,8 +9,9 @@ * This work is licensed under the terms of the GNU GPL version 2. * See the COPYING file in the top-level directory. */ + #include "qemu/osdep.h" -#include "qemu-common.h" +#include "qemu/module.h" #include "cpu.h" #include "hw/i386/apic_internal.h" #include "hw/pci/msi.h" diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c index 25ea783bec..a5cda15b85 100644 --- a/hw/i386/kvm/clock.c +++ b/hw/i386/kvm/clock.c @@ -14,9 +14,9 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "cpu.h" #include "qemu/host-utils.h" +#include "qemu/module.h" #include "sysemu/sysemu.h" #include "sysemu/kvm.h" #include "sysemu/hw_accel.h" diff --git a/hw/i386/kvm/i8254.c b/hw/i386/kvm/i8254.c index d4d4a859f0..c29956ab77 100644 --- a/hw/i386/kvm/i8254.c +++ b/hw/i386/kvm/i8254.c @@ -26,6 +26,7 @@ #include "qemu/osdep.h" #include <linux/kvm.h> #include "qapi/error.h" +#include "qemu/module.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" #include "hw/timer/i8254.h" diff --git a/hw/i386/kvm/i8259.c b/hw/i386/kvm/i8259.c index 83b6bfec77..bfdeab29be 100644 --- a/hw/i386/kvm/i8259.c +++ b/hw/i386/kvm/i8259.c @@ -9,8 +9,10 @@ * This work is licensed under the terms of the GNU GPL version 2. * See the COPYING file in the top-level directory. */ + #include "qemu/osdep.h" #include "hw/isa/i8259_internal.h" +#include "qemu/module.h" #include "hw/i386/apic_internal.h" #include "sysemu/kvm.h" diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c index fe5b12ef6e..ca8df462b6 100644 --- a/hw/i386/kvmvapic.c +++ b/hw/i386/kvmvapic.c @@ -8,8 +8,9 @@ * (at your option) any later version. See the COPYING file in the * top-level directory. */ + #include "qemu/osdep.h" -#include "qemu-common.h" +#include "qemu/module.h" #include "cpu.h" #include "sysemu/sysemu.h" #include "sysemu/cpus.h" diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 1b08b56362..2c5446b095 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -50,6 +50,7 @@ #include "hw/pci/msi.h" #include "hw/sysbus.h" #include "sysemu/sysemu.h" +#include "sysemu/tcg.h" #include "sysemu/numa.h" #include "sysemu/kvm.h" #include "sysemu/qtest.h" diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c index 751fcafa12..de43943af8 100644 --- a/hw/i386/pc_sysfw.c +++ b/hw/i386/pc_sysfw.c @@ -24,6 +24,7 @@ */ #include "qemu/osdep.h" +#include "qemu-common.h" #include "qapi/error.h" #include "sysemu/block-backend.h" #include "qemu/error-report.h" diff --git a/hw/i386/xen/xen_apic.c b/hw/i386/xen/xen_apic.c index 55769eba7e..7c7a60b166 100644 --- a/hw/i386/xen/xen_apic.c +++ b/hw/i386/xen/xen_apic.c @@ -9,10 +9,12 @@ * 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/i386/apic_internal.h" #include "hw/pci/msi.h" #include "hw/xen/xen.h" +#include "qemu/module.h" static uint64_t xen_apic_mem_read(void *opaque, hwaddr addr, unsigned size) diff --git a/hw/i386/xen/xen_platform.c b/hw/i386/xen/xen_platform.c index 16afb54fee..7a972e46cf 100644 --- a/hw/i386/xen/xen_platform.c +++ b/hw/i386/xen/xen_platform.c @@ -35,6 +35,7 @@ #include "exec/address-spaces.h" #include "sysemu/block-backend.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include <xenguest.h> diff --git a/hw/i386/xen/xen_pvdevice.c b/hw/i386/xen/xen_pvdevice.c index a146f1883a..23748f36a2 100644 --- a/hw/i386/xen/xen_pvdevice.c +++ b/hw/i386/xen/xen_pvdevice.c @@ -31,6 +31,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/module.h" #include "hw/hw.h" #include "hw/pci/pci.h" #include "trace.h" diff --git a/hw/ide/ahci-allwinner.c b/hw/ide/ahci-allwinner.c index f98e6cb3d4..de08d87790 100644 --- a/hw/ide/ahci-allwinner.c +++ b/hw/ide/ahci-allwinner.c @@ -18,6 +18,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "sysemu/dma.h" #include "hw/ide/internal.h" #include "ahci_internal.h" diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index d700ca973b..00ba422a48 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/module.h" #include "sysemu/block-backend.h" #include "sysemu/dma.h" #include "hw/ide/internal.h" diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index 5a5679134a..ed23aabf21 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.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/hw.h" #include "hw/pci/pci.h" +#include "qemu/module.h" #include "hw/isa/isa.h" #include "sysemu/sysemu.h" #include "sysemu/dma.h" diff --git a/hw/ide/ich.c b/hw/ide/ich.c index 51c935a0da..c1ba927574 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 "qemu/module.h" #include "hw/isa/isa.h" #include "sysemu/dma.h" #include "hw/ide/pci.h" diff --git a/hw/ide/isa.c b/hw/ide/isa.c index 028bd61774..4b5784e3fd 100644 --- a/hw/ide/isa.c +++ b/hw/ide/isa.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/hw.h" #include "hw/isa/isa.h" +#include "qemu/module.h" #include "sysemu/dma.h" #include "hw/ide/internal.h" diff --git a/hw/ide/macio.c b/hw/ide/macio.c index bab8c45a43..54571fed12 100644 --- a/hw/ide/macio.c +++ b/hw/ide/macio.c @@ -22,10 +22,12 @@ * 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/ppc/mac.h" #include "hw/ppc/mac_dbdma.h" +#include "qemu/module.h" #include "hw/misc/macio/macio.h" #include "sysemu/block-backend.h" #include "sysemu/dma.h" diff --git a/hw/ide/microdrive.c b/hw/ide/microdrive.c index 34bb98dce8..92ee6e0af8 100644 --- a/hw/ide/microdrive.c +++ b/hw/ide/microdrive.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/hw.h" #include "hw/pcmcia.h" +#include "qemu/module.h" #include "sysemu/dma.h" #include "hw/ide/internal.h" diff --git a/hw/ide/mmio.c b/hw/ide/mmio.c index 42fcf139ee..70a58016d0 100644 --- a/hw/ide/mmio.c +++ b/hw/ide/mmio.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/hw.h" #include "hw/sysbus.h" +#include "qemu/module.h" #include "sysemu/dma.h" #include "hw/ide/internal.h" diff --git a/hw/ide/pci.c b/hw/ide/pci.c index 942613a9a9..4c6fb9a68e 100644 --- a/hw/ide/pci.c +++ b/hw/ide/pci.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 "hw/pci/pci.h" #include "sysemu/dma.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "hw/ide/pci.h" #include "trace.h" diff --git a/hw/ide/piix.c b/hw/ide/piix.c index 885c16e938..b97e555072 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 "qemu/module.h" #include "sysemu/block-backend.h" #include "sysemu/sysemu.h" #include "sysemu/blockdev.h" diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c index 360cd20bd8..9d8502785d 100644 --- a/hw/ide/qdev.c +++ b/hw/ide/qdev.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 <http://www.gnu.org/licenses/>. */ + #include "qemu/osdep.h" #include "hw/hw.h" #include "sysemu/dma.h" #include "qapi/error.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "hw/ide/internal.h" #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" diff --git a/hw/ide/sii3112.c b/hw/ide/sii3112.c index 59db09cfe4..d7590d4ba4 100644 --- a/hw/ide/sii3112.c +++ b/hw/ide/sii3112.c @@ -14,6 +14,7 @@ #include "qemu/osdep.h" #include "hw/ide/pci.h" +#include "qemu/module.h" #include "trace.h" #define TYPE_SII3112_PCI "sii3112" diff --git a/hw/ide/via.c b/hw/ide/via.c index ac9385228c..c3bda909f9 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -23,9 +23,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/pci/pci.h" +#include "qemu/module.h" #include "sysemu/sysemu.h" #include "sysemu/dma.h" diff --git a/hw/input/adb-internal.h b/hw/input/adb-internal.h index 2a779b8a0a..8d92165c46 100644 --- a/hw/input/adb-internal.h +++ b/hw/input/adb-internal.h @@ -22,6 +22,9 @@ * THE SOFTWARE. */ +#ifndef HW_INPUT_ADB_INTERNAL_H +#define HW_INPUT_ADB_INTERNAL_H + /* ADB commands */ #define ADB_BUSRESET 0x00 @@ -47,3 +50,4 @@ extern const VMStateDescription vmstate_adb_device; +#endif diff --git a/hw/input/adb-kbd.c b/hw/input/adb-kbd.c index b026e9d49f..da361f56df 100644 --- a/hw/input/adb-kbd.c +++ b/hw/input/adb-kbd.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/input/adb.h" +#include "qemu/module.h" #include "ui/input.h" #include "hw/input/adb-keys.h" #include "sysemu/sysemu.h" diff --git a/hw/input/adb-mouse.c b/hw/input/adb-mouse.c index 83833b0035..52526fddb7 100644 --- a/hw/input/adb-mouse.c +++ b/hw/input/adb-mouse.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 "ui/console.h" #include "hw/input/adb.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 bbb40aeef1..1446f32521 100644 --- a/hw/input/adb.c +++ b/hw/input/adb.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/input/adb.h" +#include "qemu/module.h" #include "adb-internal.h" /* error codes */ diff --git a/hw/input/lm832x.c b/hw/input/lm832x.c index 1fc7b86f19..5203da2bcf 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 "qemu/module.h" #include "qemu/timer.h" #include "ui/console.h" diff --git a/hw/input/milkymist-softusb.c b/hw/input/milkymist-softusb.c index 8766a17d9e..f779cd4370 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 "qemu/error-report.h" +#include "qemu/module.h" enum { R_CTRL = 0, diff --git a/hw/input/pl050.c b/hw/input/pl050.c index 15bffbfcad..b79bf1647d 100644 --- a/hw/input/pl050.c +++ b/hw/input/pl050.c @@ -11,6 +11,7 @@ #include "hw/sysbus.h" #include "hw/input/ps2.h" #include "qemu/log.h" +#include "qemu/module.h" #define TYPE_PL050 "pl050" #define PL050(obj) OBJECT_CHECK(PL050State, (obj), TYPE_PL050) diff --git a/hw/input/virtio-input-hid.c b/hw/input/virtio-input-hid.c index bc5f9a2ed2..f15a063fac 100644 --- a/hw/input/virtio-input-hid.c +++ b/hw/input/virtio-input-hid.c @@ -6,6 +6,7 @@ #include "qemu/osdep.h" #include "qemu/iov.h" +#include "qemu/module.h" #include "hw/qdev.h" #include "hw/virtio/virtio.h" diff --git a/hw/input/virtio-input-host.c b/hw/input/virtio-input-host.c index cb79e80024..a54c31eb09 100644 --- a/hw/input/virtio-input-host.c +++ b/hw/input/virtio-input-host.c @@ -6,7 +6,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" +#include "qemu/module.h" #include "qemu/sockets.h" #include "hw/qdev.h" diff --git a/hw/input/virtio-input.c b/hw/input/virtio-input.c index 0e42f0d02c..9946394cf4 100644 --- a/hw/input/virtio-input.c +++ b/hw/input/virtio-input.c @@ -7,6 +7,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/iov.h" +#include "qemu/module.h" #include "trace.h" #include "hw/qdev.h" diff --git a/hw/intc/allwinner-a10-pic.c b/hw/intc/allwinner-a10-pic.c index 1aa628cbbb..080bdd791f 100644 --- a/hw/intc/allwinner-a10-pic.c +++ b/hw/intc/allwinner-a10-pic.c @@ -20,6 +20,7 @@ #include "sysemu/sysemu.h" #include "hw/intc/allwinner-a10-pic.h" #include "qemu/log.h" +#include "qemu/module.h" static void aw_a10_pic_update(AwA10PICState *s) { diff --git a/hw/intc/apic.c b/hw/intc/apic.c index 6ea619c360..bce89911dc 100644 --- a/hw/intc/apic.c +++ b/hw/intc/apic.c @@ -17,7 +17,6 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/> */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "cpu.h" #include "qemu/thread.h" #include "hw/i386/apic_internal.h" diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c index 78903ea909..e764a2bb03 100644 --- a/hw/intc/apic_common.c +++ b/hw/intc/apic_common.c @@ -17,10 +17,11 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see <http://www.gnu.org/licenses/> */ + #include "qemu/osdep.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "qapi/visitor.h" #include "hw/i386/apic.h" diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c index b3ac2d11fc..77427a4188 100644 --- a/hw/intc/arm_gic.c +++ b/hw/intc/arm_gic.c @@ -24,6 +24,7 @@ #include "qapi/error.h" #include "qom/cpu.h" #include "qemu/log.h" +#include "qemu/module.h" #include "trace.h" #include "sysemu/kvm.h" diff --git a/hw/intc/arm_gic_common.c b/hw/intc/arm_gic_common.c index 57569a4e59..ccc50d00b6 100644 --- a/hw/intc/arm_gic_common.c +++ b/hw/intc/arm_gic_common.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/module.h" #include "gic_internal.h" #include "hw/arm/linux-boot-if.h" diff --git a/hw/intc/arm_gic_kvm.c b/hw/intc/arm_gic_kvm.c index a611e8ee12..b56fda144f 100644 --- a/hw/intc/arm_gic_kvm.c +++ b/hw/intc/arm_gic_kvm.c @@ -21,7 +21,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" +#include "qemu/module.h" #include "cpu.h" #include "hw/sysbus.h" #include "migration/blocker.h" diff --git a/hw/intc/arm_gicv2m.c b/hw/intc/arm_gicv2m.c index 3922fbc1c1..05f299fc7f 100644 --- a/hw/intc/arm_gicv2m.c +++ b/hw/intc/arm_gicv2m.c @@ -31,6 +31,7 @@ #include "hw/pci/msi.h" #include "sysemu/kvm.h" #include "qemu/log.h" +#include "qemu/module.h" #define TYPE_ARM_GICV2M "arm-gicv2m" #define ARM_GICV2M(obj) OBJECT_CHECK(ARMGICv2mState, (obj), TYPE_ARM_GICV2M) diff --git a/hw/intc/arm_gicv3.c b/hw/intc/arm_gicv3.c index 7044133e2d..66eaa97198 100644 --- a/hw/intc/arm_gicv3.c +++ b/hw/intc/arm_gicv3.c @@ -17,6 +17,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/module.h" #include "hw/sysbus.h" #include "hw/intc/arm_gicv3.h" #include "gicv3_internal.h" diff --git a/hw/intc/arm_gicv3_common.c b/hw/intc/arm_gicv3_common.c index 52480c3b4c..5edabb928f 100644 --- a/hw/intc/arm_gicv3_common.c +++ b/hw/intc/arm_gicv3_common.c @@ -23,6 +23,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/module.h" #include "qom/cpu.h" #include "hw/intc/arm_gicv3_common.h" #include "gicv3_internal.h" diff --git a/hw/intc/arm_gicv3_its_common.c b/hw/intc/arm_gicv3_its_common.c index 284c0a7584..efb3d51fb5 100644 --- a/hw/intc/arm_gicv3_its_common.c +++ b/hw/intc/arm_gicv3_its_common.c @@ -22,6 +22,7 @@ #include "hw/pci/msi.h" #include "hw/intc/arm_gicv3_its_common.h" #include "qemu/log.h" +#include "qemu/module.h" static int gicv3_its_pre_save(void *opaque) { diff --git a/hw/intc/arm_gicv3_its_kvm.c b/hw/intc/arm_gicv3_its_kvm.c index 01573abb48..52ac01aba3 100644 --- a/hw/intc/arm_gicv3_its_kvm.c +++ b/hw/intc/arm_gicv3_its_kvm.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/module.h" #include "hw/intc/arm_gicv3_its_common.h" #include "sysemu/sysemu.h" #include "sysemu/kvm.h" diff --git a/hw/intc/arm_gicv3_kvm.c b/hw/intc/arm_gicv3_kvm.c index 1e11200fe2..d9c72f85be 100644 --- a/hw/intc/arm_gicv3_kvm.c +++ b/hw/intc/arm_gicv3_kvm.c @@ -24,6 +24,7 @@ #include "hw/intc/arm_gicv3_common.h" #include "hw/sysbus.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "sysemu/kvm.h" #include "sysemu/sysemu.h" #include "kvm_arm.h" diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c index dc2c206d9a..b8ede30b3c 100644 --- a/hw/intc/armv7m_nvic.c +++ b/hw/intc/armv7m_nvic.c @@ -12,7 +12,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "hw/sysbus.h" #include "qemu/timer.h" @@ -20,6 +19,7 @@ #include "target/arm/cpu.h" #include "exec/exec-all.h" #include "qemu/log.h" +#include "qemu/module.h" #include "trace.h" /* IRQ number counting: diff --git a/hw/intc/aspeed_vic.c b/hw/intc/aspeed_vic.c index 2370e7485f..927638d532 100644 --- a/hw/intc/aspeed_vic.c +++ b/hw/intc/aspeed_vic.c @@ -31,6 +31,7 @@ #include "hw/intc/aspeed_vic.h" #include "qemu/bitops.h" #include "qemu/log.h" +#include "qemu/module.h" #include "trace.h" #define AVIC_NEW_BASE_OFFSET 0x80 diff --git a/hw/intc/bcm2835_ic.c b/hw/intc/bcm2835_ic.c index 00d25306fd..61d37643a1 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 "qemu/log.h" +#include "qemu/module.h" #define GPU_IRQS 64 #define ARM_IRQS 8 diff --git a/hw/intc/bcm2836_control.c b/hw/intc/bcm2836_control.c index 421469f2ef..66417c85e4 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 "qemu/log.h" +#include "qemu/module.h" #define REG_GPU_ROUTE 0x0c #define REG_LOCALTIMERROUTING 0x24 diff --git a/hw/intc/etraxfs_pic.c b/hw/intc/etraxfs_pic.c index 1bfde2f09e..20e1391d64 100644 --- a/hw/intc/etraxfs_pic.c +++ b/hw/intc/etraxfs_pic.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "qemu/module.h" #include "hw/hw.h" //#include "pc.h" //#include "etraxfs.h" diff --git a/hw/intc/exynos4210_combiner.c b/hw/intc/exynos4210_combiner.c index f19a7062be..6fed0e8d16 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 "qemu/module.h" #include "hw/arm/exynos4210.h" diff --git a/hw/intc/exynos4210_gic.c b/hw/intc/exynos4210_gic.c index 69f9c18d73..e37d457fcf 100644 --- a/hw/intc/exynos4210_gic.c +++ b/hw/intc/exynos4210_gic.c @@ -22,7 +22,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" -#include "qemu-common.h" +#include "qemu/module.h" #include "hw/irq.h" #include "hw/arm/exynos4210.h" diff --git a/hw/intc/grlib_irqmp.c b/hw/intc/grlib_irqmp.c index 20accb6c4d..21c77a5ec1 100644 --- a/hw/intc/grlib_irqmp.c +++ b/hw/intc/grlib_irqmp.c @@ -32,6 +32,7 @@ #include "trace.h" #include "qapi/error.h" +#include "qemu/module.h" #define IRQMP_MAX_CPU 16 #define IRQMP_REG_SIZE 256 /* Size of memory mapped registers */ diff --git a/hw/intc/heathrow_pic.c b/hw/intc/heathrow_pic.c index b8b997deca..c282ac4006 100644 --- a/hw/intc/heathrow_pic.c +++ b/hw/intc/heathrow_pic.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/hw.h" #include "hw/ppc/mac.h" +#include "qemu/module.h" #include "hw/intc/heathrow_pic.h" #include "trace.h" diff --git a/hw/intc/imx_avic.c b/hw/intc/imx_avic.c index 813e587a63..83a4101528 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 "qemu/log.h" +#include "qemu/module.h" #ifndef DEBUG_IMX_AVIC #define DEBUG_IMX_AVIC 0 diff --git a/hw/intc/imx_gpcv2.c b/hw/intc/imx_gpcv2.c index 4eb9ce2668..a83333bdea 100644 --- a/hw/intc/imx_gpcv2.c +++ b/hw/intc/imx_gpcv2.c @@ -12,6 +12,7 @@ #include "qemu/osdep.h" #include "hw/intc/imx_gpcv2.h" #include "qemu/log.h" +#include "qemu/module.h" #define GPC_PU_PGC_SW_PUP_REQ 0x0f8 #define GPC_PU_PGC_SW_PDN_REQ 0x104 diff --git a/hw/intc/ioapic_common.c b/hw/intc/ioapic_common.c index 692dc37bb6..fa50382d43 100644 --- a/hw/intc/ioapic_common.c +++ b/hw/intc/ioapic_common.c @@ -21,6 +21,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/module.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 db6c7afc2f..170fa7a1ac 100644 --- a/hw/intc/lm32_pic.c +++ b/hw/intc/lm32_pic.c @@ -21,6 +21,7 @@ #include "hw/hw.h" #include "monitor/monitor.h" +#include "qemu/module.h" #include "hw/sysbus.h" #include "trace.h" #include "hw/lm32/lm32_pic.h" diff --git a/hw/intc/mips_gic.c b/hw/intc/mips_gic.c index 8f509493ea..33ab51c5b8 100644 --- a/hw/intc/mips_gic.c +++ b/hw/intc/mips_gic.c @@ -11,6 +11,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" +#include "qemu/module.h" #include "qapi/error.h" #include "hw/hw.h" #include "hw/sysbus.h" diff --git a/hw/intc/nios2_iic.c b/hw/intc/nios2_iic.c index 016426f964..7329434b91 100644 --- a/hw/intc/nios2_iic.c +++ b/hw/intc/nios2_iic.c @@ -19,7 +19,7 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" +#include "qemu/module.h" #include "qapi/error.h" #include "hw/sysbus.h" diff --git a/hw/intc/omap_intc.c b/hw/intc/omap_intc.c index 6844c1aa83..053e67c66b 100644 --- a/hw/intc/omap_intc.c +++ b/hw/intc/omap_intc.c @@ -17,11 +17,13 @@ * 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 "hw/hw.h" #include "hw/arm/omap.h" #include "hw/sysbus.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "qapi/error.h" /* Interrupt Handlers */ diff --git a/hw/intc/ompic.c b/hw/intc/ompic.c index c0e34d1268..9cb310a5dd 100644 --- a/hw/intc/ompic.c +++ b/hw/intc/ompic.c @@ -8,6 +8,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" +#include "qemu/module.h" #include "qapi/error.h" #include "hw/hw.h" #include "hw/sysbus.h" diff --git a/hw/intc/openpic.c b/hw/intc/openpic.c index 811cee9b26..9b4fc6cf43 100644 --- a/hw/intc/openpic.c +++ b/hw/intc/openpic.c @@ -33,6 +33,7 @@ * Serial interrupts, as implemented in Raven chipset are not supported yet. * */ + #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/ppc/mac.h" @@ -45,6 +46,7 @@ #include "qemu/bitops.h" #include "qapi/qmp/qerror.h" #include "qemu/log.h" +#include "qemu/module.h" #include "qemu/timer.h" #include "qemu/error-report.h" diff --git a/hw/intc/openpic_kvm.c b/hw/intc/openpic_kvm.c index 928bc04a4e..49fc6fa0cf 100644 --- a/hw/intc/openpic_kvm.c +++ b/hw/intc/openpic_kvm.c @@ -24,7 +24,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include <sys/ioctl.h> #include "exec/address-spaces.h" @@ -35,6 +34,7 @@ #include "hw/sysbus.h" #include "sysemu/kvm.h" #include "qemu/log.h" +#include "qemu/module.h" #define GCR_RESET 0x80000000 diff --git a/hw/intc/pl190.c b/hw/intc/pl190.c index 55ea15de76..b4f31efc45 100644 --- a/hw/intc/pl190.c +++ b/hw/intc/pl190.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "qemu/log.h" +#include "qemu/module.h" /* The number of virtual priority levels. 16 user vectors plus the unvectored IRQ. Chained interrupts would require an additional level diff --git a/hw/intc/pnv_xive.c b/hw/intc/pnv_xive.c index bb0877cbdf..a55c2bbc88 100644 --- a/hw/intc/pnv_xive.c +++ b/hw/intc/pnv_xive.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" +#include "qemu/module.h" #include "qapi/error.h" #include "target/ppc/cpu.h" #include "sysemu/cpus.h" diff --git a/hw/intc/puv3_intc.c b/hw/intc/puv3_intc.c index 69ddc8c19a..e2f6d9875a 100644 --- a/hw/intc/puv3_intc.c +++ b/hw/intc/puv3_intc.c @@ -8,11 +8,13 @@ * published by the Free Software Foundation, or any later version. * See the COPYING file in the top-level directory. */ + #include "qemu/osdep.h" #include "hw/sysbus.h" #undef DEBUG_PUV3 #include "hw/unicore32/puv3.h" +#include "qemu/module.h" #define TYPE_PUV3_INTC "puv3_intc" #define PUV3_INTC(obj) OBJECT_CHECK(PUV3INTCState, (obj), TYPE_PUV3_INTC) diff --git a/hw/intc/realview_gic.c b/hw/intc/realview_gic.c index 7f2ff85c83..99557544db 100644 --- a/hw/intc/realview_gic.c +++ b/hw/intc/realview_gic.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/module.h" #include "hw/intc/realview_gic.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 5f8168f0f0..d0be755c82 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/module.h" #include "hw/sysbus.h" #include "hw/s390x/ioinst.h" #include "hw/s390x/s390_flic.h" diff --git a/hw/intc/s390_flic_kvm.c b/hw/intc/s390_flic_kvm.c index a03df37560..ff45b4ab0b 100644 --- a/hw/intc/s390_flic_kvm.c +++ b/hw/intc/s390_flic_kvm.c @@ -11,11 +11,11 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "cpu.h" #include "kvm_s390x.h" #include <sys/ioctl.h> #include "qemu/error-report.h" +#include "qemu/module.h" #include "qapi/error.h" #include "hw/sysbus.h" #include "sysemu/kvm.h" diff --git a/hw/intc/sh_intc.c b/hw/intc/sh_intc.c index 6ce2a8084f..bac7886f25 100644 --- a/hw/intc/sh_intc.c +++ b/hw/intc/sh_intc.c @@ -9,7 +9,6 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "cpu.h" #include "hw/sh4/sh_intc.h" #include "hw/hw.h" diff --git a/hw/intc/slavio_intctl.c b/hw/intc/slavio_intctl.c index 817e02617e..ca528753bf 100644 --- a/hw/intc/slavio_intctl.c +++ b/hw/intc/slavio_intctl.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "monitor/monitor.h" +#include "qemu/module.h" #include "hw/sysbus.h" #include "hw/intc/intc.h" #include "trace.h" diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c index 62e0ef8fa5..58c2e5d890 100644 --- a/hw/intc/spapr_xive.c +++ b/hw/intc/spapr_xive.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" +#include "qemu/module.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "target/ppc/cpu.h" diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 79f5a8a916..29f7d39781 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -27,13 +27,13 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "hw/hw.h" #include "trace.h" #include "qemu/timer.h" #include "hw/ppc/xics.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "qapi/visitor.h" #include "monitor/monitor.h" #include "hw/intc/intc.h" diff --git a/hw/intc/xics_pnv.c b/hw/intc/xics_pnv.c index fa48505f36..67f2702e52 100644 --- a/hw/intc/xics_pnv.c +++ b/hw/intc/xics_pnv.c @@ -21,6 +21,7 @@ #include "qapi/error.h" #include "sysemu/sysemu.h" #include "qemu/log.h" +#include "qemu/module.h" #include "hw/ppc/xics.h" #define ICP_XIRR_POLL 0 /* 1 byte (CPRR) or 4 bytes */ diff --git a/hw/intc/xilinx_intc.c b/hw/intc/xilinx_intc.c index 9d8139bc6d..d5363e977f 100644 --- a/hw/intc/xilinx_intc.c +++ b/hw/intc/xilinx_intc.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "qemu/module.h" #include "hw/hw.h" #define D(x) diff --git a/hw/intc/xive.c b/hw/intc/xive.c index b2b92a92c8..6250c0414d 100644 --- a/hw/intc/xive.c +++ b/hw/intc/xive.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" +#include "qemu/module.h" #include "qapi/error.h" #include "target/ppc/cpu.h" #include "sysemu/cpus.h" diff --git a/hw/intc/xlnx-pmu-iomod-intc.c b/hw/intc/xlnx-pmu-iomod-intc.c index 59235351ba..0b8ff897dc 100644 --- a/hw/intc/xlnx-pmu-iomod-intc.c +++ b/hw/intc/xlnx-pmu-iomod-intc.c @@ -29,6 +29,7 @@ #include "hw/register.h" #include "qemu/bitops.h" #include "qemu/log.h" +#include "qemu/module.h" #include "hw/intc/xlnx-pmu-iomod-intc.h" #ifndef XLNX_PMU_IO_INTC_ERR_DEBUG diff --git a/hw/intc/xlnx-zynqmp-ipi.c b/hw/intc/xlnx-zynqmp-ipi.c index aa50a8ac08..0dad6c04f5 100644 --- a/hw/intc/xlnx-zynqmp-ipi.c +++ b/hw/intc/xlnx-zynqmp-ipi.c @@ -30,6 +30,7 @@ #include "hw/register.h" #include "qemu/bitops.h" #include "qemu/log.h" +#include "qemu/module.h" #include "hw/intc/xlnx-zynqmp-ipi.h" #ifndef XLNX_ZYNQMP_IPI_ERR_DEBUG diff --git a/hw/ipack/ipack.c b/hw/ipack/ipack.c index 6021e6d135..6b1b72f94d 100644 --- a/hw/ipack/ipack.c +++ b/hw/ipack/ipack.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/module.h" #include "hw/ipack/ipack.h" IPackDevice *ipack_device_find(IPackBus *bus, int32_t slot) diff --git a/hw/ipack/tpci200.c b/hw/ipack/tpci200.c index cd3e79139d..d4d85107d0 100644 --- a/hw/ipack/tpci200.c +++ b/hw/ipack/tpci200.c @@ -13,6 +13,7 @@ #include "hw/ipack/ipack.h" #include "hw/pci/pci.h" #include "qemu/bitops.h" +#include "qemu/module.h" /* #define DEBUG_TPCI */ diff --git a/hw/ipmi/ipmi.c b/hw/ipmi/ipmi.c index 63c031703d..a837f91782 100644 --- a/hw/ipmi/ipmi.c +++ b/hw/ipmi/ipmi.c @@ -30,6 +30,7 @@ #include "qapi/error.h" #include "qapi/qapi-commands-misc.h" #include "qapi/visitor.h" +#include "qemu/module.h" static uint32_t ipmi_current_uuid = 1; diff --git a/hw/ipmi/ipmi_bmc_extern.c b/hw/ipmi/ipmi_bmc_extern.c index bf0b7ee0f5..c0a8dac346 100644 --- a/hw/ipmi/ipmi_bmc_extern.c +++ b/hw/ipmi/ipmi_bmc_extern.c @@ -29,6 +29,7 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "qapi/error.h" #include "qemu/timer.h" #include "chardev/char-fe.h" diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c index 9b509f829b..1980536517 100644 --- a/hw/ipmi/ipmi_bmc_sim.c +++ b/hw/ipmi/ipmi_bmc_sim.c @@ -27,6 +27,7 @@ #include "qemu/timer.h" #include "hw/ipmi/ipmi.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "hw/loader.h" #define IPMI_NETFN_CHASSIS 0x00 diff --git a/hw/ipmi/isa_ipmi_bt.c b/hw/ipmi/isa_ipmi_bt.c index 8bbb1fa785..1846d5b9a4 100644 --- a/hw/ipmi/isa_ipmi_bt.c +++ b/hw/ipmi/isa_ipmi_bt.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/log.h" +#include "qemu/module.h" #include "qapi/error.h" #include "hw/hw.h" #include "hw/ipmi/ipmi.h" diff --git a/hw/ipmi/isa_ipmi_kcs.c b/hw/ipmi/isa_ipmi_kcs.c index a79431554a..068f341256 100644 --- a/hw/ipmi/isa_ipmi_kcs.c +++ b/hw/ipmi/isa_ipmi_kcs.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/log.h" +#include "qemu/module.h" #include "qapi/error.h" #include "hw/hw.h" #include "hw/ipmi/ipmi.h" diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c index 63fa77effc..388800603b 100644 --- a/hw/isa/isa-bus.c +++ b/hw/isa/isa-bus.c @@ -16,8 +16,10 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ + #include "qemu/osdep.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "qapi/error.h" #include "hw/hw.h" #include "monitor/monitor.h" diff --git a/hw/isa/isa-superio.c b/hw/isa/isa-superio.c index d54463bf03..4c73c2100f 100644 --- a/hw/isa/isa-superio.c +++ b/hw/isa/isa-superio.c @@ -9,8 +9,10 @@ * See the COPYING file in the top-level directory. * SPDX-License-Identifier: GPL-2.0-or-later */ + #include "qemu/osdep.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "qapi/error.h" #include "sysemu/sysemu.h" #include "sysemu/blockdev.h" diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c index 35d17246e9..a7081bd52d 100644 --- a/hw/isa/lpc_ich9.c +++ b/hw/isa/lpc_ich9.c @@ -28,7 +28,6 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "cpu.h" #include "hw/hw.h" #include "qapi/visitor.h" diff --git a/hw/isa/pc87312.c b/hw/isa/pc87312.c index 5cf64505fe..85dbc94439 100644 --- a/hw/isa/pc87312.c +++ b/hw/isa/pc87312.c @@ -27,6 +27,7 @@ #include "hw/isa/pc87312.h" #include "qapi/error.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "trace.h" diff --git a/hw/isa/smc37c669-superio.c b/hw/isa/smc37c669-superio.c index 64466a9373..901a9f8e65 100644 --- a/hw/isa/smc37c669-superio.c +++ b/hw/isa/smc37c669-superio.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #include "hw/isa/superio.h" +#include "qemu/module.h" /* UARTs (compatible with NS16450 or PC16550) */ diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index d46754f61c..12c460590f 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -23,6 +23,7 @@ #include "hw/acpi/acpi.h" #include "hw/i2c/pm_smbus.h" #include "sysemu/sysemu.h" +#include "qemu/module.h" #include "qemu/timer.h" #include "exec/address-spaces.h" diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c index b820c9114b..fb9d52d54f 100644 --- a/hw/lm32/lm32_boards.c +++ b/hw/lm32/lm32_boards.c @@ -20,7 +20,6 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "qemu/error-report.h" -#include "qemu-common.h" #include "cpu.h" #include "hw/sysbus.h" #include "hw/hw.h" diff --git a/hw/lm32/lm32_hwsetup.h b/hw/lm32/lm32_hwsetup.h index a01f6bc5df..de94de177a 100644 --- a/hw/lm32/lm32_hwsetup.h +++ b/hw/lm32/lm32_hwsetup.h @@ -25,7 +25,6 @@ #ifndef QEMU_HW_LM32_HWSETUP_H #define QEMU_HW_LM32_HWSETUP_H -#include "qemu-common.h" #include "qemu/cutils.h" #include "hw/loader.h" diff --git a/hw/m68k/an5206.c b/hw/m68k/an5206.c index 06e3803258..68d15a6ebe 100644 --- a/hw/m68k/an5206.c +++ b/hw/m68k/an5206.c @@ -8,7 +8,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "hw/hw.h" #include "hw/m68k/mcf.h" diff --git a/hw/m68k/mcf5206.c b/hw/m68k/mcf5206.c index d7f26d6810..1c17f83eed 100644 --- a/hw/m68k/mcf5206.c +++ b/hw/m68k/mcf5206.c @@ -7,7 +7,6 @@ */ #include "qemu/osdep.h" #include "qemu/error-report.h" -#include "qemu-common.h" #include "cpu.h" #include "hw/hw.h" #include "hw/m68k/mcf.h" diff --git a/hw/m68k/mcf_intc.c b/hw/m68k/mcf_intc.c index 393ce284a2..a613aed820 100644 --- a/hw/m68k/mcf_intc.c +++ b/hw/m68k/mcf_intc.c @@ -5,8 +5,9 @@ * * This code is licensed under the GPL */ + #include "qemu/osdep.h" -#include "qemu-common.h" +#include "qemu/module.h" #include "cpu.h" #include "hw/hw.h" #include "hw/sysbus.h" diff --git a/hw/mem/nvdimm.c b/hw/mem/nvdimm.c index bf2adf5e16..f438abb387 100644 --- a/hw/mem/nvdimm.c +++ b/hw/mem/nvdimm.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "qemu/module.h" #include "qemu/pmem.h" #include "qapi/error.h" #include "qapi/visitor.h" diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index 152400b1fc..b1239fd0d3 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -24,6 +24,7 @@ #include "hw/mem/memory-device.h" #include "qapi/error.h" #include "qapi/visitor.h" +#include "qemu/module.h" #include "sysemu/numa.h" #include "trace.h" diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c index a907604116..a88bf16cc8 100644 --- a/hw/microblaze/petalogix_ml605_mmu.c +++ b/hw/microblaze/petalogix_ml605_mmu.c @@ -28,7 +28,6 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "hw/sysbus.h" #include "hw/hw.h" diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c index 88ce570f9a..8d83474262 100644 --- a/hw/microblaze/petalogix_s3adsp1800_mmu.c +++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c @@ -26,7 +26,6 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "hw/sysbus.h" #include "hw/hw.h" diff --git a/hw/microblaze/xlnx-zynqmp-pmu.c b/hw/microblaze/xlnx-zynqmp-pmu.c index df6c0048aa..67cedec4ef 100644 --- a/hw/microblaze/xlnx-zynqmp-pmu.c +++ b/hw/microblaze/xlnx-zynqmp-pmu.c @@ -17,7 +17,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "exec/address-spaces.h" #include "hw/boards.h" #include "hw/qdev-properties.h" diff --git a/hw/mips/boston.c b/hw/mips/boston.c index 1ffccc8da9..749582e5aa 100644 --- a/hw/mips/boston.c +++ b/hw/mips/boston.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "qemu/units.h" -#include "qemu-common.h" #include "exec/address-spaces.h" #include "hw/boards.h" diff --git a/hw/mips/cps.c b/hw/mips/cps.c index 649b35a76c..0d459c4141 100644 --- a/hw/mips/cps.c +++ b/hw/mips/cps.c @@ -19,6 +19,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/module.h" #include "hw/mips/cps.h" #include "hw/mips/mips.h" #include "hw/mips/cpudevs.h" diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c index 05a5a823a1..5dbaa3bfcc 100644 --- a/hw/mips/mips_fulong2e.c +++ b/hw/mips/mips_fulong2e.c @@ -19,6 +19,7 @@ */ #include "qemu/osdep.h" +#include "qemu-common.h" #include "qemu/units.h" #include "qapi/error.h" #include "cpu.h" diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c index 1afbe3ce6a..fa8775d428 100644 --- a/hw/mips/mips_jazz.c +++ b/hw/mips/mips_jazz.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "qemu-common.h" #include "hw/hw.h" #include "hw/mips/mips.h" #include "hw/mips/cpudevs.h" diff --git a/hw/misc/a9scu.c b/hw/misc/a9scu.c index 3e8ad8cd73..4307f0082b 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 "qemu/module.h" static uint64_t a9_scu_read(void *opaque, hwaddr offset, unsigned size) diff --git a/hw/misc/applesmc.c b/hw/misc/applesmc.c index 7be8b5f13c..2d7eb3c7e2 100644 --- a/hw/misc/applesmc.c +++ b/hw/misc/applesmc.c @@ -34,6 +34,7 @@ #include "hw/hw.h" #include "hw/isa/isa.h" #include "ui/console.h" +#include "qemu/module.h" #include "qemu/timer.h" /* #define DEBUG_SMC */ diff --git a/hw/misc/arm11scu.c b/hw/misc/arm11scu.c index 7042ce11e8..84275df885 100644 --- a/hw/misc/arm11scu.c +++ b/hw/misc/arm11scu.c @@ -11,6 +11,7 @@ #include "qemu/osdep.h" #include "hw/misc/arm11scu.h" #include "qemu/log.h" +#include "qemu/module.h" static uint64_t mpcore_scu_read(void *opaque, hwaddr offset, unsigned size) diff --git a/hw/misc/arm_integrator_debug.c b/hw/misc/arm_integrator_debug.c index 533e6e3208..2646107b97 100644 --- a/hw/misc/arm_integrator_debug.c +++ b/hw/misc/arm_integrator_debug.c @@ -19,6 +19,7 @@ #include "hw/sysbus.h" #include "hw/misc/arm_integrator_debug.h" #include "qemu/log.h" +#include "qemu/module.h" #define INTEGRATOR_DEBUG(obj) \ OBJECT_CHECK(IntegratorDebugState, (obj), TYPE_INTEGRATOR_DEBUG) diff --git a/hw/misc/arm_l2x0.c b/hw/misc/arm_l2x0.c index 66a0787c47..b88f40ae7e 100644 --- a/hw/misc/arm_l2x0.c +++ b/hw/misc/arm_l2x0.c @@ -21,6 +21,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "qemu/log.h" +#include "qemu/module.h" /* L2C-310 r3p2 */ #define CACHE_ID 0x410000c8 diff --git a/hw/misc/arm_sysctl.c b/hw/misc/arm_sysctl.c index b20b44ea20..457dfadfab 100644 --- a/hw/misc/arm_sysctl.c +++ b/hw/misc/arm_sysctl.c @@ -15,6 +15,7 @@ #include "hw/arm/primecell.h" #include "sysemu/sysemu.h" #include "qemu/log.h" +#include "qemu/module.h" #define LOCK_VALUE 0xa05f diff --git a/hw/misc/armsse-cpuid.c b/hw/misc/armsse-cpuid.c index 7788f6ced6..05c08f3db5 100644 --- a/hw/misc/armsse-cpuid.c +++ b/hw/misc/armsse-cpuid.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" +#include "qemu/module.h" #include "trace.h" #include "qapi/error.h" #include "sysemu/sysemu.h" diff --git a/hw/misc/armsse-mhu.c b/hw/misc/armsse-mhu.c index 9ebca32e9a..514321a9ec 100644 --- a/hw/misc/armsse-mhu.c +++ b/hw/misc/armsse-mhu.c @@ -17,6 +17,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" +#include "qemu/module.h" #include "trace.h" #include "qapi/error.h" #include "sysemu/sysemu.h" diff --git a/hw/misc/aspeed_scu.c b/hw/misc/aspeed_scu.c index ab1e18ed4b..71a0d4b7be 100644 --- a/hw/misc/aspeed_scu.c +++ b/hw/misc/aspeed_scu.c @@ -17,6 +17,7 @@ #include "qemu/bitops.h" #include "qemu/log.h" #include "qemu/guest-random.h" +#include "qemu/module.h" #include "trace.h" #define TO_REG(offset) ((offset) >> 2) diff --git a/hw/misc/aspeed_sdmc.c b/hw/misc/aspeed_sdmc.c index eec77f2435..b84676d36d 100644 --- a/hw/misc/aspeed_sdmc.c +++ b/hw/misc/aspeed_sdmc.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" +#include "qemu/module.h" #include "qemu/error-report.h" #include "hw/misc/aspeed_sdmc.h" #include "hw/misc/aspeed_scu.h" diff --git a/hw/misc/auxbus.c b/hw/misc/auxbus.c index 0e56d9a8a4..f8e7b97971 100644 --- a/hw/misc/auxbus.c +++ b/hw/misc/auxbus.c @@ -29,6 +29,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "qemu/log.h" +#include "qemu/module.h" #include "hw/misc/auxbus.h" #include "hw/i2c/i2c.h" #include "monitor/monitor.h" diff --git a/hw/misc/bcm2835_mbox.c b/hw/misc/bcm2835_mbox.c index e97cc814af..a87da5ee53 100644 --- a/hw/misc/bcm2835_mbox.c +++ b/hw/misc/bcm2835_mbox.c @@ -12,6 +12,7 @@ #include "qapi/error.h" #include "hw/misc/bcm2835_mbox.h" #include "qemu/log.h" +#include "qemu/module.h" #define MAIL0_PEEK 0x90 #define MAIL0_SENDER 0x94 diff --git a/hw/misc/bcm2835_property.c b/hw/misc/bcm2835_property.c index 145427ae0f..0bf789cf60 100644 --- a/hw/misc/bcm2835_property.c +++ b/hw/misc/bcm2835_property.c @@ -9,6 +9,7 @@ #include "hw/misc/bcm2835_mbox_defs.h" #include "sysemu/dma.h" #include "qemu/log.h" +#include "qemu/module.h" /* https://github.com/raspberrypi/firmware/wiki/Mailbox-property-interface */ diff --git a/hw/misc/bcm2835_rng.c b/hw/misc/bcm2835_rng.c index fe59c868f5..e882c87568 100644 --- a/hw/misc/bcm2835_rng.c +++ b/hw/misc/bcm2835_rng.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "qemu/guest-random.h" +#include "qemu/module.h" #include "hw/misc/bcm2835_rng.h" static uint32_t get_random_bytes(void) diff --git a/hw/misc/debugexit.c b/hw/misc/debugexit.c index bed293247e..8e4a2fc701 100644 --- a/hw/misc/debugexit.c +++ b/hw/misc/debugexit.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/isa/isa.h" +#include "qemu/module.h" #define TYPE_ISA_DEBUG_EXIT_DEVICE "isa-debug-exit" #define ISA_DEBUG_EXIT_DEVICE(obj) \ diff --git a/hw/misc/eccmemctl.c b/hw/misc/eccmemctl.c index bb7cc52b5e..8386db07df 100644 --- a/hw/misc/eccmemctl.c +++ b/hw/misc/eccmemctl.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "qemu/module.h" #include "trace.h" /* There are 3 versions of this chip used in SMP sun4m systems: diff --git a/hw/misc/edu.c b/hw/misc/edu.c index 19e5545e2c..3b6dba2c72 100644 --- a/hw/misc/edu.c +++ b/hw/misc/edu.c @@ -28,6 +28,7 @@ #include "hw/pci/msi.h" #include "qemu/timer.h" #include "qemu/main-loop.h" /* iothread mutex */ +#include "qemu/module.h" #include "qapi/visitor.h" #define TYPE_PCI_EDU_DEVICE "edu" diff --git a/hw/misc/exynos4210_clk.c b/hw/misc/exynos4210_clk.c index 81862c0ada..821d9eab3f 100644 --- a/hw/misc/exynos4210_clk.c +++ b/hw/misc/exynos4210_clk.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "qemu/log.h" +#include "qemu/module.h" #define TYPE_EXYNOS4210_CLK "exynos4210.clk" #define EXYNOS4210_CLK(obj) \ diff --git a/hw/misc/exynos4210_pmu.c b/hw/misc/exynos4210_pmu.c index 0d7b64c5b3..8712774768 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 "qemu/module.h" #include "sysemu/sysemu.h" #ifndef DEBUG_PMU diff --git a/hw/misc/exynos4210_rng.c b/hw/misc/exynos4210_rng.c index 0e70ffb404..b88fe3a26d 100644 --- a/hw/misc/exynos4210_rng.c +++ b/hw/misc/exynos4210_rng.c @@ -22,6 +22,7 @@ #include "qapi/error.h" #include "qemu/log.h" #include "qemu/guest-random.h" +#include "qemu/module.h" #define DEBUG_EXYNOS_RNG 0 diff --git a/hw/misc/imx25_ccm.c b/hw/misc/imx25_ccm.c index 19e948a52d..693ea81040 100644 --- a/hw/misc/imx25_ccm.c +++ b/hw/misc/imx25_ccm.c @@ -14,6 +14,7 @@ #include "qemu/osdep.h" #include "hw/misc/imx25_ccm.h" #include "qemu/log.h" +#include "qemu/module.h" #ifndef DEBUG_IMX25_CCM #define DEBUG_IMX25_CCM 0 diff --git a/hw/misc/imx2_wdt.c b/hw/misc/imx2_wdt.c index e47e442592..5576778a32 100644 --- a/hw/misc/imx2_wdt.c +++ b/hw/misc/imx2_wdt.c @@ -11,6 +11,7 @@ #include "qemu/osdep.h" #include "qemu/bitops.h" +#include "qemu/module.h" #include "sysemu/watchdog.h" #include "hw/misc/imx2_wdt.h" diff --git a/hw/misc/imx31_ccm.c b/hw/misc/imx31_ccm.c index b890c383be..38a19aa0d0 100644 --- a/hw/misc/imx31_ccm.c +++ b/hw/misc/imx31_ccm.c @@ -14,6 +14,7 @@ #include "qemu/osdep.h" #include "hw/misc/imx31_ccm.h" #include "qemu/log.h" +#include "qemu/module.h" #define CKIH_FREQ 26000000 /* 26MHz crystal input */ diff --git a/hw/misc/imx6_ccm.c b/hw/misc/imx6_ccm.c index 4fa94835fe..9478007f41 100644 --- a/hw/misc/imx6_ccm.c +++ b/hw/misc/imx6_ccm.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "hw/misc/imx6_ccm.h" #include "qemu/log.h" +#include "qemu/module.h" #ifndef DEBUG_IMX6_CCM #define DEBUG_IMX6_CCM 0 diff --git a/hw/misc/imx6_src.c b/hw/misc/imx6_src.c index cfb08710fb..878ffcdc71 100644 --- a/hw/misc/imx6_src.c +++ b/hw/misc/imx6_src.c @@ -13,6 +13,7 @@ #include "sysemu/sysemu.h" #include "qemu/bitops.h" #include "qemu/log.h" +#include "qemu/module.h" #include "arm-powerctl.h" #include "qom/cpu.h" diff --git a/hw/misc/imx6ul_ccm.c b/hw/misc/imx6ul_ccm.c index 90bc374271..37b472d125 100644 --- a/hw/misc/imx6ul_ccm.c +++ b/hw/misc/imx6ul_ccm.c @@ -14,6 +14,7 @@ #include "hw/registerfields.h" #include "hw/misc/imx6ul_ccm.h" #include "qemu/log.h" +#include "qemu/module.h" #include "trace.h" diff --git a/hw/misc/imx7_ccm.c b/hw/misc/imx7_ccm.c index d90c48bfec..d9bdcf1027 100644 --- a/hw/misc/imx7_ccm.c +++ b/hw/misc/imx7_ccm.c @@ -11,6 +11,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" +#include "qemu/module.h" #include "hw/misc/imx7_ccm.h" diff --git a/hw/misc/imx7_gpr.c b/hw/misc/imx7_gpr.c index c2a9df29c6..09d57d4710 100644 --- a/hw/misc/imx7_gpr.c +++ b/hw/misc/imx7_gpr.c @@ -15,6 +15,7 @@ #include "qemu/osdep.h" #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/imx7_snvs.c b/hw/misc/imx7_snvs.c index 4df482b282..55b962a453 100644 --- a/hw/misc/imx7_snvs.c +++ b/hw/misc/imx7_snvs.c @@ -15,6 +15,7 @@ #include "qemu/osdep.h" #include "hw/misc/imx7_snvs.h" #include "qemu/log.h" +#include "qemu/module.h" #include "sysemu/sysemu.h" static uint64_t imx7_snvs_read(void *opaque, hwaddr offset, unsigned size) diff --git a/hw/misc/imx_ccm.c b/hw/misc/imx_ccm.c index 7f239a41d8..2f81b0ad73 100644 --- a/hw/misc/imx_ccm.c +++ b/hw/misc/imx_ccm.c @@ -14,6 +14,7 @@ #include "qemu/osdep.h" #include "hw/misc/imx_ccm.h" #include "qemu/log.h" +#include "qemu/module.h" #ifndef DEBUG_IMX_CCM #define DEBUG_IMX_CCM 0 diff --git a/hw/misc/iotkit-secctl.c b/hw/misc/iotkit-secctl.c index 537601cd53..58fd94b14f 100644 --- a/hw/misc/iotkit-secctl.c +++ b/hw/misc/iotkit-secctl.c @@ -11,6 +11,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" +#include "qemu/module.h" #include "qapi/error.h" #include "trace.h" #include "hw/sysbus.h" diff --git a/hw/misc/iotkit-sysctl.c b/hw/misc/iotkit-sysctl.c index 54064a31ef..00d4faa6db 100644 --- a/hw/misc/iotkit-sysctl.c +++ b/hw/misc/iotkit-sysctl.c @@ -19,6 +19,7 @@ #include "qemu/osdep.h" #include "qemu/bitops.h" #include "qemu/log.h" +#include "qemu/module.h" #include "trace.h" #include "qapi/error.h" #include "sysemu/sysemu.h" diff --git a/hw/misc/iotkit-sysinfo.c b/hw/misc/iotkit-sysinfo.c index 026ba94261..3e1cf0ec34 100644 --- a/hw/misc/iotkit-sysinfo.c +++ b/hw/misc/iotkit-sysinfo.c @@ -19,6 +19,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" +#include "qemu/module.h" #include "trace.h" #include "qapi/error.h" #include "sysemu/sysemu.h" diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index c7b6bbc974..f9cc66aba8 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -16,6 +16,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 "qemu/units.h" #include "qapi/error.h" @@ -28,6 +29,7 @@ #include "migration/blocker.h" #include "qemu/error-report.h" #include "qemu/event_notifier.h" +#include "qemu/module.h" #include "qom/object_interfaces.h" #include "chardev/char-fe.h" #include "sysemu/hostmem.h" diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c index 3febacdd1e..4f532efe34 100644 --- a/hw/misc/macio/cuda.c +++ b/hw/misc/macio/cuda.c @@ -22,7 +22,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" +#include "qemu-common.h" #include "hw/hw.h" #include "hw/ppc/mac.h" #include "hw/input/adb.h" @@ -32,6 +34,7 @@ #include "sysemu/sysemu.h" #include "qemu/cutils.h" #include "qemu/log.h" +#include "qemu/module.h" #include "trace.h" /* Bits in B data register: all active low */ diff --git a/hw/misc/macio/gpio.c b/hw/misc/macio/gpio.c index 9317df759c..31811ab513 100644 --- a/hw/misc/macio/gpio.c +++ b/hw/misc/macio/gpio.c @@ -30,6 +30,7 @@ #include "hw/misc/macio/gpio.h" #include "hw/nmi.h" #include "qemu/log.h" +#include "qemu/module.h" #include "trace.h" diff --git a/hw/misc/macio/mac_dbdma.c b/hw/misc/macio/mac_dbdma.c index e5917d8f2e..548625a5f0 100644 --- a/hw/misc/macio/mac_dbdma.c +++ b/hw/misc/macio/mac_dbdma.c @@ -36,10 +36,12 @@ * 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/ppc/mac_dbdma.h" #include "qemu/main-loop.h" +#include "qemu/module.h" #include "qemu/log.h" #include "sysemu/dma.h" diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c index b726c73022..82492096f8 100644 --- a/hw/misc/macio/macio.c +++ b/hw/misc/macio/macio.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 "qapi/error.h" +#include "qemu/module.h" #include "hw/hw.h" #include "hw/ppc/mac.h" #include "hw/misc/macio/cuda.h" diff --git a/hw/misc/macio/pmu.c b/hw/misc/macio/pmu.c index 6e6d96c8c5..753561d3f1 100644 --- a/hw/misc/macio/pmu.c +++ b/hw/misc/macio/pmu.c @@ -29,6 +29,7 @@ */ #include "qemu/osdep.h" +#include "qemu-common.h" #include "hw/hw.h" #include "hw/ppc/mac.h" #include "hw/input/adb.h" @@ -39,6 +40,7 @@ #include "sysemu/sysemu.h" #include "qemu/cutils.h" #include "qemu/log.h" +#include "qemu/module.h" #include "trace.h" diff --git a/hw/misc/max111x.c b/hw/misc/max111x.c index ac6d35a81d..d373ece0c9 100644 --- a/hw/misc/max111x.c +++ b/hw/misc/max111x.c @@ -12,6 +12,7 @@ #include "qemu/osdep.h" #include "hw/ssi/ssi.h" +#include "qemu/module.h" typedef struct { SSISlave parent_obj; diff --git a/hw/misc/milkymist-hpdmc.c b/hw/misc/milkymist-hpdmc.c index 44dc0698ec..701c79e81c 100644 --- a/hw/misc/milkymist-hpdmc.c +++ b/hw/misc/milkymist-hpdmc.c @@ -26,6 +26,7 @@ #include "hw/sysbus.h" #include "trace.h" #include "qemu/error-report.h" +#include "qemu/module.h" enum { R_SYSTEM = 0, diff --git a/hw/misc/milkymist-pfpu.c b/hw/misc/milkymist-pfpu.c index 4a03c7ee63..1c27f1a4bc 100644 --- a/hw/misc/milkymist-pfpu.c +++ b/hw/misc/milkymist-pfpu.c @@ -27,6 +27,7 @@ #include "hw/sysbus.h" #include "trace.h" #include "qemu/log.h" +#include "qemu/module.h" #include "qemu/error-report.h" #include <math.h> diff --git a/hw/misc/mips_cmgcr.c b/hw/misc/mips_cmgcr.c index d019d41a3c..edec164605 100644 --- a/hw/misc/mips_cmgcr.c +++ b/hw/misc/mips_cmgcr.c @@ -11,6 +11,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" +#include "qemu/module.h" #include "hw/hw.h" #include "hw/sysbus.h" #include "sysemu/sysemu.h" diff --git a/hw/misc/mips_cpc.c b/hw/misc/mips_cpc.c index 712d8423a7..446b1ad397 100644 --- a/hw/misc/mips_cpc.c +++ b/hw/misc/mips_cpc.c @@ -21,6 +21,7 @@ #include "qapi/error.h" #include "cpu.h" #include "qemu/log.h" +#include "qemu/module.h" #include "hw/sysbus.h" #include "hw/misc/mips_cpc.h" diff --git a/hw/misc/mips_itu.c b/hw/misc/mips_itu.c index 3afdbe69c6..e8ba4a3cd0 100644 --- a/hw/misc/mips_itu.c +++ b/hw/misc/mips_itu.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "qemu/log.h" +#include "qemu/module.h" #include "qapi/error.h" #include "cpu.h" #include "exec/exec-all.h" diff --git a/hw/misc/mos6522.c b/hw/misc/mos6522.c index 14cff26c61..e72ed69d51 100644 --- a/hw/misc/mos6522.c +++ b/hw/misc/mos6522.c @@ -23,6 +23,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/input/adb.h" @@ -31,6 +32,7 @@ #include "sysemu/sysemu.h" #include "qemu/cutils.h" #include "qemu/log.h" +#include "qemu/module.h" #include "trace.h" /* XXX: implement all timer modes */ diff --git a/hw/misc/mps2-fpgaio.c b/hw/misc/mps2-fpgaio.c index 5cf10ebd66..b97ad42d75 100644 --- a/hw/misc/mps2-fpgaio.c +++ b/hw/misc/mps2-fpgaio.c @@ -17,6 +17,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" +#include "qemu/module.h" #include "qapi/error.h" #include "trace.h" #include "hw/sysbus.h" diff --git a/hw/misc/mps2-scc.c b/hw/misc/mps2-scc.c index 6a9d251f18..1fdf5d22bd 100644 --- a/hw/misc/mps2-scc.c +++ b/hw/misc/mps2-scc.c @@ -19,6 +19,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" +#include "qemu/module.h" #include "trace.h" #include "hw/sysbus.h" #include "hw/registerfields.h" diff --git a/hw/misc/msf2-sysreg.c b/hw/misc/msf2-sysreg.c index 6eb501104b..21a2863821 100644 --- a/hw/misc/msf2-sysreg.c +++ b/hw/misc/msf2-sysreg.c @@ -15,6 +15,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/log.h" +#include "qemu/module.h" #include "hw/misc/msf2-sysreg.h" #include "qemu/error-report.h" #include "trace.h" diff --git a/hw/misc/mst_fpga.c b/hw/misc/mst_fpga.c index a10f0496fe..fd18303724 100644 --- a/hw/misc/mst_fpga.c +++ b/hw/misc/mst_fpga.c @@ -10,9 +10,11 @@ * 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/sysbus.h" +#include "qemu/module.h" /* Mainstone FPGA for extern irqs */ #define FPGA_GPIO_PIN 0 diff --git a/hw/misc/nrf51_rng.c b/hw/misc/nrf51_rng.c index 3400e90a9b..96ef4330eb 100644 --- a/hw/misc/nrf51_rng.c +++ b/hw/misc/nrf51_rng.c @@ -11,6 +11,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" +#include "qemu/module.h" #include "qapi/error.h" #include "hw/arm/nrf51.h" #include "hw/misc/nrf51_rng.h" diff --git a/hw/misc/pc-testdev.c b/hw/misc/pc-testdev.c index 0aee04f231..1f9abd52b8 100644 --- a/hw/misc/pc-testdev.c +++ b/hw/misc/pc-testdev.c @@ -38,6 +38,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/qdev.h" +#include "qemu/module.h" #include "hw/isa/isa.h" #define IOMEM_LEN 0x10000 diff --git a/hw/misc/pca9552.c b/hw/misc/pca9552.c index 7325d3f287..3422397f89 100644 --- a/hw/misc/pca9552.c +++ b/hw/misc/pca9552.c @@ -11,6 +11,7 @@ #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" diff --git a/hw/misc/pci-testdev.c b/hw/misc/pci-testdev.c index 1282d151cb..d4d89df4cf 100644 --- a/hw/misc/pci-testdev.c +++ b/hw/misc/pci-testdev.c @@ -17,10 +17,12 @@ * 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 "hw/hw.h" #include "hw/pci/pci.h" #include "qemu/event_notifier.h" +#include "qemu/module.h" #include "sysemu/kvm.h" typedef struct PCITestDevHdr { diff --git a/hw/misc/puv3_pm.c b/hw/misc/puv3_pm.c index afe191fbe1..b538b4afbb 100644 --- a/hw/misc/puv3_pm.c +++ b/hw/misc/puv3_pm.c @@ -8,12 +8,14 @@ * published by the Free Software Foundation, or any later version. * See the COPYING file in the top-level directory. */ + #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/sysbus.h" #undef DEBUG_PUV3 #include "hw/unicore32/puv3.h" +#include "qemu/module.h" #define TYPE_PUV3_PM "puv3_pm" #define PUV3_PM(obj) OBJECT_CHECK(PUV3PMState, (obj), TYPE_PUV3_PM) diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c index 9d8961ba0c..1da24c621e 100644 --- a/hw/misc/pvpanic.c +++ b/hw/misc/pvpanic.c @@ -15,6 +15,7 @@ #include "qemu/osdep.h" #include "sysemu/sysemu.h" #include "qemu/log.h" +#include "qemu/module.h" #include "hw/nvram/fw_cfg.h" #include "hw/misc/pvpanic.h" diff --git a/hw/misc/sga.c b/hw/misc/sga.c index 4a22a52a60..da04924f5f 100644 --- a/hw/misc/sga.c +++ b/hw/misc/sga.c @@ -24,9 +24,11 @@ * sgabios code originally available at code.google.com/p/sgabios * */ + #include "qemu/osdep.h" #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/slavio_misc.c b/hw/misc/slavio_misc.c index 0b33cdcb61..9c2cf04646 100644 --- a/hw/misc/slavio_misc.c +++ b/hw/misc/slavio_misc.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "sysemu/sysemu.h" #include "hw/sysbus.h" +#include "qemu/module.h" #include "trace.h" /* diff --git a/hw/misc/stm32f2xx_syscfg.c b/hw/misc/stm32f2xx_syscfg.c index 7f10195862..aa59b43549 100644 --- a/hw/misc/stm32f2xx_syscfg.c +++ b/hw/misc/stm32f2xx_syscfg.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/misc/stm32f2xx_syscfg.h" #include "qemu/log.h" +#include "qemu/module.h" #ifndef STM_SYSCFG_ERR_DEBUG #define STM_SYSCFG_ERR_DEBUG 0 diff --git a/hw/misc/tmp105.c b/hw/misc/tmp105.c index 0c32f6f8b6..19def5c20f 100644 --- a/hw/misc/tmp105.c +++ b/hw/misc/tmp105.c @@ -24,6 +24,7 @@ #include "tmp105.h" #include "qapi/error.h" #include "qapi/visitor.h" +#include "qemu/module.h" static void tmp105_interrupt_update(TMP105State *s) { diff --git a/hw/misc/tmp421.c b/hw/misc/tmp421.c index ce6d40ac9c..69ee5db4b7 100644 --- a/hw/misc/tmp421.c +++ b/hw/misc/tmp421.c @@ -29,6 +29,7 @@ #include "hw/i2c/i2c.h" #include "qapi/error.h" #include "qapi/visitor.h" +#include "qemu/module.h" /* Manufacturer / Device ID's */ #define TMP421_MANUFACTURER_ID 0x55 diff --git a/hw/misc/tz-mpc.c b/hw/misc/tz-mpc.c index 9a84be75ed..45a3e31c3d 100644 --- a/hw/misc/tz-mpc.c +++ b/hw/misc/tz-mpc.c @@ -11,6 +11,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" +#include "qemu/module.h" #include "qapi/error.h" #include "trace.h" #include "hw/sysbus.h" diff --git a/hw/misc/tz-msc.c b/hw/misc/tz-msc.c index 9e352044ea..52b96ba70d 100644 --- a/hw/misc/tz-msc.c +++ b/hw/misc/tz-msc.c @@ -11,6 +11,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" +#include "qemu/module.h" #include "qapi/error.h" #include "trace.h" #include "hw/sysbus.h" diff --git a/hw/misc/tz-ppc.c b/hw/misc/tz-ppc.c index 2e04837bea..2a14a26f29 100644 --- a/hw/misc/tz-ppc.c +++ b/hw/misc/tz-ppc.c @@ -11,6 +11,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" +#include "qemu/module.h" #include "qapi/error.h" #include "trace.h" #include "hw/sysbus.h" diff --git a/hw/misc/unimp.c b/hw/misc/unimp.c index 1c0ba2f0a7..7f8e42cc2c 100644 --- a/hw/misc/unimp.c +++ b/hw/misc/unimp.c @@ -16,6 +16,7 @@ #include "hw/sysbus.h" #include "hw/misc/unimp.h" #include "qemu/log.h" +#include "qemu/module.h" #include "qapi/error.h" static uint64_t unimp_read(void *opaque, hwaddr offset, unsigned size) diff --git a/hw/misc/vmcoreinfo.c b/hw/misc/vmcoreinfo.c index 304c6287c7..987d6f52af 100644 --- a/hw/misc/vmcoreinfo.c +++ b/hw/misc/vmcoreinfo.c @@ -9,8 +9,10 @@ * See the COPYING file in the top-level directory. * */ + #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/module.h" #include "hw/nvram/fw_cfg.h" #include "hw/misc/vmcoreinfo.h" diff --git a/hw/misc/zynq-xadc.c b/hw/misc/zynq-xadc.c index 14906103c9..f1e48601dc 100644 --- a/hw/misc/zynq-xadc.c +++ b/hw/misc/zynq-xadc.c @@ -19,6 +19,7 @@ #include "qemu/timer.h" #include "sysemu/sysemu.h" #include "qemu/log.h" +#include "qemu/module.h" enum { CFG = 0x000 / 4, diff --git a/hw/misc/zynq_slcr.c b/hw/misc/zynq_slcr.c index d6bdd027ef..6b51ae5ff1 100644 --- a/hw/misc/zynq_slcr.c +++ b/hw/misc/zynq_slcr.c @@ -20,6 +20,7 @@ #include "hw/sysbus.h" #include "sysemu/sysemu.h" #include "qemu/log.h" +#include "qemu/module.h" #ifndef ZYNQ_SLCR_ERR_DEBUG #define ZYNQ_SLCR_ERR_DEBUG 0 diff --git a/hw/moxie/moxiesim.c b/hw/moxie/moxiesim.c index eddeed915d..d771d393c2 100644 --- a/hw/moxie/moxiesim.c +++ b/hw/moxie/moxiesim.c @@ -27,7 +27,6 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "hw/sysbus.h" #include "hw/hw.h" diff --git a/hw/net/allwinner_emac.c b/hw/net/allwinner_emac.c index 50e8361e52..eecda52800 100644 --- a/hw/net/allwinner_emac.c +++ b/hw/net/allwinner_emac.c @@ -16,12 +16,14 @@ * GNU General Public License for more details. * */ + #include "qemu/osdep.h" #include "hw/sysbus.h" #include "net/net.h" #include "qemu/fifo8.h" #include "hw/net/allwinner_emac.h" #include "qemu/log.h" +#include "qemu/module.h" #include <zlib.h> static uint8_t padding[60]; diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c index 7f63411430..d412085884 100644 --- a/hw/net/cadence_gem.c +++ b/hw/net/cadence_gem.c @@ -28,6 +28,7 @@ #include "hw/net/cadence_gem.h" #include "qapi/error.h" #include "qemu/log.h" +#include "qemu/module.h" #include "sysemu/dma.h" #include "net/checksum.h" diff --git a/hw/net/can/can_kvaser_pci.c b/hw/net/can/can_kvaser_pci.c index 5f82f4359a..df639f8fa0 100644 --- a/hw/net/can/can_kvaser_pci.c +++ b/hw/net/can/can_kvaser_pci.c @@ -31,6 +31,7 @@ #include "qemu/osdep.h" #include "qemu/event_notifier.h" +#include "qemu/module.h" #include "qemu/thread.h" #include "qemu/sockets.h" #include "qapi/error.h" diff --git a/hw/net/can/can_mioe3680_pci.c b/hw/net/can/can_mioe3680_pci.c index fd20b88955..7af0993d7a 100644 --- a/hw/net/can/can_mioe3680_pci.c +++ b/hw/net/can/can_mioe3680_pci.c @@ -27,6 +27,7 @@ #include "qemu/osdep.h" #include "qemu/event_notifier.h" +#include "qemu/module.h" #include "qemu/thread.h" #include "qemu/sockets.h" #include "qapi/error.h" diff --git a/hw/net/can/can_pcm3680_pci.c b/hw/net/can/can_pcm3680_pci.c index 23f7ff45a3..3f7312af07 100644 --- a/hw/net/can/can_pcm3680_pci.c +++ b/hw/net/can/can_pcm3680_pci.c @@ -27,6 +27,7 @@ #include "qemu/osdep.h" #include "qemu/event_notifier.h" +#include "qemu/module.h" #include "qemu/thread.h" #include "qemu/sockets.h" #include "qapi/error.h" diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c index 98cb4e58c7..bdb0b3b2c2 100644 --- a/hw/net/dp8393x.c +++ b/hw/net/dp8393x.c @@ -21,6 +21,7 @@ #include "hw/sysbus.h" #include "net/net.h" #include "qapi/error.h" +#include "qemu/module.h" #include "qemu/timer.h" #include <zlib.h> diff --git a/hw/net/e1000.c b/hw/net/e1000.c index 121452d508..1dc1466332 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -33,6 +33,7 @@ #include "sysemu/sysemu.h" #include "sysemu/dma.h" #include "qemu/iov.h" +#include "qemu/module.h" #include "qemu/range.h" #include "e1000x_common.h" diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c index 510ddb3897..581f7d03d5 100644 --- a/hw/net/e1000e.c +++ b/hw/net/e1000e.c @@ -37,6 +37,7 @@ #include "qemu/units.h" #include "net/net.h" #include "net/tap.h" +#include "qemu/module.h" #include "qemu/range.h" #include "sysemu/sysemu.h" #include "hw/pci/msi.h" diff --git a/hw/net/e1000e_core.h b/hw/net/e1000e_core.h index 63a15510cc..49abb136dd 100644 --- a/hw/net/e1000e_core.h +++ b/hw/net/e1000e_core.h @@ -33,6 +33,9 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +#ifndef HW_NET_E1000E_CORE_H +#define HW_NET_E1000E_CORE_H + #define E1000E_PHY_PAGE_SIZE (0x20) #define E1000E_PHY_PAGES (0x07) #define E1000E_MAC_SIZE (0x8000) @@ -151,3 +154,5 @@ e1000e_receive_iov(E1000ECore *core, const struct iovec *iov, int iovcnt); void e1000e_start_recv(E1000ECore *core); + +#endif diff --git a/hw/net/e1000x_common.h b/hw/net/e1000x_common.h index 0268884e72..19c56f409f 100644 --- a/hw/net/e1000x_common.h +++ b/hw/net/e1000x_common.h @@ -22,6 +22,9 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +#ifndef HW_NET_E1000X_COMMON_H +#define HW_NET_E1000X_COMMON_H + #include "e1000_regs.h" #define defreg(x) x = (E1000_##x >> 2) @@ -209,3 +212,5 @@ typedef struct e1000x_txd_props { void e1000x_read_tx_ctx_descr(struct e1000_context_desc *d, e1000x_txd_props *props); + +#endif diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c index e761daf551..6607c9142d 100644 --- a/hw/net/eepro100.c +++ b/hw/net/eepro100.c @@ -50,6 +50,7 @@ #include "sysemu/sysemu.h" #include "sysemu/dma.h" #include "qemu/bitops.h" +#include "qemu/module.h" #include "qapi/error.h" /* QEMU sends frames smaller than 60 bytes to ethernet nics. diff --git a/hw/net/etraxfs_eth.c b/hw/net/etraxfs_eth.c index 36855804db..4cfbf1135a 100644 --- a/hw/net/etraxfs_eth.c +++ b/hw/net/etraxfs_eth.c @@ -28,6 +28,7 @@ #include "net/net.h" #include "hw/cris/etraxfs.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "trace.h" #define D(x) diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c index 0b66274ce3..2a8b99a2e4 100644 --- a/hw/net/fsl_etsec/etsec.c +++ b/hw/net/fsl_etsec/etsec.c @@ -33,6 +33,7 @@ #include "etsec.h" #include "registers.h" #include "qemu/log.h" +#include "qemu/module.h" /* #define HEX_DUMP */ /* #define DEBUG_REGISTER */ diff --git a/hw/net/ftgmac100.c b/hw/net/ftgmac100.c index 790430346b..eb760472e5 100644 --- a/hw/net/ftgmac100.c +++ b/hw/net/ftgmac100.c @@ -15,6 +15,7 @@ #include "hw/net/ftgmac100.h" #include "sysemu/dma.h" #include "qemu/log.h" +#include "qemu/module.h" #include "net/checksum.h" #include "net/eth.h" #include "hw/net/mii.h" diff --git a/hw/net/imx_fec.c b/hw/net/imx_fec.c index 6e297c5480..404154ebbf 100644 --- a/hw/net/imx_fec.c +++ b/hw/net/imx_fec.c @@ -25,6 +25,7 @@ #include "hw/net/imx_fec.h" #include "sysemu/dma.h" #include "qemu/log.h" +#include "qemu/module.h" #include "net/checksum.h" #include "net/eth.h" diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c index b29e3fee49..f6120be219 100644 --- a/hw/net/lan9118.c +++ b/hw/net/lan9118.c @@ -18,6 +18,7 @@ #include "sysemu/sysemu.h" #include "hw/ptimer.h" #include "qemu/log.h" +#include "qemu/module.h" /* For crc32 */ #include <zlib.h> diff --git a/hw/net/lance.c b/hw/net/lance.c index f987b2fd18..2978c01d58 100644 --- a/hw/net/lance.c +++ b/hw/net/lance.c @@ -36,6 +36,7 @@ */ #include "qemu/osdep.h" +#include "qemu/module.h" #include "qemu/timer.h" #include "hw/sparc/sparc32_dma.h" #include "hw/net/lance.h" diff --git a/hw/net/mcf_fec.c b/hw/net/mcf_fec.c index 0091e4ecdd..78468fad6b 100644 --- a/hw/net/mcf_fec.c +++ b/hw/net/mcf_fec.c @@ -5,9 +5,11 @@ * * This code is licensed under the GPL */ + #include "qemu/osdep.h" #include "hw/hw.h" #include "net/net.h" +#include "qemu/module.h" #include "hw/m68k/mcf.h" #include "hw/m68k/mcf_fec.h" #include "hw/net/mii.h" diff --git a/hw/net/milkymist-minimac2.c b/hw/net/milkymist-minimac2.c index 85c9fc0b65..41ef7a4456 100644 --- a/hw/net/milkymist-minimac2.c +++ b/hw/net/milkymist-minimac2.c @@ -24,13 +24,13 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" /* FIXME: why does this use TARGET_PAGE_ALIGN? */ #include "hw/hw.h" #include "hw/sysbus.h" #include "trace.h" #include "net/net.h" #include "qemu/log.h" +#include "qemu/module.h" #include "qemu/error-report.h" #include <zlib.h> diff --git a/hw/net/mipsnet.c b/hw/net/mipsnet.c index 5ec13105df..c5fbd8431f 100644 --- a/hw/net/mipsnet.c +++ b/hw/net/mipsnet.c @@ -1,6 +1,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "net/net.h" +#include "qemu/module.h" #include "trace.h" #include "hw/sysbus.h" diff --git a/hw/net/ne2000-isa.c b/hw/net/ne2000-isa.c index c7fdeb0f6c..3490e54c5a 100644 --- a/hw/net/ne2000-isa.c +++ b/hw/net/ne2000-isa.c @@ -21,6 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "hw/isa/isa.h" #include "hw/net/ne2000-isa.h" @@ -29,6 +30,7 @@ #include "sysemu/sysemu.h" #include "qapi/error.h" #include "qapi/visitor.h" +#include "qemu/module.h" #define ISA_NE2000(obj) OBJECT_CHECK(ISANE2000State, (obj), TYPE_ISA_NE2000) diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c index ca792d96f1..1cf4b57341 100644 --- a/hw/net/ne2000.c +++ b/hw/net/ne2000.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 "net/eth.h" +#include "qemu/module.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 d6f54f8d82..a5abb8df46 100644 --- a/hw/net/opencores_eth.c +++ b/hw/net/opencores_eth.c @@ -36,6 +36,7 @@ #include "hw/net/mii.h" #include "hw/sysbus.h" #include "net/net.h" +#include "qemu/module.h" #include "net/eth.h" #include "sysemu/sysemu.h" #include "trace.h" diff --git a/hw/net/pcnet-pci.c b/hw/net/pcnet-pci.c index 7c73855783..600d09ce92 100644 --- a/hw/net/pcnet-pci.c +++ b/hw/net/pcnet-pci.c @@ -30,6 +30,7 @@ #include "qemu/osdep.h" #include "hw/pci/pci.h" #include "net/net.h" +#include "qemu/module.h" #include "qemu/timer.h" #include "sysemu/dma.h" #include "sysemu/sysemu.h" diff --git a/hw/net/rocker/qmp-norocker.c b/hw/net/rocker/qmp-norocker.c index 0d60513c01..5ef4f9324c 100644 --- a/hw/net/rocker/qmp-norocker.c +++ b/hw/net/rocker/qmp-norocker.c @@ -16,7 +16,6 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "qapi/error.h" #include "qapi/qapi-commands-rocker.h" #include "qapi/qmp/qerror.h" diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c index 5266f9b7dd..bd54612f2a 100644 --- a/hw/net/rocker/rocker.c +++ b/hw/net/rocker/rocker.c @@ -24,6 +24,7 @@ #include "qapi/error.h" #include "qapi/qapi-commands-rocker.h" #include "qemu/iov.h" +#include "qemu/module.h" #include "qemu/bitops.h" #include "rocker.h" diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c index 2342a095e3..09273171e5 100644 --- a/hw/net/rtl8139.c +++ b/hw/net/rtl8139.c @@ -49,12 +49,14 @@ */ /* For crc32 */ + #include "qemu/osdep.h" #include <zlib.h> #include "hw/hw.h" #include "hw/pci/pci.h" #include "sysemu/dma.h" +#include "qemu/module.h" #include "qemu/timer.h" #include "net/net.h" #include "net/eth.h" diff --git a/hw/net/smc91c111.c b/hw/net/smc91c111.c index d19ea0750d..4a612eebe9 100644 --- a/hw/net/smc91c111.c +++ b/hw/net/smc91c111.c @@ -12,6 +12,7 @@ #include "net/net.h" #include "hw/net/smc91c111.h" #include "qemu/log.h" +#include "qemu/module.h" /* For crc32 */ #include <zlib.h> diff --git a/hw/net/spapr_llan.c b/hw/net/spapr_llan.c index 63ba3929e9..f162d49025 100644 --- a/hw/net/spapr_llan.c +++ b/hw/net/spapr_llan.c @@ -24,11 +24,12 @@ * THE SOFTWARE. * */ + #include "qemu/osdep.h" -#include "qemu-common.h" #include "cpu.h" #include "hw/hw.h" #include "qemu/log.h" +#include "qemu/module.h" #include "net/net.h" #include "hw/qdev.h" #include "hw/ppc/spapr.h" diff --git a/hw/net/stellaris_enet.c b/hw/net/stellaris_enet.c index b3375ebb45..2f645bfb71 100644 --- a/hw/net/stellaris_enet.c +++ b/hw/net/stellaris_enet.c @@ -6,10 +6,12 @@ * * This code is licensed under the GPL. */ + #include "qemu/osdep.h" #include "hw/sysbus.h" #include "net/net.h" #include "qemu/log.h" +#include "qemu/module.h" #include <zlib.h> //#define DEBUG_STELLARIS_ENET 1 diff --git a/hw/net/sungem.c b/hw/net/sungem.c index 60f1e479f3..89bcf749d1 100644 --- a/hw/net/sungem.c +++ b/hw/net/sungem.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #include "hw/pci/pci.h" #include "qemu/log.h" +#include "qemu/module.h" #include "net/net.h" #include "net/eth.h" #include "net/checksum.h" diff --git a/hw/net/sunhme.c b/hw/net/sunhme.c index 7558fca8f9..1ebaee3c82 100644 --- a/hw/net/sunhme.c +++ b/hw/net/sunhme.c @@ -27,6 +27,7 @@ #include "hw/pci/pci.h" #include "hw/net/mii.h" #include "net/net.h" +#include "qemu/module.h" #include "net/checksum.h" #include "net/eth.h" #include "sysemu/sysemu.h" diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index ffe0872fff..c3f5fccfd1 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/module.h" #include "hw/virtio/virtio.h" #include "net/net.h" #include "net/checksum.h" diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c index 4665dc95ad..10d01d0058 100644 --- a/hw/net/vmxnet3.c +++ b/hw/net/vmxnet3.c @@ -21,8 +21,8 @@ #include "net/tap.h" #include "net/checksum.h" #include "sysemu/sysemu.h" -#include "qemu-common.h" #include "qemu/bswap.h" +#include "qemu/module.h" #include "hw/pci/msix.h" #include "hw/pci/msi.h" #include "migration/register.h" diff --git a/hw/net/vmxnet3_defs.h b/hw/net/vmxnet3_defs.h index 6c19d29b12..65780c576d 100644 --- a/hw/net/vmxnet3_defs.h +++ b/hw/net/vmxnet3_defs.h @@ -12,9 +12,11 @@ * * This work is licensed under the terms of the GNU GPL, version 2. * See the COPYING file in the top-level directory. - * */ +#ifndef HW_NET_VMXNET3_DEFS_H +#define HW_NET_VMXNET3_DEFS_H + #include "net/net.h" #include "hw/net/vmxnet3.h" @@ -131,3 +133,5 @@ typedef struct { /* Compatibility flags for migration */ uint32_t compat_flags; } VMXNET3State; + +#endif diff --git a/hw/net/xgmac.c b/hw/net/xgmac.c index 63f5a62ebf..f49df95b07 100644 --- a/hw/net/xgmac.c +++ b/hw/net/xgmac.c @@ -27,6 +27,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "qemu/log.h" +#include "qemu/module.h" #include "net/net.h" #ifdef DEBUG_XGMAC diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c index cc880a3d08..feeaca680e 100644 --- a/hw/net/xilinx_axienet.c +++ b/hw/net/xilinx_axienet.c @@ -26,6 +26,7 @@ #include "hw/sysbus.h" #include "qapi/error.h" #include "qemu/log.h" +#include "qemu/module.h" #include "net/net.h" #include "net/checksum.h" diff --git a/hw/net/xilinx_ethlite.c b/hw/net/xilinx_ethlite.c index 35de353b7c..8f3a8f8597 100644 --- a/hw/net/xilinx_ethlite.c +++ b/hw/net/xilinx_ethlite.c @@ -23,7 +23,7 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" +#include "qemu/module.h" #include "cpu.h" /* FIXME should not use tswap* */ #include "hw/sysbus.h" #include "hw/hw.h" diff --git a/hw/nios2/10m50_devboard.c b/hw/nios2/10m50_devboard.c index 36b49a420c..2c3388f5cf 100644 --- a/hw/nios2/10m50_devboard.c +++ b/hw/nios2/10m50_devboard.c @@ -24,7 +24,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "hw/sysbus.h" diff --git a/hw/nios2/cpu_pic.c b/hw/nios2/cpu_pic.c index 9e39955bd1..5525e25ff0 100644 --- a/hw/nios2/cpu_pic.c +++ b/hw/nios2/cpu_pic.c @@ -19,7 +19,6 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "cpu.h" #include "qemu/config-file.h" diff --git a/hw/nvram/ds1225y.c b/hw/nvram/ds1225y.c index b6ef463db0..fd49283f41 100644 --- a/hw/nvram/ds1225y.c +++ b/hw/nvram/ds1225y.c @@ -26,6 +26,7 @@ #include "hw/sysbus.h" #include "trace.h" #include "qemu/error-report.h" +#include "qemu/module.h" typedef struct { MemoryRegion iomem; diff --git a/hw/nvram/eeprom_at24c.c b/hw/nvram/eeprom_at24c.c index d1456dafbd..f75a485738 100644 --- a/hw/nvram/eeprom_at24c.c +++ b/hw/nvram/eeprom_at24c.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #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 9f7b7789bc..dcfd6d2ed3 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "qemu-common.h" #include "hw/hw.h" #include "sysemu/sysemu.h" #include "sysemu/dma.h" diff --git a/hw/nvram/mac_nvram.c b/hw/nvram/mac_nvram.c index aef80e64df..a60426c469 100644 --- a/hw/nvram/mac_nvram.c +++ b/hw/nvram/mac_nvram.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 "hw/nvram/chrp_nvram.h" #include "hw/ppc/mac.h" #include "qemu/cutils.h" +#include "qemu/module.h" #include <zlib.h> /* debug NVR */ diff --git a/hw/nvram/nrf51_nvm.c b/hw/nvram/nrf51_nvm.c index 7d94cef1db..eca0cb35b5 100644 --- a/hw/nvram/nrf51_nvm.c +++ b/hw/nvram/nrf51_nvm.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/log.h" +#include "qemu/module.h" #include "exec/address-spaces.h" #include "hw/arm/nrf51.h" #include "hw/nvram/nrf51_nvm.h" diff --git a/hw/nvram/spapr_nvram.c b/hw/nvram/spapr_nvram.c index c98c7576e6..09efd886bf 100644 --- a/hw/nvram/spapr_nvram.c +++ b/hw/nvram/spapr_nvram.c @@ -23,9 +23,9 @@ */ #include "qemu/osdep.h" +#include "qemu/module.h" #include "qemu/units.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include <libfdt.h> diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c index 0a906d815e..87b9feaa96 100644 --- a/hw/openrisc/openrisc_sim.c +++ b/hw/openrisc/openrisc_sim.c @@ -21,7 +21,6 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "hw/hw.h" #include "hw/boards.h" diff --git a/hw/pci-bridge/dec.c b/hw/pci-bridge/dec.c index ca40253730..3ae2f788a4 100644 --- a/hw/pci-bridge/dec.c +++ b/hw/pci-bridge/dec.c @@ -26,6 +26,7 @@ #include "qemu/osdep.h" #include "dec.h" #include "hw/sysbus.h" +#include "qemu/module.h" #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" #include "hw/pci/pci_bridge.h" diff --git a/hw/pci-bridge/dec.h b/hw/pci-bridge/dec.h index ae17ca7362..869e90b136 100644 --- a/hw/pci-bridge/dec.h +++ b/hw/pci-bridge/dec.h @@ -1,7 +1,6 @@ #ifndef HW_PCI_BRIDGE_DEC_H #define HW_PCI_BRIDGE_DEC_H -#include "qemu-common.h" #define TYPE_DEC_21154 "dec-21154-sysbus" diff --git a/hw/pci-bridge/gen_pcie_root_port.c b/hw/pci-bridge/gen_pcie_root_port.c index 26bda73eae..44acda7cb9 100644 --- a/hw/pci-bridge/gen_pcie_root_port.c +++ b/hw/pci-bridge/gen_pcie_root_port.c @@ -12,6 +12,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/module.h" #include "hw/pci/msix.h" #include "hw/pci/pcie_port.h" diff --git a/hw/pci-bridge/i82801b11.c b/hw/pci-bridge/i82801b11.c index 6d8b0f54a7..db77a3541b 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 "qemu/module.h" #include "hw/i386/ich9.h" /*****************************************************************************/ diff --git a/hw/pci-bridge/ioh3420.c b/hw/pci-bridge/ioh3420.c index 81f2de6f07..310af04af9 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 "qemu/module.h" #define PCI_DEVICE_ID_IOH_EPORT 0x3420 /* D0:F0 express mode */ #define PCI_DEVICE_ID_IOH_REV 0x2 diff --git a/hw/pci-bridge/pci_bridge_dev.c b/hw/pci-bridge/pci_bridge_dev.c index c56ed1f52f..5fe96d02b3 100644 --- a/hw/pci-bridge/pci_bridge_dev.c +++ b/hw/pci-bridge/pci_bridge_dev.c @@ -21,6 +21,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/module.h" #include "hw/pci/pci_bridge.h" #include "hw/pci/pci_ids.h" #include "hw/pci/msi.h" diff --git a/hw/pci-bridge/pci_expander_bridge.c b/hw/pci-bridge/pci_expander_bridge.c index ca66bc721a..aecf3d7ddf 100644 --- a/hw/pci-bridge/pci_expander_bridge.c +++ b/hw/pci-bridge/pci_expander_bridge.c @@ -18,6 +18,7 @@ #include "hw/pci/pci_bridge.h" #include "qemu/range.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "sysemu/numa.h" #define TYPE_PXB_BUS "pxb-bus" diff --git a/hw/pci-bridge/pcie_pci_bridge.c b/hw/pci-bridge/pcie_pci_bridge.c index 9a4fba413a..d0bfa0189a 100644 --- a/hw/pci-bridge/pcie_pci_bridge.c +++ b/hw/pci-bridge/pcie_pci_bridge.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/module.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bus.h" #include "hw/pci/pci_bridge.h" diff --git a/hw/pci-bridge/pcie_root_port.c b/hw/pci-bridge/pcie_root_port.c index be3f4d5e03..92f253c924 100644 --- a/hw/pci-bridge/pcie_root_port.c +++ b/hw/pci-bridge/pcie_root_port.c @@ -14,6 +14,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/module.h" #include "hw/pci/pcie_port.h" static void rp_aer_vector_update(PCIDevice *d) diff --git a/hw/pci-bridge/simba.c b/hw/pci-bridge/simba.c index 7cf0d6e047..ba55ab1939 100644 --- a/hw/pci-bridge/simba.c +++ b/hw/pci-bridge/simba.c @@ -28,6 +28,7 @@ #include "hw/pci/pci.h" #include "hw/pci/pci_bridge.h" #include "hw/pci/pci_bus.h" +#include "qemu/module.h" #include "hw/pci-bridge/simba.h" /* diff --git a/hw/pci-bridge/xio3130_downstream.c b/hw/pci-bridge/xio3130_downstream.c index ab2a51e15d..264e37d6a6 100644 --- a/hw/pci-bridge/xio3130_downstream.c +++ b/hw/pci-bridge/xio3130_downstream.c @@ -25,6 +25,7 @@ #include "hw/pci/pcie.h" #include "hw/pci/pcie_port.h" #include "qapi/error.h" +#include "qemu/module.h" #define PCI_DEVICE_ID_TI_XIO3130D 0x8233 /* downstream port */ #define XIO3130_REVISION 0x1 diff --git a/hw/pci-bridge/xio3130_upstream.c b/hw/pci-bridge/xio3130_upstream.c index 1d41a49ab0..b8cb31355f 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 "qemu/module.h" #define PCI_DEVICE_ID_TI_XIO3130U 0x8232 /* upstream port */ #define XIO3130_REVISION 0x2 diff --git a/hw/pci-host/designware.c b/hw/pci-host/designware.c index 64ad21d295..0fdfff5784 100644 --- a/hw/pci-host/designware.c +++ b/hw/pci-host/designware.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/module.h" #include "hw/pci/msi.h" #include "hw/pci/pci_bridge.h" #include "hw/pci/pci_host.h" diff --git a/hw/pci-host/gpex.c b/hw/pci-host/gpex.c index 1bafffcc34..629d1a4624 100644 --- a/hw/pci-host/gpex.c +++ b/hw/pci-host/gpex.c @@ -28,10 +28,12 @@ * http://www.kernel.org/doc/Documentation/devicetree/bindings/pci/host-generic-pci.txt * http://www.firmware.org/1275/practice/imap/imap0_9d.pdf */ + #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/hw.h" #include "hw/pci-host/gpex.h" +#include "qemu/module.h" /**************************************************************************** * GPEX host diff --git a/hw/pci-host/grackle.c b/hw/pci-host/grackle.c index 5a151e93e9..ed3b3c361f 100644 --- a/hw/pci-host/grackle.c +++ b/hw/pci-host/grackle.c @@ -29,6 +29,7 @@ #include "hw/pci/pci.h" #include "hw/intc/heathrow_pic.h" #include "qapi/error.h" +#include "qemu/module.h" #include "trace.h" #define GRACKLE_PCI_HOST_BRIDGE(obj) \ diff --git a/hw/pci-host/ppce500.c b/hw/pci-host/ppce500.c index b8f8c112e6..21eaa30a20 100644 --- a/hw/pci-host/ppce500.c +++ b/hw/pci-host/ppce500.c @@ -20,6 +20,7 @@ #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" #include "qemu/bswap.h" +#include "qemu/module.h" #include "hw/pci-host/ppce500.h" #ifdef DEBUG_PCI diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c index 8b9e1fd0d3..c564f234af 100644 --- a/hw/pci-host/prep.c +++ b/hw/pci-host/prep.c @@ -24,6 +24,7 @@ */ #include "qemu/osdep.h" +#include "qemu-common.h" #include "qemu/units.h" #include "qapi/error.h" #include "hw/hw.h" diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index 960939f5ed..172b0bc435 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -27,11 +27,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 "hw/pci-host/q35.h" #include "qapi/error.h" #include "qapi/visitor.h" +#include "qemu/module.h" /**************************************************************************** * Q35 host diff --git a/hw/pci-host/sabre.c b/hw/pci-host/sabre.c index e33bd46967..2cec1116af 100644 --- a/hw/pci-host/sabre.c +++ b/hw/pci-host/sabre.c @@ -35,6 +35,7 @@ #include "sysemu/sysemu.h" #include "exec/address-spaces.h" #include "qemu/log.h" +#include "qemu/module.h" #include "trace.h" /* diff --git a/hw/pci-host/uninorth.c b/hw/pci-host/uninorth.c index 1378c5c7fb..680fefd066 100644 --- a/hw/pci-host/uninorth.c +++ b/hw/pci-host/uninorth.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/ppc/mac.h" +#include "qemu/module.h" #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" #include "hw/pci-host/uninorth.h" diff --git a/hw/pci-host/versatile.c b/hw/pci-host/versatile.c index 7b19078c80..791b321ea0 100644 --- a/hw/pci-host/versatile.c +++ b/hw/pci-host/versatile.c @@ -13,6 +13,7 @@ #include "hw/pci/pci_bus.h" #include "hw/pci/pci_host.h" #include "qemu/log.h" +#include "qemu/module.h" /* Old and buggy versions of QEMU used the wrong mapping from * PCI IRQs to system interrupt lines. Unfortunately the Linux diff --git a/hw/pci-host/xilinx-pcie.c b/hw/pci-host/xilinx-pcie.c index ceb00e23e6..192b697453 100644 --- a/hw/pci-host/xilinx-pcie.c +++ b/hw/pci-host/xilinx-pcie.c @@ -18,6 +18,7 @@ */ #include "qemu/osdep.h" +#include "qemu/module.h" #include "qemu/units.h" #include "qapi/error.h" #include "hw/pci/pci_bridge.h" diff --git a/hw/pci/pci.c b/hw/pci/pci.c index d3893bdfe1..8076a80ab3 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "qemu-common.h" #include "hw/hw.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bridge.h" diff --git a/hw/pci/pci_bridge.c b/hw/pci/pci_bridge.c index 8d954885c0..715b9a4fe6 100644 --- a/hw/pci/pci_bridge.c +++ b/hw/pci/pci_bridge.c @@ -32,6 +32,7 @@ #include "qemu/osdep.h" #include "hw/pci/pci_bridge.h" #include "hw/pci/pci_bus.h" +#include "qemu/module.h" #include "qemu/range.h" #include "qapi/error.h" diff --git a/hw/pci/pci_host.c b/hw/pci/pci_host.c index 5f3497256c..c5f9244934 100644 --- a/hw/pci/pci_host.c +++ b/hw/pci/pci_host.c @@ -22,6 +22,7 @@ #include "hw/pci/pci.h" #include "hw/pci/pci_bridge.h" #include "hw/pci/pci_host.h" +#include "qemu/module.h" #include "hw/pci/pci_bus.h" #include "trace.h" diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c index cf1ca30f93..88c30ff74c 100644 --- a/hw/pci/pcie.c +++ b/hw/pci/pcie.c @@ -20,7 +20,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "hw/pci/pci_bridge.h" #include "hw/pci/pcie.h" #include "hw/pci/msix.h" diff --git a/hw/pci/pcie_host.c b/hw/pci/pcie_host.c index 1ee4945a6d..d6768b8eb6 100644 --- a/hw/pci/pcie_host.c +++ b/hw/pci/pcie_host.c @@ -23,6 +23,7 @@ #include "hw/hw.h" #include "hw/pci/pci.h" #include "hw/pci/pcie_host.h" +#include "qemu/module.h" #include "exec/address-spaces.h" /* a helper function to get a PCIDevice for a given mmconfig address */ diff --git a/hw/pci/pcie_port.c b/hw/pci/pcie_port.c index a30291ef54..c9c3ba540a 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 "qemu/module.h" #include "hw/hotplug.h" void pcie_port_init_reg(PCIDevice *d) diff --git a/hw/pci/shpc.c b/hw/pci/shpc.c index 49bbb841bd..5a10c6e9a5 100644 --- a/hw/pci/shpc.c +++ b/hw/pci/shpc.c @@ -1,6 +1,5 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "qemu/host-utils.h" #include "qemu/range.h" #include "qemu/error-report.h" diff --git a/hw/pcmcia/pcmcia.c b/hw/pcmcia/pcmcia.c index 195672186a..c16b12db01 100644 --- a/hw/pcmcia/pcmcia.c +++ b/hw/pcmcia/pcmcia.c @@ -5,7 +5,7 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" +#include "qemu/module.h" #include "hw/hw.h" #include "hw/pcmcia.h" diff --git a/hw/pcmcia/pxa2xx.c b/hw/pcmcia/pxa2xx.c index 20c9c753d2..8993b784bb 100644 --- a/hw/pcmcia/pxa2xx.c +++ b/hw/pcmcia/pxa2xx.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/sysbus.h" +#include "qemu/module.h" #include "hw/pcmcia.h" #include "hw/arm/pxa.h" diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index beb2efd694..bfda1266af 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -15,6 +15,7 @@ */ #include "qemu/osdep.h" +#include "qemu-common.h" #include "qemu/units.h" #include "qapi/error.h" #include "e500.h" diff --git a/hw/ppc/e500plat.c b/hw/ppc/e500plat.c index 963d429cc8..2b82a58592 100644 --- a/hw/ppc/e500plat.c +++ b/hw/ppc/e500plat.c @@ -11,7 +11,6 @@ #include "qemu/osdep.h" #include "qemu/units.h" -#include "qemu-common.h" #include "e500.h" #include "hw/net/fsl_etsec/etsec.h" #include "hw/boards.h" diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index 02d8559621..4d835f32b5 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -44,9 +44,10 @@ * 0001:03:0e.0 FireWire (IEEE 1394) [0c00]: Apple Computer Inc. K2 FireWire [106b:0042] * 0001:04:0f.0 Ethernet controller [0200]: Apple Computer Inc. K2 GMAC (Sun GEM) [106b:004c] * 0001:05:0c.0 IDE interface [0101]: Broadcom K2 SATA [1166:0240] - * */ + #include "qemu/osdep.h" +#include "qemu-common.h" #include "qapi/error.h" #include "hw/hw.h" #include "hw/ppc/ppc.h" diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c index 460cbc7923..eddd005a7c 100644 --- a/hw/ppc/mac_oldworld.c +++ b/hw/ppc/mac_oldworld.c @@ -23,7 +23,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" +#include "qemu-common.h" #include "qemu/units.h" #include "qapi/error.h" #include "hw/hw.h" diff --git a/hw/ppc/mpc8544_guts.c b/hw/ppc/mpc8544_guts.c index ce1254b5d4..2b7cc14060 100644 --- a/hw/ppc/mpc8544_guts.c +++ b/hw/ppc/mpc8544_guts.c @@ -18,7 +18,7 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" +#include "qemu/module.h" #include "cpu.h" #include "hw/hw.h" #include "sysemu/sysemu.h" diff --git a/hw/ppc/mpc8544ds.c b/hw/ppc/mpc8544ds.c index ab30a2a99e..6a4657c3cd 100644 --- a/hw/ppc/mpc8544ds.c +++ b/hw/ppc/mpc8544ds.c @@ -10,7 +10,6 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "e500.h" #include "hw/boards.h" #include "sysemu/device_tree.h" diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index ed68924667..9db43916ac 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -18,6 +18,7 @@ */ #include "qemu/osdep.h" +#include "qemu-common.h" #include "qemu/units.h" #include "qapi/error.h" #include "sysemu/sysemu.h" diff --git a/hw/ppc/pnv_core.c b/hw/ppc/pnv_core.c index 5feeed6bc4..c6411ecc1d 100644 --- a/hw/ppc/pnv_core.c +++ b/hw/ppc/pnv_core.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 <http://www.gnu.org/licenses/>. */ + #include "qemu/osdep.h" #include "sysemu/sysemu.h" #include "qapi/error.h" #include "qemu/log.h" +#include "qemu/module.h" #include "target/ppc/cpu.h" #include "hw/ppc/ppc.h" #include "hw/ppc/pnv.h" diff --git a/hw/ppc/pnv_lpc.c b/hw/ppc/pnv_lpc.c index 641e2046db..a9f150c3ca 100644 --- a/hw/ppc/pnv_lpc.c +++ b/hw/ppc/pnv_lpc.c @@ -22,6 +22,7 @@ #include "target/ppc/cpu.h" #include "qapi/error.h" #include "qemu/log.h" +#include "qemu/module.h" #include "hw/isa/isa.h" #include "hw/ppc/pnv.h" diff --git a/hw/ppc/pnv_occ.c b/hw/ppc/pnv_occ.c index fdd9296e1b..636f91f311 100644 --- a/hw/ppc/pnv_occ.c +++ b/hw/ppc/pnv_occ.c @@ -22,6 +22,7 @@ #include "target/ppc/cpu.h" #include "qapi/error.h" #include "qemu/log.h" +#include "qemu/module.h" #include "hw/ppc/pnv.h" #include "hw/ppc/pnv_xscom.h" diff --git a/hw/ppc/pnv_psi.c b/hw/ppc/pnv_psi.c index 5345c8389e..d7b6f5d75b 100644 --- a/hw/ppc/pnv_psi.c +++ b/hw/ppc/pnv_psi.c @@ -21,6 +21,7 @@ #include "hw/hw.h" #include "target/ppc/cpu.h" #include "qemu/log.h" +#include "qemu/module.h" #include "qapi/error.h" #include "monitor/monitor.h" diff --git a/hw/ppc/pnv_xscom.c b/hw/ppc/pnv_xscom.c index f53a6d7a94..4e52885c9e 100644 --- a/hw/ppc/pnv_xscom.c +++ b/hw/ppc/pnv_xscom.c @@ -16,9 +16,11 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ + #include "qemu/osdep.h" #include "hw/hw.h" #include "qemu/log.h" +#include "qemu/module.h" #include "sysemu/hw_accel.h" #include "target/ppc/cpu.h" #include "hw/sysbus.h" diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c index debcdab993..9d91e8481b 100644 --- a/hw/ppc/ppc.c +++ b/hw/ppc/ppc.c @@ -22,7 +22,6 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "cpu.h" #include "hw/hw.h" #include "hw/ppc/ppc.h" diff --git a/hw/ppc/ppc405_uc.c b/hw/ppc/ppc405_uc.c index 018dcca888..edb6b2d190 100644 --- a/hw/ppc/ppc405_uc.c +++ b/hw/ppc/ppc405_uc.c @@ -24,7 +24,6 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "hw/hw.h" #include "hw/ppc/ppc.h" diff --git a/hw/ppc/ppc440_pcix.c b/hw/ppc/ppc440_pcix.c index 42ef76b6f5..ca54631f9d 100644 --- a/hw/ppc/ppc440_pcix.c +++ b/hw/ppc/ppc440_pcix.c @@ -22,6 +22,7 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" #include "qemu/log.h" +#include "qemu/module.h" #include "hw/hw.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 9130eb314c..5c1a53d6e7 100644 --- a/hw/ppc/ppc440_uc.c +++ b/hw/ppc/ppc440_uc.c @@ -10,10 +10,10 @@ #include "qemu/osdep.h" #include "qemu/units.h" -#include "qemu-common.h" #include "qemu/error-report.h" #include "qapi/error.h" #include "qemu/log.h" +#include "qemu/module.h" #include "cpu.h" #include "hw/hw.h" #include "exec/address-spaces.h" diff --git a/hw/ppc/ppc4xx_pci.c b/hw/ppc/ppc4xx_pci.c index 86981be710..e7cf8d50a5 100644 --- a/hw/ppc/ppc4xx_pci.c +++ b/hw/ppc/ppc4xx_pci.c @@ -23,6 +23,7 @@ #include "hw/hw.h" #include "hw/ppc/ppc.h" #include "hw/ppc/ppc4xx.h" +#include "qemu/module.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 323413e074..18d1457581 100644 --- a/hw/ppc/ppc_booke.c +++ b/hw/ppc/ppc_booke.c @@ -22,7 +22,6 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "cpu.h" #include "hw/hw.h" #include "hw/ppc/ppc.h" diff --git a/hw/ppc/ppce500_spin.c b/hw/ppc/ppce500_spin.c index c45fc858de..0060fcb43f 100644 --- a/hw/ppc/ppce500_spin.c +++ b/hw/ppc/ppce500_spin.c @@ -28,6 +28,7 @@ */ #include "qemu/osdep.h" +#include "qemu/module.h" #include "qemu/units.h" #include "hw/hw.h" #include "hw/sysbus.h" diff --git a/hw/ppc/prep_systemio.c b/hw/ppc/prep_systemio.c index 50893ec529..df7603b986 100644 --- a/hw/ppc/prep_systemio.c +++ b/hw/ppc/prep_systemio.c @@ -26,6 +26,7 @@ #include "hw/isa/isa.h" #include "exec/address-spaces.h" #include "qemu/error-report.h" /* for error_report() */ +#include "qemu/module.h" #include "sysemu/sysemu.h" /* for vm_stop() */ #include "cpu.h" #include "trace.h" diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 6dd8aaac33..b502fcac2e 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -22,9 +22,10 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. - * */ + #include "qemu/osdep.h" +#include "qemu-common.h" #include "qapi/error.h" #include "qapi/visitor.h" #include "sysemu/sysemu.h" diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c index 31b4661399..bbb001f84a 100644 --- a/hw/ppc/spapr_caps.c +++ b/hw/ppc/spapr_caps.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/error-report.h" #include "qapi/error.h" @@ -32,6 +33,7 @@ #include "cpu-models.h" #include "kvm_ppc.h" #include "sysemu/qtest.h" +#include "sysemu/tcg.h" #include "hw/ppc/spapr.h" diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index 0a050ad3d8..6808d4cda8 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/module.h" #include "qemu/error-report.h" #include "cpu.h" #include "exec/exec-all.h" diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c index 5aff4d5a05..bd3d0256a6 100644 --- a/hw/ppc/spapr_iommu.c +++ b/hw/ppc/spapr_iommu.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 <http://www.gnu.org/licenses/>. */ + #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" #include "hw/qdev.h" #include "kvm_ppc.h" diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index c8d7838385..957ae88bbd 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -22,9 +22,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "hw/hw.h" #include "hw/sysbus.h" @@ -39,6 +39,7 @@ #include <libfdt.h> #include "trace.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "qapi/qmp/qerror.h" #include "hw/ppc/fdt.h" #include "hw/pci/pci_bridge.h" diff --git a/hw/ppc/spapr_pci_vfio.c b/hw/ppc/spapr_pci_vfio.c index 5f5dde567d..ecb34aaade 100644 --- a/hw/ppc/spapr_pci_vfio.c +++ b/hw/ppc/spapr_pci_vfio.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include <linux/vfio.h> -#include "qemu-common.h" #include "cpu.h" #include "hw/ppc/spapr.h" #include "hw/pci-host/spapr.h" diff --git a/hw/ppc/spapr_rng.c b/hw/ppc/spapr_rng.c index 4060987590..0e1c7ebcf8 100644 --- a/hw/ppc/spapr_rng.c +++ b/hw/ppc/spapr_rng.c @@ -19,9 +19,9 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "sysemu/sysemu.h" #include "sysemu/device_tree.h" #include "sysemu/rng.h" diff --git a/hw/ppc/spapr_rtas_ddw.c b/hw/ppc/spapr_rtas_ddw.c index f6538189f4..3501b05819 100644 --- a/hw/ppc/spapr_rtas_ddw.c +++ b/hw/ppc/spapr_rtas_ddw.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "cpu.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "hw/ppc/spapr.h" #include "hw/pci-host/spapr.h" #include "trace.h" diff --git a/hw/ppc/spapr_rtc.c b/hw/ppc/spapr_rtc.c index d732a3ea95..af1ef30a53 100644 --- a/hw/ppc/spapr_rtc.c +++ b/hw/ppc/spapr_rtc.c @@ -26,6 +26,7 @@ */ #include "qemu/osdep.h" +#include "qemu-common.h" #include "cpu.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" @@ -33,6 +34,7 @@ #include "qapi/error.h" #include "qapi/qapi-events-target.h" #include "qemu/cutils.h" +#include "qemu/module.h" void spapr_rtc_read(SpaprRtcState *rtc, struct tm *tm, uint32_t *ns) { diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c index 0e4c7409e0..834053a7d2 100644 --- a/hw/ppc/virtex_ml507.c +++ b/hw/ppc/virtex_ml507.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "qemu-common.h" #include "qemu/units.h" #include "cpu.h" #include "hw/sysbus.h" diff --git a/hw/rdma/vmw/pvrdma_main.c b/hw/rdma/vmw/pvrdma_main.c index 769f7990f8..adcf79cd63 100644 --- a/hw/rdma/vmw/pvrdma_main.c +++ b/hw/rdma/vmw/pvrdma_main.c @@ -15,6 +15,7 @@ #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" diff --git a/hw/riscv/riscv_hart.c b/hw/riscv/riscv_hart.c index e34a26a0ef..ca69a1bcd8 100644 --- a/hw/riscv/riscv_hart.c +++ b/hw/riscv/riscv_hart.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/module.h" #include "hw/sysbus.h" #include "target/riscv/cpu.h" #include "hw/riscv/riscv_hart.h" diff --git a/hw/riscv/sifive_clint.c b/hw/riscv/sifive_clint.c index d4c159e937..591d70deb3 100644 --- a/hw/riscv/sifive_clint.c +++ b/hw/riscv/sifive_clint.c @@ -21,6 +21,7 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "hw/sysbus.h" #include "target/riscv/cpu.h" #include "hw/riscv/sifive_clint.h" diff --git a/hw/riscv/sifive_plic.c b/hw/riscv/sifive_plic.c index 07a032d93d..70a4413599 100644 --- a/hw/riscv/sifive_plic.c +++ b/hw/riscv/sifive_plic.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" +#include "qemu/module.h" #include "qemu/error-report.h" #include "hw/sysbus.h" #include "hw/pci/msi.h" diff --git a/hw/riscv/sifive_prci.c b/hw/riscv/sifive_prci.c index 0910ea32c1..fa136b5a9f 100644 --- a/hw/riscv/sifive_prci.c +++ b/hw/riscv/sifive_prci.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "qemu/module.h" #include "target/riscv/cpu.h" #include "hw/riscv/sifive_prci.h" diff --git a/hw/riscv/sifive_test.c b/hw/riscv/sifive_test.c index 8abd2cd525..24a04d7b36 100644 --- a/hw/riscv/sifive_test.c +++ b/hw/riscv/sifive_test.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "qemu/module.h" #include "target/riscv/cpu.h" #include "hw/riscv/sifive_test.h" diff --git a/hw/s390x/ap-bridge.c b/hw/s390x/ap-bridge.c index 75ad0a66b9..9284de4eec 100644 --- a/hw/s390x/ap-bridge.c +++ b/hw/s390x/ap-bridge.c @@ -7,10 +7,12 @@ * your option) any later version. See the COPYING file in the top-level * directory. */ + #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/sysbus.h" #include "qemu/bitops.h" +#include "qemu/module.h" #include "hw/s390x/ap-bridge.h" #include "cpu.h" diff --git a/hw/s390x/ccw-device.c b/hw/s390x/ccw-device.c index 7cd73df4aa..24f17bb6ca 100644 --- a/hw/s390x/ccw-device.c +++ b/hw/s390x/ccw-device.c @@ -8,8 +8,10 @@ * your option) any later version. See the COPYING file in the top-level * directory. */ + #include "qemu/osdep.h" #include "ccw-device.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 e04d51b191..4e9ff481e8 100644 --- a/hw/s390x/css-bridge.c +++ b/hw/s390x/css-bridge.c @@ -9,11 +9,13 @@ * your option) any later version. See the COPYING file in the top-level * directory. */ + #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/hotplug.h" #include "hw/sysbus.h" #include "qemu/bitops.h" +#include "qemu/module.h" #include "hw/s390x/css.h" #include "ccw-device.h" #include "hw/s390x/css-bridge.h" diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c index e574223a22..61f3b74714 100644 --- a/hw/s390x/event-facility.c +++ b/hw/s390x/event-facility.c @@ -17,6 +17,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/module.h" #include "sysemu/sysemu.h" #include "hw/s390x/sclp.h" diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index b93750c14e..60bd081d3e 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -12,8 +12,10 @@ */ #include "qemu/osdep.h" +#include "qemu-common.h" #include "qapi/error.h" #include "sysemu/sysemu.h" +#include "sysemu/tcg.h" #include "cpu.h" #include "elf.h" #include "hw/loader.h" diff --git a/hw/s390x/s390-ccw.c b/hw/s390x/s390-ccw.c index f5f025d1b6..8403f0e3e9 100644 --- a/hw/s390x/s390-ccw.c +++ b/hw/s390x/s390-ccw.c @@ -14,6 +14,7 @@ #include "qemu/osdep.h" #include <libgen.h> #include "qapi/error.h" +#include "qemu/module.h" #include "hw/sysbus.h" #include "hw/s390x/css.h" #include "hw/s390x/css-bridge.h" diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c index 2d0a28d544..2c6e084e2c 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -14,7 +14,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qapi/visitor.h" -#include "qemu-common.h" #include "cpu.h" #include "s390-pci-bus.h" #include "s390-pci-inst.h" @@ -22,6 +21,7 @@ #include "hw/pci/pci_bridge.h" #include "hw/pci/msi.h" #include "qemu/error-report.h" +#include "qemu/module.h" #ifndef DEBUG_S390PCI_BUS #define DEBUG_S390PCI_BUS 0 diff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c index be2896232d..61f30b8e55 100644 --- a/hw/s390x/s390-pci-inst.c +++ b/hw/s390x/s390-pci-inst.c @@ -12,7 +12,6 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "cpu.h" #include "s390-pci-inst.h" #include "s390-pci-bus.h" diff --git a/hw/s390x/s390-skeys-kvm.c b/hw/s390x/s390-skeys-kvm.c index dc54ed8b11..1c4d805ad8 100644 --- a/hw/s390x/s390-skeys-kvm.c +++ b/hw/s390x/s390-skeys-kvm.c @@ -13,6 +13,7 @@ #include "hw/s390x/storage-keys.h" #include "sysemu/kvm.h" #include "qemu/error-report.h" +#include "qemu/module.h" static int kvm_s390_skeys_enabled(S390SKeysState *ss) { diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 4d643686cb..87b2039f1b 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -23,6 +23,7 @@ #include "hw/s390x/css.h" #include "virtio-ccw.h" #include "qemu/config-file.h" +#include "qemu/ctype.h" #include "qemu/error-report.h" #include "qemu/option.h" #include "s390-pci-bus.h" diff --git a/hw/s390x/sclpcpu.c b/hw/s390x/sclpcpu.c index 50c021b9c2..a4aab7df51 100644 --- a/hw/s390x/sclpcpu.c +++ b/hw/s390x/sclpcpu.c @@ -12,9 +12,11 @@ * option) any later version. See the COPYING file in the top-level directory. * */ + #include "qemu/osdep.h" #include "sysemu/sysemu.h" #include "hw/s390x/sclp.h" +#include "qemu/module.h" #include "hw/s390x/event-facility.h" #include "cpu.h" #include "sysemu/cpus.h" diff --git a/hw/s390x/sclpquiesce.c b/hw/s390x/sclpquiesce.c index 1c8f5c9393..4f73471537 100644 --- a/hw/s390x/sclpquiesce.c +++ b/hw/s390x/sclpquiesce.c @@ -11,10 +11,12 @@ * option) any later version. See the COPYING file in the top-level directory. * */ + #include "qemu/osdep.h" #include "hw/qdev.h" #include "sysemu/sysemu.h" #include "hw/s390x/sclp.h" +#include "qemu/module.h" #include "hw/s390x/event-facility.h" typedef struct SignalQuiesce { diff --git a/hw/s390x/tod-kvm.c b/hw/s390x/tod-kvm.c index 2456bf7b24..bebe4744af 100644 --- a/hw/s390x/tod-kvm.c +++ b/hw/s390x/tod-kvm.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/module.h" #include "sysemu/sysemu.h" #include "hw/s390x/tod.h" #include "kvm_s390x.h" diff --git a/hw/s390x/tod-qemu.c b/hw/s390x/tod-qemu.c index 59c015c69d..e91b9590f5 100644 --- a/hw/s390x/tod-qemu.c +++ b/hw/s390x/tod-qemu.c @@ -9,10 +9,12 @@ */ #include "qemu/osdep.h" +#include "qemu-common.h" #include "qapi/error.h" #include "hw/s390x/tod.h" #include "qemu/timer.h" #include "qemu/cutils.h" +#include "qemu/module.h" #include "cpu.h" #include "tcg_s390x.h" diff --git a/hw/s390x/tod.c b/hw/s390x/tod.c index 1c63f411e6..a9fca8eb0b 100644 --- a/hw/s390x/tod.c +++ b/hw/s390x/tod.c @@ -12,6 +12,7 @@ #include "hw/s390x/tod.h" #include "qapi/error.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "sysemu/kvm.h" #include "migration/register.h" diff --git a/hw/s390x/vhost-vsock-ccw.c b/hw/s390x/vhost-vsock-ccw.c index cddc5cf652..076f733390 100644 --- a/hw/s390x/vhost-vsock-ccw.c +++ b/hw/s390x/vhost-vsock-ccw.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" +#include "qemu/module.h" #include "virtio-ccw.h" static Property vhost_vsock_ccw_properties[] = { diff --git a/hw/s390x/virtio-ccw-9p.c b/hw/s390x/virtio-ccw-9p.c index d6be172596..67b2c537cc 100644 --- a/hw/s390x/virtio-ccw-9p.c +++ b/hw/s390x/virtio-ccw-9p.c @@ -12,6 +12,7 @@ #include "qemu/osdep.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" +#include "qemu/module.h" #include "virtio-ccw.h" static void virtio_ccw_9p_realize(VirtioCcwDevice *ccw_dev, Error **errp) diff --git a/hw/s390x/virtio-ccw-balloon.c b/hw/s390x/virtio-ccw-balloon.c index 28d171ac0c..35e43e89fb 100644 --- a/hw/s390x/virtio-ccw-balloon.c +++ b/hw/s390x/virtio-ccw-balloon.c @@ -12,6 +12,7 @@ #include "qemu/osdep.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" +#include "qemu/module.h" #include "virtio-ccw.h" static void virtio_ccw_balloon_realize(VirtioCcwDevice *ccw_dev, Error **errp) diff --git a/hw/s390x/virtio-ccw-blk.c b/hw/s390x/virtio-ccw-blk.c index 1f3d09a75a..83636cb6d7 100644 --- a/hw/s390x/virtio-ccw-blk.c +++ b/hw/s390x/virtio-ccw-blk.c @@ -12,6 +12,7 @@ #include "qemu/osdep.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" +#include "qemu/module.h" #include "virtio-ccw.h" static void virtio_ccw_blk_realize(VirtioCcwDevice *ccw_dev, Error **errp) diff --git a/hw/s390x/virtio-ccw-crypto.c b/hw/s390x/virtio-ccw-crypto.c index aab6a958f2..4569fe0649 100644 --- a/hw/s390x/virtio-ccw-crypto.c +++ b/hw/s390x/virtio-ccw-crypto.c @@ -11,6 +11,7 @@ #include "qemu/osdep.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" +#include "qemu/module.h" #include "virtio-ccw.h" static void virtio_ccw_crypto_realize(VirtioCcwDevice *ccw_dev, Error **errp) diff --git a/hw/s390x/virtio-ccw-gpu.c b/hw/s390x/virtio-ccw-gpu.c index 71869b7fbd..10ee4b86eb 100644 --- a/hw/s390x/virtio-ccw-gpu.c +++ b/hw/s390x/virtio-ccw-gpu.c @@ -11,6 +11,7 @@ #include "qemu/osdep.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" +#include "qemu/module.h" #include "virtio-ccw.h" static void virtio_ccw_gpu_realize(VirtioCcwDevice *ccw_dev, Error **errp) diff --git a/hw/s390x/virtio-ccw-input.c b/hw/s390x/virtio-ccw-input.c index 79c87cb3f2..075bb094ee 100644 --- a/hw/s390x/virtio-ccw-input.c +++ b/hw/s390x/virtio-ccw-input.c @@ -11,6 +11,7 @@ #include "qemu/osdep.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" +#include "qemu/module.h" #include "virtio-ccw.h" static void virtio_ccw_input_realize(VirtioCcwDevice *ccw_dev, Error **errp) diff --git a/hw/s390x/virtio-ccw-net.c b/hw/s390x/virtio-ccw-net.c index 0c0410c643..8ff184265e 100644 --- a/hw/s390x/virtio-ccw-net.c +++ b/hw/s390x/virtio-ccw-net.c @@ -12,6 +12,7 @@ #include "qemu/osdep.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" +#include "qemu/module.h" #include "virtio-ccw.h" static void virtio_ccw_net_realize(VirtioCcwDevice *ccw_dev, Error **errp) diff --git a/hw/s390x/virtio-ccw-rng.c b/hw/s390x/virtio-ccw-rng.c index 3f6abccef8..dc60f084a5 100644 --- a/hw/s390x/virtio-ccw-rng.c +++ b/hw/s390x/virtio-ccw-rng.c @@ -12,6 +12,7 @@ #include "qemu/osdep.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" +#include "qemu/module.h" #include "virtio-ccw.h" static void virtio_ccw_rng_realize(VirtioCcwDevice *ccw_dev, Error **errp) diff --git a/hw/s390x/virtio-ccw-scsi.c b/hw/s390x/virtio-ccw-scsi.c index c9a804fa25..26fa086ef0 100644 --- a/hw/s390x/virtio-ccw-scsi.c +++ b/hw/s390x/virtio-ccw-scsi.c @@ -12,6 +12,7 @@ #include "qemu/osdep.h" #include "hw/virtio/virtio.h" #include "qapi/error.h" +#include "qemu/module.h" #include "virtio-ccw.h" static void virtio_ccw_scsi_realize(VirtioCcwDevice *ccw_dev, Error **errp) diff --git a/hw/s390x/virtio-ccw-serial.c b/hw/s390x/virtio-ccw-serial.c index 3851fc9c9b..8cf5a529a5 100644 --- a/hw/s390x/virtio-ccw-serial.c +++ b/hw/s390x/virtio-ccw-serial.c @@ -11,6 +11,7 @@ #include "qemu/osdep.h" #include "hw/virtio/virtio.h" +#include "qemu/module.h" #include "hw/virtio/virtio-serial.h" #include "virtio-ccw.h" diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index c2b78c8e9b..43d3a1b029 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -21,6 +21,7 @@ #include "hw/sysbus.h" #include "qemu/bitops.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "hw/virtio/virtio-access.h" #include "hw/virtio/virtio-bus.h" #include "hw/s390x/adapter.h" diff --git a/hw/scsi/esp-pci.c b/hw/scsi/esp-pci.c index 6b0bbb9b7f..342f500f82 100644 --- a/hw/scsi/esp-pci.c +++ b/hw/scsi/esp-pci.c @@ -30,6 +30,7 @@ #include "trace.h" #include "qapi/error.h" #include "qemu/log.h" +#include "qemu/module.h" #define TYPE_AM53C974_DEVICE "am53c974" diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index ca8b36c0c5..7508d035ca 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -28,6 +28,7 @@ #include "hw/scsi/esp.h" #include "trace.h" #include "qemu/log.h" +#include "qemu/module.h" /* * On Sparc32, this is the ESP (NCR53C90) part of chip STP2000 (Master I/O), diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c index a8b7a199f9..10468c1ec1 100644 --- a/hw/scsi/lsi53c895a.c +++ b/hw/scsi/lsi53c895a.c @@ -20,6 +20,7 @@ #include "hw/scsi/scsi.h" #include "sysemu/dma.h" #include "qemu/log.h" +#include "qemu/module.h" #include "trace.h" static const char *names[] = { diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index 5ad762de23..0c4399930a 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -19,6 +19,7 @@ */ #include "qemu/osdep.h" +#include "qemu-common.h" #include "hw/hw.h" #include "hw/pci/pci.h" #include "sysemu/dma.h" @@ -26,6 +27,7 @@ #include "hw/pci/msi.h" #include "hw/pci/msix.h" #include "qemu/iov.h" +#include "qemu/module.h" #include "hw/scsi/scsi.h" #include "scsi/constants.h" #include "trace.h" diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c index e800683e91..3f94d5ab55 100644 --- a/hw/scsi/mptsas.c +++ b/hw/scsi/mptsas.c @@ -28,6 +28,7 @@ #include "sysemu/dma.h" #include "hw/pci/msi.h" #include "qemu/iov.h" +#include "qemu/module.h" #include "hw/scsi/scsi.h" #include "scsi/constants.h" #include "trace.h" diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index c480553083..196136a307 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -2,6 +2,7 @@ #include "hw/hw.h" #include "qapi/error.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "qemu/option.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 7b89ac798b..ed7295bfd7 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/module.h" #include "hw/scsi/scsi.h" #include "hw/scsi/emulation.h" #include "scsi/constants.h" diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c index d82b462be4..f07891b3f6 100644 --- a/hw/scsi/scsi-generic.c +++ b/hw/scsi/scsi-generic.c @@ -13,8 +13,9 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" +#include "qemu/ctype.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "hw/scsi/scsi.h" #include "hw/scsi/emulation.h" #include "sysemu/block-backend.h" diff --git a/hw/scsi/spapr_vscsi.c b/hw/scsi/spapr_vscsi.c index 26dfc0340f..0e491c911d 100644 --- a/hw/scsi/spapr_vscsi.c +++ b/hw/scsi/spapr_vscsi.c @@ -31,8 +31,9 @@ * - Add indirect descriptors support * - Maybe do autosense (PAPR seems to mandate it, linux doesn't care) */ + #include "qemu/osdep.h" -#include "qemu-common.h" +#include "qemu/module.h" #include "cpu.h" #include "hw/hw.h" #include "hw/scsi/scsi.h" diff --git a/hw/scsi/vhost-scsi-common.c b/hw/scsi/vhost-scsi-common.c index b7fbab65dd..8ec49d7fef 100644 --- a/hw/scsi/vhost-scsi-common.c +++ b/hw/scsi/vhost-scsi-common.c @@ -17,6 +17,7 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "hw/virtio/vhost.h" #include "hw/virtio/vhost-scsi-common.h" #include "hw/virtio/virtio-scsi.h" diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c index 6b01accf61..4090f99ee4 100644 --- a/hw/scsi/vhost-scsi.c +++ b/hw/scsi/vhost-scsi.c @@ -19,6 +19,7 @@ #include <sys/ioctl.h> #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" diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c index 12d21bbc61..61ce365fe9 100644 --- a/hw/scsi/virtio-scsi.c +++ b/hw/scsi/virtio-scsi.c @@ -19,6 +19,7 @@ #include "hw/virtio/virtio-scsi.h" #include "qemu/error-report.h" #include "qemu/iov.h" +#include "qemu/module.h" #include "sysemu/block-backend.h" #include "hw/scsi/scsi.h" #include "scsi/constants.h" diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c index c39e33fa35..14641df1c8 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/module.h" #include "hw/scsi/scsi.h" #include "scsi/constants.h" #include "hw/pci/msi.h" diff --git a/hw/sd/bcm2835_sdhost.c b/hw/sd/bcm2835_sdhost.c index 1b760b2a7c..2778fb0de4 100644 --- a/hw/sd/bcm2835_sdhost.c +++ b/hw/sd/bcm2835_sdhost.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" +#include "qemu/module.h" #include "sysemu/blockdev.h" #include "hw/sd/bcm2835_sdhost.h" #include "trace.h" diff --git a/hw/sd/core.c b/hw/sd/core.c index 107e6d71dd..abec48bccb 100644 --- a/hw/sd/core.c +++ b/hw/sd/core.c @@ -22,6 +22,7 @@ #include "qemu/osdep.h" #include "hw/qdev-core.h" #include "hw/sd/sd.h" +#include "qemu/module.h" #include "trace.h" static inline const char *sdbus_name(SDBus *sdbus) diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c index dd1ba649d9..b8d2347d46 100644 --- a/hw/sd/milkymist-memcard.c +++ b/hw/sd/milkymist-memcard.c @@ -23,6 +23,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" +#include "qemu/module.h" #include "hw/hw.h" #include "hw/sysbus.h" #include "sysemu/sysemu.h" diff --git a/hw/sd/pl181.c b/hw/sd/pl181.c index 3ad7e925c5..81b406dbf0 100644 --- a/hw/sd/pl181.c +++ b/hw/sd/pl181.c @@ -12,6 +12,7 @@ #include "hw/sysbus.h" #include "hw/sd/sd.h" #include "qemu/log.h" +#include "qemu/module.h" #include "qapi/error.h" //#define DEBUG_PL181 1 diff --git a/hw/sd/pxa2xx_mmci.c b/hw/sd/pxa2xx_mmci.c index 82f8ec0d50..81ff5cea86 100644 --- a/hw/sd/pxa2xx_mmci.c +++ b/hw/sd/pxa2xx_mmci.c @@ -20,6 +20,7 @@ #include "hw/qdev-properties.h" #include "qemu/error-report.h" #include "qemu/log.h" +#include "qemu/module.h" #include "trace.h" #define TYPE_PXA2XX_MMCI "pxa2xx-mmci" diff --git a/hw/sd/sd.c b/hw/sd/sd.c index aaab15f386..60500ec8fe 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -43,6 +43,7 @@ #include "qemu/error-report.h" #include "qemu/timer.h" #include "qemu/log.h" +#include "qemu/module.h" #include "sdmmc-internal.h" #include "trace.h" diff --git a/hw/sd/sdhci-pci.c b/hw/sd/sdhci-pci.c index f884661862..9370181993 100644 --- a/hw/sd/sdhci-pci.c +++ b/hw/sd/sdhci-pci.c @@ -17,6 +17,7 @@ #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 17ad5465a7..7b80b1d93f 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -33,6 +33,7 @@ #include "hw/sd/sdhci.h" #include "sdhci-internal.h" #include "qemu/log.h" +#include "qemu/module.h" #include "trace.h" #define TYPE_SDHCI_BUS "sdhci-bus" diff --git a/hw/sd/ssi-sd.c b/hw/sd/ssi-sd.c index 25e1009277..9bd6511ec8 100644 --- a/hw/sd/ssi-sd.c +++ b/hw/sd/ssi-sd.c @@ -15,6 +15,7 @@ #include "hw/ssi/ssi.h" #include "hw/sd/sd.h" #include "qapi/error.h" +#include "qemu/module.h" //#define DEBUG_SSI_SD 1 diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c index 0bcb769c85..f22c79c867 100644 --- a/hw/sh4/r2d.c +++ b/hw/sh4/r2d.c @@ -26,7 +26,6 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "hw/sysbus.h" #include "hw/hw.h" diff --git a/hw/sh4/sh_pci.c b/hw/sh4/sh_pci.c index 379d0685ed..b15f264e99 100644 --- a/hw/sh4/sh_pci.c +++ b/hw/sh4/sh_pci.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/sysbus.h" #include "hw/sh4/sh.h" #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" #include "qemu/bswap.h" +#include "qemu/module.h" #include "exec/address-spaces.h" #define TYPE_SH_PCI_HOST_BRIDGE "sh_pci" diff --git a/hw/sh4/shix.c b/hw/sh4/shix.c index 4add2309eb..6a1c7238e9 100644 --- a/hw/sh4/shix.c +++ b/hw/sh4/shix.c @@ -29,7 +29,6 @@ */ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "hw/hw.h" #include "hw/sh4/sh.h" diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c index 47be9071fa..a36448fc8d 100644 --- a/hw/smbios/smbios.c +++ b/hw/smbios/smbios.c @@ -20,6 +20,7 @@ #include "qapi/error.h" #include "qemu/config-file.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "qemu/option.h" #include "sysemu/sysemu.h" #include "qemu/uuid.h" diff --git a/hw/sparc/sun4m_iommu.c b/hw/sparc/sun4m_iommu.c index 7ca1e3fce4..45a61ecf87 100644 --- a/hw/sparc/sun4m_iommu.c +++ b/hw/sparc/sun4m_iommu.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/sparc/sun4m_iommu.h" #include "hw/sysbus.h" +#include "qemu/module.h" #include "exec/address-spaces.h" #include "trace.h" diff --git a/hw/sparc64/niagara.c b/hw/sparc64/niagara.c index f8a856f611..dc0ce7eda4 100644 --- a/hw/sparc64/niagara.c +++ b/hw/sparc64/niagara.c @@ -24,7 +24,6 @@ #include "qemu/osdep.h" #include "qemu/units.h" -#include "qemu-common.h" #include "cpu.h" #include "hw/hw.h" #include "hw/boards.h" diff --git a/hw/sparc64/sun4u_iommu.c b/hw/sparc64/sun4u_iommu.c index 1ef7645ba5..9178277f82 100644 --- a/hw/sparc64/sun4u_iommu.c +++ b/hw/sparc64/sun4u_iommu.c @@ -29,6 +29,7 @@ #include "hw/sparc/sun4u_iommu.h" #include "exec/address-spaces.h" #include "qemu/log.h" +#include "qemu/module.h" #include "trace.h" diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c index f1e66870d7..9eda0d720b 100644 --- a/hw/ssi/aspeed_smc.c +++ b/hw/ssi/aspeed_smc.c @@ -26,6 +26,7 @@ #include "hw/sysbus.h" #include "sysemu/sysemu.h" #include "qemu/log.h" +#include "qemu/module.h" #include "qemu/error-report.h" #include "hw/ssi/aspeed_smc.h" diff --git a/hw/ssi/imx_spi.c b/hw/ssi/imx_spi.c index 02c38c9e47..5cec9b5d05 100644 --- a/hw/ssi/imx_spi.c +++ b/hw/ssi/imx_spi.c @@ -12,6 +12,7 @@ #include "hw/ssi/imx_spi.h" #include "sysemu/sysemu.h" #include "qemu/log.h" +#include "qemu/module.h" #ifndef DEBUG_IMX_SPI #define DEBUG_IMX_SPI 0 diff --git a/hw/ssi/mss-spi.c b/hw/ssi/mss-spi.c index 185e1a3920..918b1f3e82 100644 --- a/hw/ssi/mss-spi.c +++ b/hw/ssi/mss-spi.c @@ -26,6 +26,7 @@ #include "qemu/osdep.h" #include "hw/ssi/mss-spi.h" #include "qemu/log.h" +#include "qemu/module.h" #ifndef MSS_SPI_ERR_DEBUG #define MSS_SPI_ERR_DEBUG 0 diff --git a/hw/ssi/pl022.c b/hw/ssi/pl022.c index e58247554c..fec73cae26 100644 --- a/hw/ssi/pl022.c +++ b/hw/ssi/pl022.c @@ -12,6 +12,7 @@ #include "hw/ssi/pl022.h" #include "hw/ssi/ssi.h" #include "qemu/log.h" +#include "qemu/module.h" //#define DEBUG_PL022 1 diff --git a/hw/ssi/ssi.c b/hw/ssi/ssi.c index 7eaaf565fd..cda7c96a64 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 "qemu/module.h" struct SSIBus { BusState parent_obj; diff --git a/hw/ssi/stm32f2xx_spi.c b/hw/ssi/stm32f2xx_spi.c index 930c616de3..4249101386 100644 --- a/hw/ssi/stm32f2xx_spi.c +++ b/hw/ssi/stm32f2xx_spi.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" +#include "qemu/module.h" #include "hw/ssi/stm32f2xx_spi.h" #ifndef STM_SPI_ERR_DEBUG diff --git a/hw/ssi/xilinx_spi.c b/hw/ssi/xilinx_spi.c index 3dae303d5b..1379cb164b 100644 --- a/hw/ssi/xilinx_spi.c +++ b/hw/ssi/xilinx_spi.c @@ -28,6 +28,7 @@ #include "hw/sysbus.h" #include "sysemu/sysemu.h" #include "qemu/log.h" +#include "qemu/module.h" #include "qemu/fifo8.h" #include "hw/ssi/ssi.h" diff --git a/hw/ssi/xilinx_spips.c b/hw/ssi/xilinx_spips.c index c615058cc1..8115bb6d46 100644 --- a/hw/ssi/xilinx_spips.c +++ b/hw/ssi/xilinx_spips.c @@ -27,6 +27,7 @@ #include "sysemu/sysemu.h" #include "hw/ptimer.h" #include "qemu/log.h" +#include "qemu/module.h" #include "qemu/bitops.h" #include "hw/ssi/xilinx_spips.h" #include "qapi/error.h" diff --git a/hw/timer/a9gtimer.c b/hw/timer/a9gtimer.c index 96d534d8a8..09e2a7b7bf 100644 --- a/hw/timer/a9gtimer.c +++ b/hw/timer/a9gtimer.c @@ -26,6 +26,7 @@ #include "qemu/timer.h" #include "qemu/bitops.h" #include "qemu/log.h" +#include "qemu/module.h" #include "qom/cpu.h" #ifndef A9_GTIMER_ERR_DEBUG diff --git a/hw/timer/allwinner-a10-pit.c b/hw/timer/allwinner-a10-pit.c index 22ceabe1d4..763e1090ec 100644 --- a/hw/timer/allwinner-a10-pit.c +++ b/hw/timer/allwinner-a10-pit.c @@ -20,6 +20,7 @@ #include "sysemu/sysemu.h" #include "hw/timer/allwinner-a10-pit.h" #include "qemu/log.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 c9a0fc5dca..5c1d9e4074 100644 --- a/hw/timer/altera_timer.c +++ b/hw/timer/altera_timer.c @@ -19,7 +19,7 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" +#include "qemu/module.h" #include "qapi/error.h" #include "hw/sysbus.h" diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c index daf6c48797..93044aacfd 100644 --- a/hw/timer/arm_mptimer.c +++ b/hw/timer/arm_mptimer.c @@ -24,6 +24,7 @@ #include "hw/timer/arm_mptimer.h" #include "qapi/error.h" #include "qemu/main-loop.h" +#include "qemu/module.h" #include "qom/cpu.h" #define PTIMER_POLICY \ diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c index 98fddd7ac1..f0a753404d 100644 --- a/hw/timer/arm_timer.c +++ b/hw/timer/arm_timer.c @@ -10,10 +10,10 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "qemu/timer.h" -#include "qemu-common.h" #include "hw/qdev.h" #include "hw/ptimer.h" #include "qemu/main-loop.h" +#include "qemu/module.h" #include "qemu/log.h" /* Common timer implementation. */ diff --git a/hw/timer/armv7m_systick.c b/hw/timer/armv7m_systick.c index df8d2804b3..a17317ce2f 100644 --- a/hw/timer/armv7m_systick.c +++ b/hw/timer/armv7m_systick.c @@ -11,10 +11,10 @@ #include "qemu/osdep.h" #include "hw/timer/armv7m_systick.h" -#include "qemu-common.h" #include "hw/sysbus.h" #include "qemu/timer.h" #include "qemu/log.h" +#include "qemu/module.h" #include "trace.h" /* qemu timers run at 1GHz. We want something closer to 1MHz. */ diff --git a/hw/timer/aspeed_timer.c b/hw/timer/aspeed_timer.c index 5c786e5128..2c3a4d0fe7 100644 --- a/hw/timer/aspeed_timer.c +++ b/hw/timer/aspeed_timer.c @@ -13,10 +13,10 @@ #include "qapi/error.h" #include "hw/sysbus.h" #include "hw/timer/aspeed_timer.h" -#include "qemu-common.h" #include "qemu/bitops.h" #include "qemu/timer.h" #include "qemu/log.h" +#include "qemu/module.h" #include "trace.h" #define TIMER_NR_REGS 4 diff --git a/hw/timer/cadence_ttc.c b/hw/timer/cadence_ttc.c index 10056407ab..115d935f84 100644 --- a/hw/timer/cadence_ttc.c +++ b/hw/timer/cadence_ttc.c @@ -18,6 +18,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "qemu/module.h" #include "qemu/timer.h" #ifdef CADENCE_TTC_ERR_DEBUG diff --git a/hw/timer/cmsdk-apb-dualtimer.c b/hw/timer/cmsdk-apb-dualtimer.c index 30245990f3..383f6e12b1 100644 --- a/hw/timer/cmsdk-apb-dualtimer.c +++ b/hw/timer/cmsdk-apb-dualtimer.c @@ -21,6 +21,7 @@ #include "trace.h" #include "qapi/error.h" #include "qemu/main-loop.h" +#include "qemu/module.h" #include "hw/sysbus.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 801d1dba74..2e7318b81f 100644 --- a/hw/timer/cmsdk-apb-timer.c +++ b/hw/timer/cmsdk-apb-timer.c @@ -30,6 +30,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "qemu/main-loop.h" +#include "qemu/module.h" #include "qapi/error.h" #include "trace.h" #include "hw/sysbus.h" diff --git a/hw/timer/digic-timer.c b/hw/timer/digic-timer.c index 4d73077207..c818ed1d98 100644 --- a/hw/timer/digic-timer.c +++ b/hw/timer/digic-timer.c @@ -30,6 +30,7 @@ #include "hw/sysbus.h" #include "hw/ptimer.h" #include "qemu/main-loop.h" +#include "qemu/module.h" #include "qemu/log.h" #include "hw/timer/digic-timer.h" diff --git a/hw/timer/ds1338.c b/hw/timer/ds1338.c index 03da75486b..30d2d21408 100644 --- a/hw/timer/ds1338.c +++ b/hw/timer/ds1338.c @@ -14,6 +14,7 @@ #include "qemu-common.h" #include "hw/i2c/i2c.h" #include "qemu/bcd.h" +#include "qemu/module.h" /* Size of NVRAM including both the user-accessible area and the * secondary register area. diff --git a/hw/timer/etraxfs_timer.c b/hw/timer/etraxfs_timer.c index 2280914b1d..53834e197f 100644 --- a/hw/timer/etraxfs_timer.c +++ b/hw/timer/etraxfs_timer.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/sysbus.h" #include "sysemu/sysemu.h" +#include "qemu/module.h" #include "qemu/timer.h" #include "hw/ptimer.h" diff --git a/hw/timer/exynos4210_mct.c b/hw/timer/exynos4210_mct.c index e4ef4cfd36..874c7b8522 100644 --- a/hw/timer/exynos4210_mct.c +++ b/hw/timer/exynos4210_mct.c @@ -57,7 +57,7 @@ #include "hw/sysbus.h" #include "qemu/timer.h" #include "qemu/main-loop.h" -#include "qemu-common.h" +#include "qemu/module.h" #include "hw/ptimer.h" #include "hw/arm/exynos4210.h" diff --git a/hw/timer/exynos4210_pwm.c b/hw/timer/exynos4210_pwm.c index 87f63f057e..9bc0327785 100644 --- a/hw/timer/exynos4210_pwm.c +++ b/hw/timer/exynos4210_pwm.c @@ -24,8 +24,8 @@ #include "qemu/log.h" #include "hw/sysbus.h" #include "qemu/timer.h" -#include "qemu-common.h" #include "qemu/main-loop.h" +#include "qemu/module.h" #include "hw/ptimer.h" #include "hw/arm/exynos4210.h" diff --git a/hw/timer/exynos4210_rtc.c b/hw/timer/exynos4210_rtc.c index 4607833e3e..0ecedf7394 100644 --- a/hw/timer/exynos4210_rtc.c +++ b/hw/timer/exynos4210_rtc.c @@ -26,10 +26,11 @@ */ #include "qemu/osdep.h" +#include "qemu-common.h" #include "qemu/log.h" +#include "qemu/module.h" #include "hw/sysbus.h" #include "qemu/timer.h" -#include "qemu-common.h" #include "qemu/bcd.h" #include "hw/ptimer.h" diff --git a/hw/timer/grlib_gptimer.c b/hw/timer/grlib_gptimer.c index 4b7088fc84..e45a49075b 100644 --- a/hw/timer/grlib_gptimer.c +++ b/hw/timer/grlib_gptimer.c @@ -28,6 +28,7 @@ #include "qemu/timer.h" #include "hw/ptimer.h" #include "qemu/main-loop.h" +#include "qemu/module.h" #include "trace.h" diff --git a/hw/timer/i8254.c b/hw/timer/i8254.c index 20f834e7da..0972c4724e 100644 --- a/hw/timer/i8254.c +++ b/hw/timer/i8254.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 "qemu/module.h" #include "qemu/timer.h" #include "hw/timer/i8254.h" #include "hw/timer/i8254_internal.h" diff --git a/hw/timer/i8254_common.c b/hw/timer/i8254_common.c index 6190b6fc5d..76ca6ec444 100644 --- a/hw/timer/i8254_common.c +++ b/hw/timer/i8254_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/hw.h" #include "hw/isa/isa.h" +#include "qemu/module.h" #include "qemu/timer.h" #include "hw/timer/i8254.h" #include "hw/timer/i8254_internal.h" diff --git a/hw/timer/imx_epit.c b/hw/timer/imx_epit.c index 8677b753b1..7a883160f4 100644 --- a/hw/timer/imx_epit.c +++ b/hw/timer/imx_epit.c @@ -16,6 +16,7 @@ #include "hw/timer/imx_epit.h" #include "hw/misc/imx_ccm.h" #include "qemu/main-loop.h" +#include "qemu/module.h" #include "qemu/log.h" #ifndef DEBUG_IMX_EPIT diff --git a/hw/timer/imx_gpt.c b/hw/timer/imx_gpt.c index 65e4ee6bcf..3086c03774 100644 --- a/hw/timer/imx_gpt.c +++ b/hw/timer/imx_gpt.c @@ -15,6 +15,7 @@ #include "qemu/osdep.h" #include "hw/timer/imx_gpt.h" #include "qemu/main-loop.h" +#include "qemu/module.h" #include "qemu/log.h" #ifndef DEBUG_IMX_GPT diff --git a/hw/timer/lm32_timer.c b/hw/timer/lm32_timer.c index 2a07b59524..6ce876c6ae 100644 --- a/hw/timer/lm32_timer.c +++ b/hw/timer/lm32_timer.c @@ -29,6 +29,7 @@ #include "hw/ptimer.h" #include "qemu/error-report.h" #include "qemu/main-loop.h" +#include "qemu/module.h" #define DEFAULT_FREQUENCY (50*1000000) diff --git a/hw/timer/m41t80.c b/hw/timer/m41t80.c index c45b9297d8..914ecac8f4 100644 --- a/hw/timer/m41t80.c +++ b/hw/timer/m41t80.c @@ -8,7 +8,9 @@ */ #include "qemu/osdep.h" +#include "qemu-common.h" #include "qemu/log.h" +#include "qemu/module.h" #include "qemu/timer.h" #include "qemu/bcd.h" #include "hw/i2c/i2c.h" diff --git a/hw/timer/m48t59-isa.c b/hw/timer/m48t59-isa.c index ea1ba703d7..cbc5e61ddd 100644 --- a/hw/timer/m48t59-isa.c +++ b/hw/timer/m48t59-isa.c @@ -22,10 +22,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "hw/isa/isa.h" #include "hw/timer/m48t59.h" #include "m48t59-internal.h" +#include "qemu/module.h" #define TYPE_M48TXX_ISA "isa-m48txx" #define M48TXX_ISA_GET_CLASS(obj) \ diff --git a/hw/timer/m48t59.c b/hw/timer/m48t59.c index ca3ed445de..030c8872a2 100644 --- a/hw/timer/m48t59.c +++ b/hw/timer/m48t59.c @@ -22,7 +22,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" +#include "qemu-common.h" #include "hw/hw.h" #include "hw/timer/m48t59.h" #include "qemu/timer.h" @@ -30,6 +32,7 @@ #include "hw/sysbus.h" #include "exec/address-spaces.h" #include "qemu/bcd.h" +#include "qemu/module.h" #include "m48t59-internal.h" diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index 513f105e62..0d79e000d2 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -23,7 +23,9 @@ */ #include "qemu/osdep.h" +#include "qemu-common.h" #include "qemu/cutils.h" +#include "qemu/module.h" #include "qemu/bcd.h" #include "hw/hw.h" #include "qemu/timer.h" diff --git a/hw/timer/milkymist-sysctl.c b/hw/timer/milkymist-sysctl.c index 93bc6e1790..a9d250877c 100644 --- a/hw/timer/milkymist-sysctl.c +++ b/hw/timer/milkymist-sysctl.c @@ -29,6 +29,7 @@ #include "qemu/timer.h" #include "hw/ptimer.h" #include "qemu/error-report.h" +#include "qemu/module.h" enum { CTRL_ENABLE = (1<<0), diff --git a/hw/timer/mss-timer.c b/hw/timer/mss-timer.c index 4f814572e2..6add47af99 100644 --- a/hw/timer/mss-timer.c +++ b/hw/timer/mss-timer.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "qemu/main-loop.h" +#include "qemu/module.h" #include "qemu/log.h" #include "hw/timer/mss-timer.h" diff --git a/hw/timer/nrf51_timer.c b/hw/timer/nrf51_timer.c index 0c90662896..29fb81a744 100644 --- a/hw/timer/nrf51_timer.c +++ b/hw/timer/nrf51_timer.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" +#include "qemu/module.h" #include "hw/arm/nrf51.h" #include "hw/timer/nrf51_timer.h" #include "trace.h" diff --git a/hw/timer/pl031.c b/hw/timer/pl031.c index 274ad47a33..3378084f4a 100644 --- a/hw/timer/pl031.c +++ b/hw/timer/pl031.c @@ -12,12 +12,14 @@ */ #include "qemu/osdep.h" +#include "qemu-common.h" #include "hw/timer/pl031.h" #include "hw/sysbus.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" #include "qemu/cutils.h" #include "qemu/log.h" +#include "qemu/module.h" #include "trace.h" #define RTC_DR 0x00 /* Data read register */ diff --git a/hw/timer/puv3_ost.c b/hw/timer/puv3_ost.c index 3be58c7fdd..4a8ae37ffd 100644 --- a/hw/timer/puv3_ost.c +++ b/hw/timer/puv3_ost.c @@ -8,10 +8,12 @@ * published by the Free Software Foundation, or any later version. * See the COPYING file in the top-level directory. */ + #include "qemu/osdep.h" #include "hw/sysbus.h" #include "hw/ptimer.h" #include "qemu/main-loop.h" +#include "qemu/module.h" #undef DEBUG_PUV3 #include "hw/unicore32/puv3.h" diff --git a/hw/timer/pxa2xx_timer.c b/hw/timer/pxa2xx_timer.c index a489bf5159..8c1ef43cd5 100644 --- a/hw/timer/pxa2xx_timer.c +++ b/hw/timer/pxa2xx_timer.c @@ -14,6 +14,7 @@ #include "hw/arm/pxa.h" #include "hw/sysbus.h" #include "qemu/log.h" +#include "qemu/module.h" #define OSMR0 0x00 #define OSMR1 0x04 diff --git a/hw/timer/slavio_timer.c b/hw/timer/slavio_timer.c index 4694b653a7..005fd599e8 100644 --- a/hw/timer/slavio_timer.c +++ b/hw/timer/slavio_timer.c @@ -28,6 +28,7 @@ #include "hw/sysbus.h" #include "trace.h" #include "qemu/main-loop.h" +#include "qemu/module.h" /* * Registers of hardware timer in sun4m. diff --git a/hw/timer/stm32f2xx_timer.c b/hw/timer/stm32f2xx_timer.c index ae744d1642..4c49dc4995 100644 --- a/hw/timer/stm32f2xx_timer.c +++ b/hw/timer/stm32f2xx_timer.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/timer/stm32f2xx_timer.h" #include "qemu/log.h" +#include "qemu/module.h" #ifndef STM_TIMER_ERR_DEBUG #define STM_TIMER_ERR_DEBUG 0 diff --git a/hw/timer/sun4v-rtc.c b/hw/timer/sun4v-rtc.c index b93cbd6a81..ba62adc826 100644 --- a/hw/timer/sun4v-rtc.c +++ b/hw/timer/sun4v-rtc.c @@ -12,6 +12,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/sysbus.h" +#include "qemu/module.h" #include "qemu/timer.h" #include "hw/timer/sun4v-rtc.h" #include "trace.h" diff --git a/hw/timer/twl92230.c b/hw/timer/twl92230.c index c83d803dd8..0ef4fc1fc1 100644 --- a/hw/timer/twl92230.c +++ b/hw/timer/twl92230.c @@ -20,12 +20,14 @@ */ #include "qemu/osdep.h" +#include "qemu-common.h" #include "hw/hw.h" #include "qemu/timer.h" #include "hw/i2c/i2c.h" #include "sysemu/sysemu.h" #include "ui/console.h" #include "qemu/bcd.h" +#include "qemu/module.h" #define VERBOSE 1 diff --git a/hw/timer/xilinx_timer.c b/hw/timer/xilinx_timer.c index 59439c05be..16bcd0393b 100644 --- a/hw/timer/xilinx_timer.c +++ b/hw/timer/xilinx_timer.c @@ -27,6 +27,7 @@ #include "hw/ptimer.h" #include "qemu/log.h" #include "qemu/main-loop.h" +#include "qemu/module.h" #define D(x) diff --git a/hw/timer/xlnx-zynqmp-rtc.c b/hw/timer/xlnx-zynqmp-rtc.c index c98dc3d94e..36daf0c7e7 100644 --- a/hw/timer/xlnx-zynqmp-rtc.c +++ b/hw/timer/xlnx-zynqmp-rtc.c @@ -25,10 +25,12 @@ */ #include "qemu/osdep.h" +#include "qemu-common.h" #include "hw/sysbus.h" #include "hw/register.h" #include "qemu/bitops.h" #include "qemu/log.h" +#include "qemu/module.h" #include "hw/ptimer.h" #include "qemu/cutils.h" #include "sysemu/sysemu.h" diff --git a/hw/tpm/tpm_crb.c b/hw/tpm/tpm_crb.c index 3087acc4ab..5e2db9e0c4 100644 --- a/hw/tpm/tpm_crb.c +++ b/hw/tpm/tpm_crb.c @@ -16,7 +16,7 @@ #include "qemu/osdep.h" -#include "qemu-common.h" +#include "qemu/module.h" #include "qapi/error.h" #include "exec/address-spaces.h" diff --git a/hw/tpm/tpm_emulator.c b/hw/tpm/tpm_emulator.c index 70f4b10284..1288cbcb8d 100644 --- a/hw/tpm/tpm_emulator.c +++ b/hw/tpm/tpm_emulator.c @@ -28,6 +28,7 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "qemu/sockets.h" #include "io/channel-socket.h" #include "sysemu/tpm_backend.h" diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c index 479317ee50..897e3d5864 100644 --- a/hw/tpm/tpm_passthrough.c +++ b/hw/tpm/tpm_passthrough.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "qemu/sockets.h" #include "sysemu/tpm_backend.h" #include "tpm_int.h" diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c index fd183e8deb..174618ac30 100644 --- a/hw/tpm/tpm_tis.c +++ b/hw/tpm/tpm_tis.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/isa/isa.h" #include "qapi/error.h" +#include "qemu/module.h" #include "hw/acpi/tpm.h" #include "hw/pci/pci_ids.h" diff --git a/hw/tricore/tricore_testboard.c b/hw/tricore/tricore_testboard.c index b40cc997d0..be397ebf92 100644 --- a/hw/tricore/tricore_testboard.c +++ b/hw/tricore/tricore_testboard.c @@ -21,7 +21,6 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "hw/hw.h" #include "net/net.h" diff --git a/hw/usb/bus.c b/hw/usb/bus.c index 9a74dc9560..a28e9e3b33 100644 --- a/hw/usb/bus.c +++ b/hw/usb/bus.c @@ -4,6 +4,7 @@ #include "hw/qdev.h" #include "qapi/error.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "sysemu/sysemu.h" #include "monitor/monitor.h" #include "trace.h" diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c index 963373ba95..e20f8ed293 100644 --- a/hw/usb/ccid-card-emulated.c +++ b/hw/usb/ccid-card-emulated.c @@ -31,6 +31,7 @@ #include "qemu/thread.h" #include "qemu/main-loop.h" +#include "qemu/module.h" #include "ccid.h" #include "qapi/error.h" diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c index 0a6c657228..d1dac6e012 100644 --- a/hw/usb/ccid-card-passthru.c +++ b/hw/usb/ccid-card-passthru.c @@ -9,10 +9,12 @@ */ #include "qemu/osdep.h" +#include "qemu-common.h" #include "qemu/units.h" #include <libcacard.h> #include "chardev/char-fe.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "qemu/sockets.h" #include "ccid.h" #include "qapi/error.h" diff --git a/hw/usb/chipidea.c b/hw/usb/chipidea.c index 60d67f88b8..3dcd22ccba 100644 --- a/hw/usb/chipidea.c +++ b/hw/usb/chipidea.c @@ -13,6 +13,7 @@ #include "hw/usb/hcd-ehci.h" #include "hw/usb/chipidea.h" #include "qemu/log.h" +#include "qemu/module.h" enum { CHIPIDEA_USBx_DCIVERSION = 0x000, diff --git a/hw/usb/combined-packet.c b/hw/usb/combined-packet.c index 37b23e20ef..5d57e883dc 100644 --- a/hw/usb/combined-packet.c +++ b/hw/usb/combined-packet.c @@ -21,7 +21,6 @@ */ #include "qemu/osdep.h" #include "qemu/units.h" -#include "qemu-common.h" #include "hw/usb.h" #include "qemu/iov.h" #include "trace.h" diff --git a/hw/usb/core.c b/hw/usb/core.c index 3ab48a1607..5abd128b6b 100644 --- a/hw/usb/core.c +++ b/hw/usb/core.c @@ -24,7 +24,6 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "hw/usb.h" #include "qemu/iov.h" #include "trace.h" diff --git a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c index c46d5eeb79..718ab53cbb 100644 --- a/hw/usb/dev-audio.c +++ b/hw/usb/dev-audio.c @@ -30,7 +30,7 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" +#include "qemu/module.h" #include "hw/usb.h" #include "desc.h" #include "hw/hw.h" diff --git a/hw/usb/dev-bluetooth.c b/hw/usb/dev-bluetooth.c index c539a1afc6..670ba32290 100644 --- a/hw/usb/dev-bluetooth.c +++ b/hw/usb/dev-bluetooth.c @@ -19,8 +19,8 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "hw/usb.h" #include "desc.h" #include "sysemu/bt.h" diff --git a/hw/usb/dev-hid.c b/hw/usb/dev-hid.c index f9ea3033a1..62793eaf26 100644 --- a/hw/usb/dev-hid.c +++ b/hw/usb/dev-hid.c @@ -22,12 +22,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/usb.h" #include "desc.h" #include "qapi/error.h" +#include "qemu/module.h" #include "qemu/timer.h" #include "hw/input/hid.h" diff --git a/hw/usb/dev-hub.c b/hw/usb/dev-hub.c index 2b64d6ef03..89f55dd25c 100644 --- a/hw/usb/dev-hub.c +++ b/hw/usb/dev-hub.c @@ -21,14 +21,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "qemu/timer.h" #include "trace.h" #include "hw/usb.h" #include "desc.h" #include "qemu/error-report.h" +#include "qemu/module.h" #define MAX_PORTS 8 diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index f31fc76c01..fd1b3394a5 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -10,6 +10,7 @@ */ #include "qemu/osdep.h" +#include "qemu-common.h" #include "qapi/error.h" #include "qemu/error-report.h" #include <wchar.h> @@ -18,8 +19,8 @@ #include <sys/statvfs.h> -#include "qemu-common.h" #include "qemu/iov.h" +#include "qemu/module.h" #include "qemu/filemonitor.h" #include "trace.h" #include "hw/usb.h" diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c index ffab3fabee..889069dd5a 100644 --- a/hw/usb/dev-network.c +++ b/hw/usb/dev-network.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "hw/usb.h" #include "desc.h" #include "net/net.h" @@ -34,6 +33,7 @@ #include "qemu/config-file.h" #include "sysemu/sysemu.h" #include "qemu/iov.h" +#include "qemu/module.h" #include "qemu/cutils.h" /*#define TRAFFIC_DEBUG*/ diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c index 03c3bcd240..b82f854103 100644 --- a/hw/usb/dev-serial.c +++ b/hw/usb/dev-serial.c @@ -10,9 +10,9 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "qemu/cutils.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "hw/usb.h" #include "desc.h" #include "chardev/char-serial.h" diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c index 6b0137bb76..8d7e516fe7 100644 --- a/hw/usb/dev-smartcard-reader.c +++ b/hw/usb/dev-smartcard-reader.c @@ -39,6 +39,7 @@ #include "qapi/error.h" #include "qemu-common.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "hw/usb.h" #include "desc.h" diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c index 0e4e93ef16..9ffb88ea5b 100644 --- a/hw/usb/dev-storage.c +++ b/hw/usb/dev-storage.c @@ -9,8 +9,8 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "qemu/option.h" #include "qemu/config-file.h" #include "hw/usb.h" diff --git a/hw/usb/dev-uas.c b/hw/usb/dev-uas.c index be566cad02..abd8070d0c 100644 --- a/hw/usb/dev-uas.c +++ b/hw/usb/dev-uas.c @@ -10,11 +10,11 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "qemu/option.h" #include "qemu/config-file.h" #include "trace.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "hw/usb.h" #include "desc.h" diff --git a/hw/usb/dev-wacom.c b/hw/usb/dev-wacom.c index ac0bc83b52..8c43db9335 100644 --- a/hw/usb/dev-wacom.c +++ b/hw/usb/dev-wacom.c @@ -25,10 +25,12 @@ * 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/usb.h" +#include "qemu/module.h" #include "desc.h" /* Interface requests */ diff --git a/hw/usb/hcd-ehci-pci.c b/hw/usb/hcd-ehci-pci.c index 38b24b160a..03d3a39067 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 "qemu/module.h" #include "qemu/range.h" typedef struct EHCIPCIInfo { diff --git a/hw/usb/hcd-ehci-sysbus.c b/hw/usb/hcd-ehci-sysbus.c index 9f7f128f19..cd1f3c70a4 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 "qemu/module.h" static const VMStateDescription vmstate_ehci_sysbus = { .name = "ehci-sysbus", diff --git a/hw/usb/hcd-musb.c b/hw/usb/hcd-musb.c index 85d7796554..c29fbef6fc 100644 --- a/hw/usb/hcd-musb.c +++ b/hw/usb/hcd-musb.c @@ -21,7 +21,6 @@ * Only host-mode and non-DMA accesses are currently supported. */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "qemu/timer.h" #include "hw/usb.h" #include "hw/irq.h" diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c index aaba090588..4f6fdbc0a7 100644 --- a/hw/usb/hcd-ohci.c +++ b/hw/usb/hcd-ohci.c @@ -28,6 +28,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "qapi/error.h" +#include "qemu/module.h" #include "qemu/timer.h" #include "hw/usb.h" #include "hw/sysbus.h" diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c index 09df29ff9c..98bd5cf49d 100644 --- a/hw/usb/hcd-uhci.c +++ b/hw/usb/hcd-uhci.c @@ -25,6 +25,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/usb.h" @@ -36,6 +37,7 @@ #include "sysemu/dma.h" #include "trace.h" #include "qemu/main-loop.h" +#include "qemu/module.h" #define FRAME_TIMER_FREQ 1000 diff --git a/hw/usb/hcd-xhci-nec.c b/hw/usb/hcd-xhci-nec.c index 75715a048a..e099382b24 100644 --- a/hw/usb/hcd-xhci-nec.c +++ b/hw/usb/hcd-xhci-nec.c @@ -22,6 +22,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/usb.h" +#include "qemu/module.h" #include "hw/pci/pci.h" #include "hcd-xhci.h" diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index 2e9a839f2b..5894a18663 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -18,9 +18,11 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ + #include "qemu/osdep.h" #include "hw/hw.h" #include "qemu/timer.h" +#include "qemu/module.h" #include "qemu/queue.h" #include "hw/usb.h" #include "hw/pci/pci.h" diff --git a/hw/usb/hcd-xhci.h b/hw/usb/hcd-xhci.h index 240caa4e51..2fad4df2a7 100644 --- a/hw/usb/hcd-xhci.h +++ b/hw/usb/hcd-xhci.h @@ -19,6 +19,9 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +#ifndef HW_USB_HCD_XHCI_H +#define HW_USB_HCD_XHCI_H + #define TYPE_XHCI "base-xhci" #define TYPE_NEC_XHCI "nec-usb-xhci" #define TYPE_QEMU_XHCI "qemu-xhci" @@ -225,3 +228,5 @@ struct XHCIState { bool nec_quirks; }; + +#endif diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c index 4f765d7f9a..83ebc51620 100644 --- a/hw/usb/host-libusb.c +++ b/hw/usb/host-libusb.c @@ -40,9 +40,9 @@ #include <libusb.h> #include "qapi/error.h" -#include "qemu-common.h" #include "monitor/monitor.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "sysemu/sysemu.h" #include "trace.h" diff --git a/hw/usb/host-stub.c b/hw/usb/host-stub.c index 41d93ec8a0..538ed29684 100644 --- a/hw/usb/host-stub.c +++ b/hw/usb/host-stub.c @@ -31,7 +31,6 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "ui/console.h" #include "hw/usb.h" #include "monitor/monitor.h" diff --git a/hw/usb/libhw.c b/hw/usb/libhw.c index 73cdf0c97d..adbee2f642 100644 --- a/hw/usb/libhw.c +++ b/hw/usb/libhw.c @@ -20,7 +20,6 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "hw/hw.h" #include "hw/usb.h" #include "sysemu/dma.h" diff --git a/hw/usb/quirks.h b/hw/usb/quirks.h index 8dc6065527..89480befd7 100644 --- a/hw/usb/quirks.h +++ b/hw/usb/quirks.h @@ -12,6 +12,9 @@ * (at your option) any later version. */ +#ifndef HW_USB_QUIRKS_H +#define HW_USB_QUIRKS_H + /* 1 on 1 copy of linux/drivers/usb/serial/ftdi_sio_ids.h */ #include "quirks-ftdi-ids.h" /* 1 on 1 copy of linux/drivers/usb/serial/pl2303.h */ @@ -908,3 +911,5 @@ static const struct usb_device_id usbredir_ftdi_serial_ids[] = { #undef USB_DEVICE #undef USB_DEVICE_AND_INTERFACE_INFO + +#endif diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index 7cb6b120d4..998fc6e4b0 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -26,14 +26,15 @@ */ #include "qemu/osdep.h" +#include "qemu-common.h" #include "qemu/units.h" #include "qapi/error.h" -#include "qemu-common.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" #include "qapi/qmp/qerror.h" #include "qemu/error-report.h" #include "qemu/iov.h" +#include "qemu/module.h" #include "chardev/char-fe.h" #include <usbredirparser.h> diff --git a/hw/usb/tusb6010.c b/hw/usb/tusb6010.c index f76b59afe8..a61b0f6354 100644 --- a/hw/usb/tusb6010.c +++ b/hw/usb/tusb6010.c @@ -18,8 +18,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 "qemu-common.h" +#include "qemu/module.h" #include "qemu/timer.h" #include "hw/usb.h" #include "hw/arm/omap.h" diff --git a/hw/vfio/amd-xgbe.c b/hw/vfio/amd-xgbe.c index 1b06c0f3ea..eedd48cfc1 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 "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 564751650f..a995b86cd4 100644 --- a/hw/vfio/ap.c +++ b/hw/vfio/ap.c @@ -19,6 +19,7 @@ #include "hw/vfio/vfio-common.h" #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" diff --git a/hw/vfio/calxeda-xgmac.c b/hw/vfio/calxeda-xgmac.c index 6cc608b6ca..59233e8d7e 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 "qemu/module.h" static void calxeda_xgmac_realize(DeviceState *dev, Error **errp) { diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c index d9e39552e2..03a2becb3e 100644 --- a/hw/vfio/ccw.c +++ b/hw/vfio/ccw.c @@ -25,6 +25,7 @@ #include "hw/s390x/ccw-device.h" #include "exec/address-spaces.h" #include "qemu/error-report.h" +#include "qemu/module.h" struct VFIOCCWDevice { S390CCWDevice cdev; diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c index 29b2697fe1..b35a640030 100644 --- a/hw/vfio/pci-quirks.c +++ b/hw/vfio/pci-quirks.c @@ -14,6 +14,7 @@ #include "qemu/units.h" #include "qemu/error-report.h" #include "qemu/main-loop.h" +#include "qemu/module.h" #include "qemu/range.h" #include "qapi/error.h" #include "qapi/visitor.h" diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 2a4091d216..4a04f79516 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -26,6 +26,7 @@ #include "hw/pci/msix.h" #include "hw/pci/pci_bridge.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "qemu/option.h" #include "qemu/range.h" #include "qemu/units.h" diff --git a/hw/vfio/pci.h b/hw/vfio/pci.h index cfcd1a81b8..834a90d646 100644 --- a/hw/vfio/pci.h +++ b/hw/vfio/pci.h @@ -12,7 +12,6 @@ #ifndef HW_VFIO_VFIO_PCI_H #define HW_VFIO_VFIO_PCI_H -#include "qemu-common.h" #include "exec/memory.h" #include "hw/pci/pci.h" #include "hw/vfio/vfio-common.h" diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c index d52d6552e0..ad29725955 100644 --- a/hw/vfio/platform.c +++ b/hw/vfio/platform.c @@ -21,6 +21,7 @@ #include "hw/vfio/vfio-platform.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "qemu/range.h" #include "sysemu/sysemu.h" #include "exec/memory.h" diff --git a/hw/virtio/vhost-scsi-pci.c b/hw/virtio/vhost-scsi-pci.c index 523f7cb3ce..95a1f32439 100644 --- a/hw/virtio/vhost-scsi-pci.c +++ b/hw/virtio/vhost-scsi-pci.c @@ -19,6 +19,7 @@ #include "standard-headers/linux/virtio_pci.h" #include "hw/virtio/vhost-scsi.h" #include "qapi/error.h" +#include "qemu/module.h" #include "virtio-pci.h" typedef struct VHostSCSIPCI VHostSCSIPCI; diff --git a/hw/virtio/vhost-user-blk-pci.c b/hw/virtio/vhost-user-blk-pci.c index ca66c217a7..ed81614d43 100644 --- a/hw/virtio/vhost-user-blk-pci.c +++ b/hw/virtio/vhost-user-blk-pci.c @@ -24,6 +24,7 @@ #include "hw/pci/pci.h" #include "qapi/error.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "virtio-pci.h" typedef struct VHostUserBlkPCI VHostUserBlkPCI; diff --git a/hw/virtio/vhost-user-scsi-pci.c b/hw/virtio/vhost-user-scsi-pci.c index 46f7193cc7..daeea77ce1 100644 --- a/hw/virtio/vhost-user-scsi-pci.c +++ b/hw/virtio/vhost-user-scsi-pci.c @@ -24,6 +24,7 @@ #include "hw/pci/pci.h" #include "qapi/error.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "hw/pci/msi.h" #include "hw/pci/msix.h" #include "hw/loader.h" diff --git a/hw/virtio/vhost-vsock-pci.c b/hw/virtio/vhost-vsock-pci.c index 6f43ca35fb..c06c9a83b9 100644 --- a/hw/virtio/vhost-vsock-pci.c +++ b/hw/virtio/vhost-vsock-pci.c @@ -15,6 +15,7 @@ #include "virtio-pci.h" #include "hw/virtio/vhost-vsock.h" +#include "qemu/module.h" typedef struct VHostVSockPCI VHostVSockPCI; diff --git a/hw/virtio/vhost-vsock.c b/hw/virtio/vhost-vsock.c index aa5af927e1..0371493197 100644 --- a/hw/virtio/vhost-vsock.c +++ b/hw/virtio/vhost-vsock.c @@ -20,6 +20,7 @@ #include "qemu/error-report.h" #include "hw/virtio/vhost-vsock.h" #include "qemu/iov.h" +#include "qemu/module.h" #include "monitor/monitor.h" enum { diff --git a/hw/virtio/virtio-9p-pci.c b/hw/virtio/virtio-9p-pci.c index 7bf1130966..29c3712feb 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 "qemu/module.h" /* * virtio-9p-pci: This extends VirtioPCIProxy. diff --git a/hw/virtio/virtio-balloon-pci.c b/hw/virtio/virtio-balloon-pci.c index 2a213bbb38..7393435a98 100644 --- a/hw/virtio/virtio-balloon-pci.c +++ b/hw/virtio/virtio-balloon-pci.c @@ -17,6 +17,7 @@ #include "virtio-pci.h" #include "hw/virtio/virtio-balloon.h" #include "qapi/error.h" +#include "qemu/module.h" typedef struct VirtIOBalloonPCI VirtIOBalloonPCI; diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c index 2112874055..11fad86d64 100644 --- a/hw/virtio/virtio-balloon.c +++ b/hw/virtio/virtio-balloon.c @@ -15,8 +15,8 @@ #include "qemu/osdep.h" #include "qemu/iov.h" +#include "qemu/module.h" #include "qemu/timer.h" -#include "qemu-common.h" #include "hw/virtio/virtio.h" #include "hw/mem/pc-dimm.h" #include "sysemu/balloon.h" diff --git a/hw/virtio/virtio-blk-pci.c b/hw/virtio/virtio-blk-pci.c index 60c9185c39..d790b07a99 100644 --- a/hw/virtio/virtio-blk-pci.c +++ b/hw/virtio/virtio-blk-pci.c @@ -20,6 +20,7 @@ #include "hw/virtio/virtio-blk.h" #include "virtio-pci.h" #include "qapi/error.h" +#include "qemu/module.h" typedef struct VirtIOBlkPCI VirtIOBlkPCI; diff --git a/hw/virtio/virtio-bus.c b/hw/virtio/virtio-bus.c index f9bc9ea46d..1d29a631f3 100644 --- a/hw/virtio/virtio-bus.c +++ b/hw/virtio/virtio-bus.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "qapi/error.h" #include "hw/qdev.h" #include "hw/virtio/virtio-bus.h" diff --git a/hw/virtio/virtio-crypto-pci.c b/hw/virtio/virtio-crypto-pci.c index 13807e538b..c8a2317a10 100644 --- a/hw/virtio/virtio-crypto-pci.c +++ b/hw/virtio/virtio-crypto-pci.c @@ -11,6 +11,7 @@ * top-level directory. * */ + #include "qemu/osdep.h" #include "hw/pci/pci.h" #include "hw/virtio/virtio.h" @@ -18,6 +19,7 @@ #include "hw/virtio/virtio-pci.h" #include "hw/virtio/virtio-crypto.h" #include "qapi/error.h" +#include "qemu/module.h" typedef struct VirtIOCryptoPCI VirtIOCryptoPCI; diff --git a/hw/virtio/virtio-crypto.c b/hw/virtio/virtio-crypto.c index 9a9fa495d2..45187d3344 100644 --- a/hw/virtio/virtio-crypto.c +++ b/hw/virtio/virtio-crypto.c @@ -10,8 +10,10 @@ * (at your option) any later version. See the COPYING file in the * top-level directory. */ + #include "qemu/osdep.h" #include "qemu/iov.h" +#include "qemu/module.h" #include "hw/qdev.h" #include "qapi/error.h" #include "qemu/error-report.h" diff --git a/hw/virtio/virtio-input-host-pci.c b/hw/virtio/virtio-input-host-pci.c index 124c4f3447..a82eb5d914 100644 --- a/hw/virtio/virtio-input-host-pci.c +++ b/hw/virtio/virtio-input-host-pci.c @@ -10,6 +10,7 @@ #include "virtio-pci.h" #include "hw/virtio/virtio-input.h" +#include "qemu/module.h" typedef struct VirtIOInputHostPCI VirtIOInputHostPCI; diff --git a/hw/virtio/virtio-input-pci.c b/hw/virtio/virtio-input-pci.c index 28477729a3..1c40292abc 100644 --- a/hw/virtio/virtio-input-pci.c +++ b/hw/virtio/virtio-input-pci.c @@ -10,6 +10,7 @@ #include "virtio-pci.h" #include "hw/virtio/virtio-input.h" +#include "qemu/module.h" typedef struct VirtIOInputPCI VirtIOInputPCI; typedef struct VirtIOInputHIDPCI VirtIOInputHIDPCI; diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c index 96c762f0bf..97b7f35496 100644 --- a/hw/virtio/virtio-mmio.c +++ b/hw/virtio/virtio-mmio.c @@ -24,6 +24,7 @@ #include "hw/sysbus.h" #include "hw/virtio/virtio.h" #include "qemu/host-utils.h" +#include "qemu/module.h" #include "sysemu/kvm.h" #include "hw/virtio/virtio-bus.h" #include "qemu/error-report.h" diff --git a/hw/virtio/virtio-net-pci.c b/hw/virtio/virtio-net-pci.c index db07ab9e21..5df36f26bf 100644 --- a/hw/virtio/virtio-net-pci.c +++ b/hw/virtio/virtio-net-pci.c @@ -20,6 +20,7 @@ #include "hw/virtio/virtio-net.h" #include "virtio-pci.h" #include "qapi/error.h" +#include "qemu/module.h" typedef struct VirtIONetPCI VirtIONetPCI; diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 9056cdfa3c..e6d5467e54 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -23,6 +23,7 @@ #include "hw/pci/pci_bus.h" #include "qapi/error.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "hw/pci/msi.h" #include "hw/pci/msix.h" #include "hw/loader.h" diff --git a/hw/virtio/virtio-rng-pci.c b/hw/virtio/virtio-rng-pci.c index 6cc6374289..8aaf54b781 100644 --- a/hw/virtio/virtio-rng-pci.c +++ b/hw/virtio/virtio-rng-pci.c @@ -14,6 +14,7 @@ #include "virtio-pci.h" #include "hw/virtio/virtio-rng.h" #include "qapi/error.h" +#include "qemu/module.h" typedef struct VirtIORngPCI VirtIORngPCI; diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c index 30493a2586..db6d1d9454 100644 --- a/hw/virtio/virtio-rng.c +++ b/hw/virtio/virtio-rng.c @@ -12,6 +12,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/iov.h" +#include "qemu/module.h" #include "hw/qdev.h" #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-rng.h" diff --git a/hw/virtio/virtio-scsi-pci.c b/hw/virtio/virtio-scsi-pci.c index 2830849729..f68f689aee 100644 --- a/hw/virtio/virtio-scsi-pci.c +++ b/hw/virtio/virtio-scsi-pci.c @@ -16,6 +16,7 @@ #include "qemu/osdep.h" #include "hw/virtio/virtio-scsi.h" +#include "qemu/module.h" #include "virtio-pci.h" typedef struct VirtIOSCSIPCI VirtIOSCSIPCI; diff --git a/hw/virtio/virtio-serial-pci.c b/hw/virtio/virtio-serial-pci.c index 971b2eb8d8..ac74b44dae 100644 --- a/hw/virtio/virtio-serial-pci.c +++ b/hw/virtio/virtio-serial-pci.c @@ -18,6 +18,7 @@ #include "qemu/osdep.h" #include "hw/virtio/virtio-serial.h" +#include "qemu/module.h" #include "virtio-pci.h" typedef struct VirtIOSerialPCI VirtIOSerialPCI; diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 07f4a64b48..e1e90fcfd6 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -13,11 +13,11 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "trace.h" #include "exec/address-spaces.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "hw/virtio/virtio.h" #include "qemu/atomic.h" #include "hw/virtio/virtio-bus.h" diff --git a/hw/watchdog/cmsdk-apb-watchdog.c b/hw/watchdog/cmsdk-apb-watchdog.c index 9c865bce67..54ac393020 100644 --- a/hw/watchdog/cmsdk-apb-watchdog.c +++ b/hw/watchdog/cmsdk-apb-watchdog.c @@ -25,6 +25,7 @@ #include "trace.h" #include "qapi/error.h" #include "qemu/main-loop.h" +#include "qemu/module.h" #include "sysemu/watchdog.h" #include "hw/sysbus.h" #include "hw/registerfields.h" diff --git a/hw/watchdog/wdt_aspeed.c b/hw/watchdog/wdt_aspeed.c index 95f6ad186d..4a8409f0da 100644 --- a/hw/watchdog/wdt_aspeed.c +++ b/hw/watchdog/wdt_aspeed.c @@ -11,6 +11,7 @@ #include "qapi/error.h" #include "qemu/log.h" +#include "qemu/module.h" #include "qemu/timer.h" #include "sysemu/watchdog.h" #include "hw/misc/aspeed_scu.h" diff --git a/hw/watchdog/wdt_diag288.c b/hw/watchdog/wdt_diag288.c index 1475743527..29e5b5dcf6 100644 --- a/hw/watchdog/wdt_diag288.c +++ b/hw/watchdog/wdt_diag288.c @@ -17,6 +17,7 @@ #include "qemu/timer.h" #include "hw/watchdog/wdt_diag288.h" #include "qemu/log.h" +#include "qemu/module.h" static WatchdogTimerModel model = { .wdt_name = TYPE_WDT_DIAG288, diff --git a/hw/watchdog/wdt_i6300esb.c b/hw/watchdog/wdt_i6300esb.c index f2d1e86526..6780f01add 100644 --- a/hw/watchdog/wdt_i6300esb.c +++ b/hw/watchdog/wdt_i6300esb.c @@ -21,7 +21,7 @@ #include "qemu/osdep.h" -#include "qemu-common.h" +#include "qemu/module.h" #include "qemu/timer.h" #include "sysemu/watchdog.h" #include "hw/hw.h" diff --git a/hw/watchdog/wdt_ib700.c b/hw/watchdog/wdt_ib700.c index d045032bf4..e0e5beb99d 100644 --- a/hw/watchdog/wdt_ib700.c +++ b/hw/watchdog/wdt_ib700.c @@ -20,7 +20,7 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" +#include "qemu/module.h" #include "qemu/timer.h" #include "sysemu/watchdog.h" #include "hw/hw.h" diff --git a/hw/xen/xen-bus.c b/hw/xen/xen-bus.c index 49a725e8c7..a4416d0bcf 100644 --- a/hw/xen/xen-bus.c +++ b/hw/xen/xen-bus.c @@ -7,6 +7,7 @@ #include "qemu/osdep.h" #include "qemu/main-loop.h" +#include "qemu/module.h" #include "qemu/uuid.h" #include "hw/hw.h" #include "hw/sysbus.h" diff --git a/hw/xen/xen-common.c b/hw/xen/xen-common.c index 0e9e58f04d..32503cfc1c 100644 --- a/hw/xen/xen-common.c +++ b/hw/xen/xen-common.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "hw/xen/xen-legacy-backend.h" #include "chardev/char.h" #include "sysemu/accel.h" diff --git a/hw/xen/xen-host-pci-device.c b/hw/xen/xen-host-pci-device.c index eed8cc88e3..1b44dcafaf 100644 --- a/hw/xen/xen-host-pci-device.c +++ b/hw/xen/xen-host-pci-device.c @@ -8,7 +8,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "qemu/cutils.h" #include "xen-host-pci-device.h" diff --git a/hw/xen/xen_pt.h b/hw/xen/xen_pt.h index dbee3308fd..9167bbaf6d 100644 --- a/hw/xen/xen_pt.h +++ b/hw/xen/xen_pt.h @@ -1,7 +1,6 @@ #ifndef XEN_PT_H #define XEN_PT_H -#include "qemu-common.h" #include "hw/xen/xen_common.h" #include "hw/pci/pci.h" #include "xen-host-pci-device.h" diff --git a/hw/xtensa/sim.c b/hw/xtensa/sim.c index 12c7437398..b6922c39d5 100644 --- a/hw/xtensa/sim.c +++ b/hw/xtensa/sim.c @@ -27,7 +27,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "sysemu/sysemu.h" #include "hw/boards.h" diff --git a/hw/xtensa/xtensa_memory.c b/hw/xtensa/xtensa_memory.c index 394967f842..394d0cf227 100644 --- a/hw/xtensa/xtensa_memory.c +++ b/hw/xtensa/xtensa_memory.c @@ -27,7 +27,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "sysemu/sysemu.h" #include "hw/boards.h" diff --git a/hw/xtensa/xtensa_memory.h b/hw/xtensa/xtensa_memory.h index 89125c4a0d..d50a3cccc0 100644 --- a/hw/xtensa/xtensa_memory.h +++ b/hw/xtensa/xtensa_memory.h @@ -28,7 +28,6 @@ #ifndef XTENSA_MEMORY_H #define XTENSA_MEMORY_H -#include "qemu-common.h" #include "cpu.h" #include "exec/memory.h" |