From a27bd6c779badb8d76e4430d810ef710a1b98f4e Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 12 Aug 2019 07:23:51 +0200 Subject: Include hw/qdev-properties.h less MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In my "build everything" tree, changing hw/qdev-properties.h triggers a recompile of some 2700 out of 6600 objects (not counting tests and objects that don't depend on qemu/osdep.h). Many places including hw/qdev-properties.h (directly or via hw/qdev.h) actually need only hw/qdev-core.h. Include hw/qdev-core.h there instead. hw/qdev.h is actually pointless: all it does is include hw/qdev-core.h and hw/qdev-properties.h, which in turn includes hw/qdev-core.h. Replace the remaining uses of hw/qdev.h by hw/qdev-properties.h. While there, delete a few superfluous inclusions of hw/qdev-core.h. Touching hw/qdev-properties.h now recompiles some 1200 objects. Cc: Paolo Bonzini Cc: "Daniel P. Berrangé" Cc: Eduardo Habkost Signed-off-by: Markus Armbruster Reviewed-by: Eduardo Habkost Message-Id: <20190812052359.30071-22-armbru@redhat.com> --- hw/arm/armv7m.c | 1 + hw/arm/aspeed.c | 1 + hw/arm/digic.c | 1 + hw/arm/exynos4210.c | 1 + hw/arm/exynos4_boards.c | 1 + hw/arm/fsl-imx25.c | 1 + hw/arm/fsl-imx31.c | 1 + hw/arm/fsl-imx6.c | 1 + hw/arm/mcimx6ul-evk.c | 1 + hw/arm/mcimx7d-sabre.c | 1 + hw/arm/microbit.c | 1 + hw/arm/msf2-som.c | 1 + hw/arm/musicpal.c | 1 + hw/arm/netduino2.c | 1 + hw/arm/nseries.c | 1 + hw/arm/omap1.c | 1 + hw/arm/omap2.c | 1 + hw/arm/pxa2xx.c | 1 + hw/arm/pxa2xx_gpio.c | 1 + hw/arm/sabrelite.c | 1 + hw/arm/sbsa-ref.c | 1 + hw/arm/spitz.c | 1 + hw/arm/stm32f205_soc.c | 1 + hw/arm/strongarm.c | 1 + hw/arm/virt.c | 1 + 25 files changed, 25 insertions(+) (limited to 'hw/arm') diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c index 4b2d8b6574..7a3c48f002 100644 --- a/hw/arm/armv7m.c +++ b/hw/arm/armv7m.c @@ -14,6 +14,7 @@ #include "hw/sysbus.h" #include "hw/arm/boot.h" #include "hw/loader.h" +#include "hw/qdev-properties.h" #include "elf.h" #include "sysemu/qtest.h" #include "sysemu/reset.h" diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index 843b708247..7a2e885e0b 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -20,6 +20,7 @@ #include "hw/i2c/smbus_eeprom.h" #include "hw/misc/pca9552.h" #include "hw/misc/tmp105.h" +#include "hw/qdev-properties.h" #include "qemu/log.h" #include "sysemu/block-backend.h" #include "sysemu/sysemu.h" diff --git a/hw/arm/digic.c b/hw/arm/digic.c index 9015b60c23..4f52465875 100644 --- a/hw/arm/digic.c +++ b/hw/arm/digic.c @@ -24,6 +24,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/arm/digic.h" +#include "hw/qdev-properties.h" #include "sysemu/sysemu.h" #define DIGIC4_TIMER_BASE(n) (0xc0210000 + (n) * 0x100) diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c index 9aa5ec3f5d..0e403f3e78 100644 --- a/hw/arm/exynos4210.c +++ b/hw/arm/exynos4210.c @@ -32,6 +32,7 @@ #include "hw/sysbus.h" #include "hw/arm/boot.h" #include "hw/loader.h" +#include "hw/qdev-properties.h" #include "hw/arm/exynos4210.h" #include "hw/sd/sdhci.h" #include "hw/usb/hcd-ehci.h" diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c index 7624e16084..f69358a5ba 100644 --- a/hw/arm/exynos4_boards.c +++ b/hw/arm/exynos4_boards.c @@ -33,6 +33,7 @@ #include "exec/address-spaces.h" #include "hw/arm/exynos4210.h" #include "hw/net/lan9118.h" +#include "hw/qdev-properties.h" #include "hw/boards.h" #include "hw/irq.h" diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c index 869ee89b15..098e84c84d 100644 --- a/hw/arm/fsl-imx25.c +++ b/hw/arm/fsl-imx25.c @@ -29,6 +29,7 @@ #include "sysemu/sysemu.h" #include "exec/address-spaces.h" #include "hw/boards.h" +#include "hw/qdev-properties.h" #include "chardev/char.h" static void fsl_imx25_init(Object *obj) diff --git a/hw/arm/fsl-imx31.c b/hw/arm/fsl-imx31.c index 662fe78f1b..093ad40984 100644 --- a/hw/arm/fsl-imx31.c +++ b/hw/arm/fsl-imx31.c @@ -26,6 +26,7 @@ #include "sysemu/sysemu.h" #include "exec/address-spaces.h" #include "hw/boards.h" +#include "hw/qdev-properties.h" #include "chardev/char.h" static void fsl_imx31_init(Object *obj) diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c index de45833097..8c397ef04b 100644 --- a/hw/arm/fsl-imx6.c +++ b/hw/arm/fsl-imx6.c @@ -23,6 +23,7 @@ #include "qapi/error.h" #include "hw/arm/fsl-imx6.h" #include "hw/boards.h" +#include "hw/qdev-properties.h" #include "sysemu/sysemu.h" #include "chardev/char.h" #include "qemu/error-report.h" diff --git a/hw/arm/mcimx6ul-evk.c b/hw/arm/mcimx6ul-evk.c index 1f6f4aed97..0276875f02 100644 --- a/hw/arm/mcimx6ul-evk.c +++ b/hw/arm/mcimx6ul-evk.c @@ -14,6 +14,7 @@ #include "qapi/error.h" #include "hw/arm/fsl-imx6ul.h" #include "hw/boards.h" +#include "hw/qdev-properties.h" #include "sysemu/sysemu.h" #include "qemu/error-report.h" #include "sysemu/qtest.h" diff --git a/hw/arm/mcimx7d-sabre.c b/hw/arm/mcimx7d-sabre.c index 72eab03a0c..97b8bb788a 100644 --- a/hw/arm/mcimx7d-sabre.c +++ b/hw/arm/mcimx7d-sabre.c @@ -16,6 +16,7 @@ #include "qapi/error.h" #include "hw/arm/fsl-imx7.h" #include "hw/boards.h" +#include "hw/qdev-properties.h" #include "sysemu/sysemu.h" #include "qemu/error-report.h" #include "sysemu/qtest.h" diff --git a/hw/arm/microbit.c b/hw/arm/microbit.c index e9a891f7d3..ef213695bd 100644 --- a/hw/arm/microbit.c +++ b/hw/arm/microbit.c @@ -17,6 +17,7 @@ #include "hw/arm/nrf51_soc.h" #include "hw/i2c/microbit_i2c.h" +#include "hw/qdev-properties.h" typedef struct { MachineState parent; diff --git a/hw/arm/msf2-som.c b/hw/arm/msf2-som.c index 2c9984bb3b..dbd35b6def 100644 --- a/hw/arm/msf2-som.c +++ b/hw/arm/msf2-som.c @@ -27,6 +27,7 @@ #include "qapi/error.h" #include "qemu/error-report.h" #include "hw/boards.h" +#include "hw/qdev-properties.h" #include "hw/arm/boot.h" #include "exec/address-spaces.h" #include "hw/arm/msf2-soc.h" diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index a3cfdc3077..92fbe74d74 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -22,6 +22,7 @@ #include "hw/hw.h" #include "qemu/timer.h" #include "hw/ptimer.h" +#include "hw/qdev-properties.h" #include "hw/block/flash.h" #include "ui/console.h" #include "hw/i2c/i2c.h" diff --git a/hw/arm/netduino2.c b/hw/arm/netduino2.c index f57fc38f92..e770d9cac8 100644 --- a/hw/arm/netduino2.c +++ b/hw/arm/netduino2.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/boards.h" +#include "hw/qdev-properties.h" #include "qemu/error-report.h" #include "hw/arm/stm32f205_soc.h" #include "hw/arm/boot.h" diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c index 3f3eca52e2..af99ff4522 100644 --- a/hw/arm/nseries.c +++ b/hw/arm/nseries.c @@ -35,6 +35,7 @@ #include "hw/input/tsc2xxx.h" #include "hw/misc/cbus.h" #include "hw/misc/tmp105.h" +#include "hw/qdev-properties.h" #include "hw/block/flash.h" #include "hw/hw.h" #include "hw/bt.h" diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c index ce9247118e..19fca4159a 100644 --- a/hw/arm/omap1.c +++ b/hw/arm/omap1.c @@ -26,6 +26,7 @@ #include "hw/boards.h" #include "hw/hw.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/arm/boot.h" #include "hw/arm/omap.h" #include "sysemu/sysemu.h" diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c index af5e3d0ba7..dccb5707f8 100644 --- a/hw/arm/omap2.c +++ b/hw/arm/omap2.c @@ -26,6 +26,7 @@ #include "sysemu/reset.h" #include "hw/boards.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/arm/boot.h" #include "hw/arm/omap.h" #include "sysemu/sysemu.h" diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c index 4e99c30e11..cdafde2f76 100644 --- a/hw/arm/pxa2xx.c +++ b/hw/arm/pxa2xx.c @@ -20,6 +20,7 @@ #include "hw/char/serial.h" #include "hw/i2c/i2c.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/ssi/ssi.h" #include "chardev/char-fe.h" #include "sysemu/blockdev.h" diff --git a/hw/arm/pxa2xx_gpio.c b/hw/arm/pxa2xx_gpio.c index aa2c89dcf9..86a0e86c4c 100644 --- a/hw/arm/pxa2xx_gpio.c +++ b/hw/arm/pxa2xx_gpio.c @@ -11,6 +11,7 @@ #include "cpu.h" #include "hw/hw.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "hw/arm/pxa.h" diff --git a/hw/arm/sabrelite.c b/hw/arm/sabrelite.c index 934f4c9261..a6185c169e 100644 --- a/hw/arm/sabrelite.c +++ b/hw/arm/sabrelite.c @@ -14,6 +14,7 @@ #include "qapi/error.h" #include "hw/arm/fsl-imx6.h" #include "hw/boards.h" +#include "hw/qdev-properties.h" #include "sysemu/sysemu.h" #include "qemu/error-report.h" #include "sysemu/qtest.h" diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index 9c67d5c6f9..2a0e2ed1d0 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -36,6 +36,7 @@ #include "hw/intc/arm_gicv3_common.h" #include "hw/loader.h" #include "hw/pci-host/gpex.h" +#include "hw/qdev-properties.h" #include "hw/usb.h" #include "net/net.h" diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c index 2eabb9c814..ee010c48b2 100644 --- a/hw/arm/spitz.c +++ b/hw/arm/spitz.c @@ -16,6 +16,7 @@ #include "hw/arm/boot.h" #include "sysemu/sysemu.h" #include "hw/pcmcia.h" +#include "hw/qdev-properties.h" #include "hw/i2c/i2c.h" #include "hw/irq.h" #include "hw/ssi/ssi.h" diff --git a/hw/arm/stm32f205_soc.c b/hw/arm/stm32f205_soc.c index c08041a1c5..be8b7df679 100644 --- a/hw/arm/stm32f205_soc.c +++ b/hw/arm/stm32f205_soc.c @@ -28,6 +28,7 @@ #include "hw/arm/boot.h" #include "exec/address-spaces.h" #include "hw/arm/stm32f205_soc.h" +#include "hw/qdev-properties.h" /* At the moment only Timer 2 to 5 are modelled */ static const uint32_t timer_addr[STM_NUM_TIMERS] = { 0x40000000, 0x40000400, diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c index ca377df9e3..dc65d88a65 100644 --- a/hw/arm/strongarm.c +++ b/hw/arm/strongarm.c @@ -32,6 +32,7 @@ #include "cpu.h" #include "hw/boards.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "strongarm.h" diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 0e5152ed3b..e9fddec058 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -54,6 +54,7 @@ #include "hw/pci-host/gpex.h" #include "hw/arm/sysbus-fdt.h" #include "hw/platform-bus.h" +#include "hw/qdev-properties.h" #include "hw/arm/fdt.h" #include "hw/intc/arm_gic.h" #include "hw/intc/arm_gicv3_common.h" -- cgit v1.2.3