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 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/timer/a9gtimer.c | 1 + hw/timer/allwinner-a10-pit.c | 1 + hw/timer/altera_timer.c | 1 + hw/timer/arm_mptimer.c | 1 + hw/timer/arm_timer.c | 2 +- hw/timer/cmsdk-apb-dualtimer.c | 1 + hw/timer/exynos4210_mct.c | 1 + hw/timer/grlib_gptimer.c | 1 + hw/timer/lm32_timer.c | 1 + hw/timer/m48t59-isa.c | 1 + hw/timer/m48t59.c | 1 + hw/timer/mc146818rtc.c | 1 + hw/timer/milkymist-sysctl.c | 1 + hw/timer/mss-timer.c | 1 + hw/timer/pl031.c | 1 + hw/timer/pxa2xx_timer.c | 1 + hw/timer/slavio_timer.c | 1 + hw/timer/stm32f2xx_timer.c | 1 + hw/timer/xilinx_timer.c | 1 + 19 files changed, 19 insertions(+), 1 deletion(-) (limited to 'hw/timer') diff --git a/hw/timer/a9gtimer.c b/hw/timer/a9gtimer.c index 0339b92cf8..75f1867174 100644 --- a/hw/timer/a9gtimer.c +++ b/hw/timer/a9gtimer.c @@ -23,6 +23,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/timer/a9gtimer.h" #include "migration/vmstate.h" #include "qapi/error.h" diff --git a/hw/timer/allwinner-a10-pit.c b/hw/timer/allwinner-a10-pit.c index 904da4fc88..1e1f74f1a1 100644 --- a/hw/timer/allwinner-a10-pit.c +++ b/hw/timer/allwinner-a10-pit.c @@ -17,6 +17,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "sysemu/sysemu.h" #include "hw/timer/allwinner-a10-pit.h" diff --git a/hw/timer/altera_timer.c b/hw/timer/altera_timer.c index 51971e44ca..c9988f67ac 100644 --- a/hw/timer/altera_timer.c +++ b/hw/timer/altera_timer.c @@ -27,6 +27,7 @@ #include "sysemu/sysemu.h" #include "hw/irq.h" #include "hw/ptimer.h" +#include "hw/qdev-properties.h" #define R_STATUS 0 #define R_CONTROL 1 diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c index abfc5baa77..983e61847e 100644 --- a/hw/timer/arm_mptimer.c +++ b/hw/timer/arm_mptimer.c @@ -23,6 +23,7 @@ #include "hw/hw.h" #include "hw/irq.h" #include "hw/ptimer.h" +#include "hw/qdev-properties.h" #include "hw/timer/arm_mptimer.h" #include "migration/vmstate.h" #include "qapi/error.h" diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c index 0b121252fd..c2e6211188 100644 --- a/hw/timer/arm_timer.c +++ b/hw/timer/arm_timer.c @@ -11,9 +11,9 @@ #include "hw/sysbus.h" #include "migration/vmstate.h" #include "qemu/timer.h" -#include "hw/qdev.h" #include "hw/irq.h" #include "hw/ptimer.h" +#include "hw/qdev-properties.h" #include "qemu/main-loop.h" #include "qemu/module.h" #include "qemu/log.h" diff --git a/hw/timer/cmsdk-apb-dualtimer.c b/hw/timer/cmsdk-apb-dualtimer.c index 6a084a91dd..5e2352dd32 100644 --- a/hw/timer/cmsdk-apb-dualtimer.c +++ b/hw/timer/cmsdk-apb-dualtimer.c @@ -24,6 +24,7 @@ #include "qemu/module.h" #include "hw/sysbus.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/registerfields.h" #include "hw/timer/cmsdk-apb-dualtimer.h" #include "migration/vmstate.h" diff --git a/hw/timer/exynos4210_mct.c b/hw/timer/exynos4210_mct.c index 79b291863c..77b9af05f4 100644 --- a/hw/timer/exynos4210_mct.c +++ b/hw/timer/exynos4210_mct.c @@ -54,6 +54,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" +#include "hw/hw.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "qemu/timer.h" diff --git a/hw/timer/grlib_gptimer.c b/hw/timer/grlib_gptimer.c index 28ba1259d0..32dbf870d4 100644 --- a/hw/timer/grlib_gptimer.c +++ b/hw/timer/grlib_gptimer.c @@ -28,6 +28,7 @@ #include "qemu/timer.h" #include "hw/irq.h" #include "hw/ptimer.h" +#include "hw/qdev-properties.h" #include "qemu/main-loop.h" #include "qemu/module.h" diff --git a/hw/timer/lm32_timer.c b/hw/timer/lm32_timer.c index a381e39f0a..ac3edaff4f 100644 --- a/hw/timer/lm32_timer.c +++ b/hw/timer/lm32_timer.c @@ -28,6 +28,7 @@ #include "trace.h" #include "qemu/timer.h" #include "hw/ptimer.h" +#include "hw/qdev-properties.h" #include "qemu/error-report.h" #include "qemu/main-loop.h" #include "qemu/module.h" diff --git a/hw/timer/m48t59-isa.c b/hw/timer/m48t59-isa.c index cbc5e61ddd..5e5432abfd 100644 --- a/hw/timer/m48t59-isa.c +++ b/hw/timer/m48t59-isa.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/isa/isa.h" +#include "hw/qdev-properties.h" #include "hw/timer/m48t59.h" #include "m48t59-internal.h" #include "qemu/module.h" diff --git a/hw/timer/m48t59.c b/hw/timer/m48t59.c index 199003030a..56f9dfa8dd 100644 --- a/hw/timer/m48t59.c +++ b/hw/timer/m48t59.c @@ -26,6 +26,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/timer/m48t59.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index 473935339d..5aa584c080 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -28,6 +28,7 @@ #include "qemu/module.h" #include "qemu/bcd.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" #include "sysemu/replay.h" diff --git a/hw/timer/milkymist-sysctl.c b/hw/timer/milkymist-sysctl.c index 4d75d73a93..a65c174c04 100644 --- a/hw/timer/milkymist-sysctl.c +++ b/hw/timer/milkymist-sysctl.c @@ -29,6 +29,7 @@ #include "trace.h" #include "qemu/timer.h" #include "hw/ptimer.h" +#include "hw/qdev-properties.h" #include "qemu/error-report.h" #include "qemu/main-loop.h" #include "qemu/module.h" diff --git a/hw/timer/mss-timer.c b/hw/timer/mss-timer.c index 084e02199d..45f1cf42f9 100644 --- a/hw/timer/mss-timer.c +++ b/hw/timer/mss-timer.c @@ -28,6 +28,7 @@ #include "qemu/module.h" #include "qemu/log.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/timer/mss-timer.h" #include "migration/vmstate.h" diff --git a/hw/timer/pl031.c b/hw/timer/pl031.c index 39abd08643..2b3e261006 100644 --- a/hw/timer/pl031.c +++ b/hw/timer/pl031.c @@ -16,6 +16,7 @@ #include "hw/timer/pl031.h" #include "migration/vmstate.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" diff --git a/hw/timer/pxa2xx_timer.c b/hw/timer/pxa2xx_timer.c index 99e6c1e250..af7e4dbcbd 100644 --- a/hw/timer/pxa2xx_timer.c +++ b/hw/timer/pxa2xx_timer.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" #include "hw/arm/pxa.h" diff --git a/hw/timer/slavio_timer.c b/hw/timer/slavio_timer.c index 931ffd483f..38fd32b62a 100644 --- a/hw/timer/slavio_timer.c +++ b/hw/timer/slavio_timer.c @@ -26,6 +26,7 @@ #include "qemu/timer.h" #include "hw/irq.h" #include "hw/ptimer.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "migration/vmstate.h" #include "trace.h" diff --git a/hw/timer/stm32f2xx_timer.c b/hw/timer/stm32f2xx_timer.c index b41822f047..edc557a4b9 100644 --- a/hw/timer/stm32f2xx_timer.c +++ b/hw/timer/stm32f2xx_timer.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/timer/stm32f2xx_timer.h" #include "migration/vmstate.h" #include "qemu/log.h" diff --git a/hw/timer/xilinx_timer.c b/hw/timer/xilinx_timer.c index c4a83af8b9..355518232c 100644 --- a/hw/timer/xilinx_timer.c +++ b/hw/timer/xilinx_timer.c @@ -26,6 +26,7 @@ #include "hw/sysbus.h" #include "hw/irq.h" #include "hw/ptimer.h" +#include "hw/qdev-properties.h" #include "qemu/log.h" #include "qemu/main-loop.h" #include "qemu/module.h" -- cgit v1.2.3-55-g7522