aboutsummaryrefslogtreecommitdiff
path: root/hw/misc
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2019-08-12 07:23:42 +0200
committerMarkus Armbruster <armbru@redhat.com>2019-08-16 13:31:52 +0200
commit64552b6be4758d3a774f7787b294543ccebd5358 (patch)
tree585e4f41f5bc934e7dbdba73a2e49dc23ac4e190 /hw/misc
parent2a28720d773df2193c9fb633c02092cca107a9e5 (diff)
downloadqemu-64552b6be4758d3a774f7787b294543ccebd5358.zip
qemu-64552b6be4758d3a774f7787b294543ccebd5358.tar.gz
qemu-64552b6be4758d3a774f7787b294543ccebd5358.tar.bz2
Include hw/irq.h a lot less
In my "build everything" tree, changing hw/irq.h triggers a recompile of some 5400 out of 6600 objects (not counting tests and objects that don't depend on qemu/osdep.h). hw/hw.h supposedly includes it for convenience. Several other headers include it just to get qemu_irq and.or qemu_irq_handler. Move the qemu_irq and qemu_irq_handler typedefs from hw/irq.h to qemu/typedefs.h, and then include hw/irq.h only where it's still needed. Touching it now recompiles only some 500 objects. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20190812052359.30071-13-armbru@redhat.com>
Diffstat (limited to 'hw/misc')
-rw-r--r--hw/misc/arm_sysctl.c1
-rw-r--r--hw/misc/armsse-mhu.c1
-rw-r--r--hw/misc/aspeed_xdma.c1
-rw-r--r--hw/misc/bcm2835_mbox.c1
-rw-r--r--hw/misc/bcm2835_property.c1
-rw-r--r--hw/misc/eccmemctl.c1
-rw-r--r--hw/misc/iotkit-secctl.c1
-rw-r--r--hw/misc/macio/mac_dbdma.c1
-rw-r--r--hw/misc/macio/pmu.c1
-rw-r--r--hw/misc/max111x.c1
-rw-r--r--hw/misc/milkymist-pfpu.c1
-rw-r--r--hw/misc/mos6522.c1
-rw-r--r--hw/misc/mst_fpga.c1
-rw-r--r--hw/misc/nrf51_rng.c1
-rw-r--r--hw/misc/omap_clk.c2
-rw-r--r--hw/misc/omap_gpmc.c2
-rw-r--r--hw/misc/pc-testdev.c1
-rw-r--r--hw/misc/slavio_misc.c1
-rw-r--r--hw/misc/tmp105.c1
-rw-r--r--hw/misc/tz-mpc.c1
-rw-r--r--hw/misc/tz-msc.c1
-rw-r--r--hw/misc/tz-ppc.c1
-rw-r--r--hw/misc/zynq-xadc.c1
23 files changed, 25 insertions, 0 deletions
diff --git a/hw/misc/arm_sysctl.c b/hw/misc/arm_sysctl.c
index 457dfad..be8c9c0 100644
--- a/hw/misc/arm_sysctl.c
+++ b/hw/misc/arm_sysctl.c
@@ -9,6 +9,7 @@
#include "qemu/osdep.h"
#include "hw/hw.h"
+#include "hw/irq.h"
#include "qemu/timer.h"
#include "qemu/bitops.h"
#include "hw/sysbus.h"
diff --git a/hw/misc/armsse-mhu.c b/hw/misc/armsse-mhu.c
index 514321a..f8d4187 100644
--- a/hw/misc/armsse-mhu.c
+++ b/hw/misc/armsse-mhu.c
@@ -23,6 +23,7 @@
#include "sysemu/sysemu.h"
#include "hw/sysbus.h"
#include "hw/registerfields.h"
+#include "hw/irq.h"
#include "hw/misc/armsse-mhu.h"
REG32(CPU0INTR_STAT, 0x0)
diff --git a/hw/misc/aspeed_xdma.c b/hw/misc/aspeed_xdma.c
index eebd4ad..18a83bc 100644
--- a/hw/misc/aspeed_xdma.c
+++ b/hw/misc/aspeed_xdma.c
@@ -9,6 +9,7 @@
#include "qemu/osdep.h"
#include "qemu/log.h"
#include "qemu/error-report.h"
+#include "hw/irq.h"
#include "hw/misc/aspeed_xdma.h"
#include "qapi/error.h"
diff --git a/hw/misc/bcm2835_mbox.c b/hw/misc/bcm2835_mbox.c
index a87da5e..e484d25 100644
--- a/hw/misc/bcm2835_mbox.c
+++ b/hw/misc/bcm2835_mbox.c
@@ -10,6 +10,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
+#include "hw/irq.h"
#include "hw/misc/bcm2835_mbox.h"
#include "qemu/log.h"
#include "qemu/module.h"
diff --git a/hw/misc/bcm2835_property.c b/hw/misc/bcm2835_property.c
index 0bf789c..51cd93f 100644
--- a/hw/misc/bcm2835_property.c
+++ b/hw/misc/bcm2835_property.c
@@ -6,6 +6,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "hw/misc/bcm2835_property.h"
+#include "hw/irq.h"
#include "hw/misc/bcm2835_mbox_defs.h"
#include "sysemu/dma.h"
#include "qemu/log.h"
diff --git a/hw/misc/eccmemctl.c b/hw/misc/eccmemctl.c
index 8386db0..c16d56c 100644
--- a/hw/misc/eccmemctl.c
+++ b/hw/misc/eccmemctl.c
@@ -23,6 +23,7 @@
*/
#include "qemu/osdep.h"
+#include "hw/irq.h"
#include "hw/sysbus.h"
#include "qemu/module.h"
#include "trace.h"
diff --git a/hw/misc/iotkit-secctl.c b/hw/misc/iotkit-secctl.c
index 58fd94b..963fd6e 100644
--- a/hw/misc/iotkit-secctl.c
+++ b/hw/misc/iotkit-secctl.c
@@ -16,6 +16,7 @@
#include "trace.h"
#include "hw/sysbus.h"
#include "hw/registerfields.h"
+#include "hw/irq.h"
#include "hw/misc/iotkit-secctl.h"
/* Registers in the secure privilege control block */
diff --git a/hw/misc/macio/mac_dbdma.c b/hw/misc/macio/mac_dbdma.c
index 548625a..8a1de8c 100644
--- a/hw/misc/macio/mac_dbdma.c
+++ b/hw/misc/macio/mac_dbdma.c
@@ -39,6 +39,7 @@
#include "qemu/osdep.h"
#include "hw/hw.h"
+#include "hw/irq.h"
#include "hw/ppc/mac_dbdma.h"
#include "qemu/main-loop.h"
#include "qemu/module.h"
diff --git a/hw/misc/macio/pmu.c b/hw/misc/macio/pmu.c
index 753561d..6280bcb 100644
--- a/hw/misc/macio/pmu.c
+++ b/hw/misc/macio/pmu.c
@@ -33,6 +33,7 @@
#include "hw/hw.h"
#include "hw/ppc/mac.h"
#include "hw/input/adb.h"
+#include "hw/irq.h"
#include "hw/misc/mos6522.h"
#include "hw/misc/macio/gpio.h"
#include "hw/misc/macio/pmu.h"
diff --git a/hw/misc/max111x.c b/hw/misc/max111x.c
index d373ece..6fd7210 100644
--- a/hw/misc/max111x.c
+++ b/hw/misc/max111x.c
@@ -11,6 +11,7 @@
*/
#include "qemu/osdep.h"
+#include "hw/irq.h"
#include "hw/ssi/ssi.h"
#include "qemu/module.h"
diff --git a/hw/misc/milkymist-pfpu.c b/hw/misc/milkymist-pfpu.c
index 1c27f1a..fb21b89 100644
--- a/hw/misc/milkymist-pfpu.c
+++ b/hw/misc/milkymist-pfpu.c
@@ -24,6 +24,7 @@
#include "qemu/osdep.h"
#include "hw/hw.h"
+#include "hw/irq.h"
#include "hw/sysbus.h"
#include "trace.h"
#include "qemu/log.h"
diff --git a/hw/misc/mos6522.c b/hw/misc/mos6522.c
index e72ed69..84c677c 100644
--- a/hw/misc/mos6522.c
+++ b/hw/misc/mos6522.c
@@ -27,6 +27,7 @@
#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/input/adb.h"
+#include "hw/irq.h"
#include "hw/misc/mos6522.h"
#include "qemu/timer.h"
#include "sysemu/sysemu.h"
diff --git a/hw/misc/mst_fpga.c b/hw/misc/mst_fpga.c
index fd18303..256746a 100644
--- a/hw/misc/mst_fpga.c
+++ b/hw/misc/mst_fpga.c
@@ -13,6 +13,7 @@
#include "qemu/osdep.h"
#include "hw/hw.h"
+#include "hw/irq.h"
#include "hw/sysbus.h"
#include "qemu/module.h"
diff --git a/hw/misc/nrf51_rng.c b/hw/misc/nrf51_rng.c
index 96ef433..cf1bec2 100644
--- a/hw/misc/nrf51_rng.c
+++ b/hw/misc/nrf51_rng.c
@@ -14,6 +14,7 @@
#include "qemu/module.h"
#include "qapi/error.h"
#include "hw/arm/nrf51.h"
+#include "hw/irq.h"
#include "hw/misc/nrf51_rng.h"
#include "qemu/guest-random.h"
diff --git a/hw/misc/omap_clk.c b/hw/misc/omap_clk.c
index 9ea1418..c77ca2f 100644
--- a/hw/misc/omap_clk.c
+++ b/hw/misc/omap_clk.c
@@ -18,8 +18,10 @@
* You should have received a copy of the GNU General Public License along
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+
#include "qemu/osdep.h"
#include "hw/hw.h"
+#include "hw/irq.h"
#include "hw/arm/omap.h"
struct clk {
diff --git a/hw/misc/omap_gpmc.c b/hw/misc/omap_gpmc.c
index 84f9e4c..6253b0b 100644
--- a/hw/misc/omap_gpmc.c
+++ b/hw/misc/omap_gpmc.c
@@ -18,8 +18,10 @@
* You should have received a copy of the GNU General Public License along
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+
#include "qemu/osdep.h"
#include "hw/hw.h"
+#include "hw/irq.h"
#include "hw/block/flash.h"
#include "hw/arm/omap.h"
#include "exec/memory.h"
diff --git a/hw/misc/pc-testdev.c b/hw/misc/pc-testdev.c
index 1f9abd5..46adb6b 100644
--- a/hw/misc/pc-testdev.c
+++ b/hw/misc/pc-testdev.c
@@ -39,6 +39,7 @@
#include "hw/hw.h"
#include "hw/qdev.h"
#include "qemu/module.h"
+#include "hw/irq.h"
#include "hw/isa/isa.h"
#define IOMEM_LEN 0x10000
diff --git a/hw/misc/slavio_misc.c b/hw/misc/slavio_misc.c
index 9c2cf04..5f35195 100644
--- a/hw/misc/slavio_misc.c
+++ b/hw/misc/slavio_misc.c
@@ -24,6 +24,7 @@
#include "qemu/osdep.h"
#include "sysemu/sysemu.h"
+#include "hw/irq.h"
#include "hw/sysbus.h"
#include "qemu/module.h"
#include "trace.h"
diff --git a/hw/misc/tmp105.c b/hw/misc/tmp105.c
index 19def5c..2e30421 100644
--- a/hw/misc/tmp105.c
+++ b/hw/misc/tmp105.c
@@ -21,6 +21,7 @@
#include "qemu/osdep.h"
#include "hw/hw.h"
#include "hw/i2c/i2c.h"
+#include "hw/irq.h"
#include "tmp105.h"
#include "qapi/error.h"
#include "qapi/visitor.h"
diff --git a/hw/misc/tz-mpc.c b/hw/misc/tz-mpc.c
index 45a3e31..802aeb7 100644
--- a/hw/misc/tz-mpc.c
+++ b/hw/misc/tz-mpc.c
@@ -16,6 +16,7 @@
#include "trace.h"
#include "hw/sysbus.h"
#include "hw/registerfields.h"
+#include "hw/irq.h"
#include "hw/misc/tz-mpc.h"
/* Our IOMMU has two IOMMU indexes, one for secure transactions and one for
diff --git a/hw/misc/tz-msc.c b/hw/misc/tz-msc.c
index 52b96ba..7d1a536 100644
--- a/hw/misc/tz-msc.c
+++ b/hw/misc/tz-msc.c
@@ -16,6 +16,7 @@
#include "trace.h"
#include "hw/sysbus.h"
#include "hw/registerfields.h"
+#include "hw/irq.h"
#include "hw/misc/tz-msc.h"
static void tz_msc_update_irq(TZMSC *s)
diff --git a/hw/misc/tz-ppc.c b/hw/misc/tz-ppc.c
index 2a14a26..54db7fc 100644
--- a/hw/misc/tz-ppc.c
+++ b/hw/misc/tz-ppc.c
@@ -16,6 +16,7 @@
#include "trace.h"
#include "hw/sysbus.h"
#include "hw/registerfields.h"
+#include "hw/irq.h"
#include "hw/misc/tz-ppc.h"
static void tz_ppc_update_irq(TZPPC *s)
diff --git a/hw/misc/zynq-xadc.c b/hw/misc/zynq-xadc.c
index f1e4860..c5cff5a 100644
--- a/hw/misc/zynq-xadc.c
+++ b/hw/misc/zynq-xadc.c
@@ -15,6 +15,7 @@
#include "qemu/osdep.h"
#include "hw/hw.h"
+#include "hw/irq.h"
#include "hw/misc/zynq-xadc.h"
#include "qemu/timer.h"
#include "sysemu/sysemu.h"