include: move hw/irq.h to hw/core/

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 02b78717b1fafe2b7d22c7607a349eabe88f443c..f85eb42d78b8489da88393bcd1f3486b65e381af 100644 (file)
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -42,7 +42,7 @@
 #include "qemu/event_notifier.h"
 #include "qemu/main-loop.h"
 #include "trace.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "qapi/visitor.h"
 #include "qapi/qapi-types-common.h"
 #include "qapi/qapi-visit-common.h"

diff --git a/hw/acpi/core.c b/hw/acpi/core.c
index ff1658280338af9564c92b9321feeded481d0c7f..2b74bed8823e37305c11ed4f7a73138bff3208d6 100644 (file)
--- a/hw/acpi/core.c
+++ b/hw/acpi/core.c
@@ -20,7 +20,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/acpi/acpi.h"
 #include "hw/nvram/fw_cfg.h"
 #include "qemu/config-file.h"

diff --git a/hw/acpi/generic_event_device.c b/hw/acpi/generic_event_device.c
index e7b773d84d50d3b10994977fa5d5416e8cd675c6..675ec43d094bc0adc07f4f4374b511f220acb80e 100644 (file)
--- a/hw/acpi/generic_event_device.c
+++ b/hw/acpi/generic_event_device.c
@@ -15,7 +15,7 @@
 #include "hw/acpi/pcihp.h"
 #include "hw/acpi/generic_event_device.h"
 #include "hw/pci/pci.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/mem/pc-dimm.h"
 #include "hw/mem/nvdimm.h"
 #include "hw/pci/pci_device.h"

diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
index 9e0892a51f8db927efaf7a337b658725a6055b80..1e3c63454110ba89cd5c62af6a0530a07177416b 100644 (file)
--- a/hw/acpi/piix4.c
+++ b/hw/acpi/piix4.c
@@ -20,7 +20,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/isa/apm.h"
 #include "hw/i2c/pm_smbus.h"
 #include "hw/pci/pci.h"

diff --git a/hw/adc/aspeed_adc.c b/hw/adc/aspeed_adc.c
index 3e820cae1e308301c530d25ef954c891c0e63bc5..564979f24ddae5199a3664d460b3b964aab2d2bb 100644 (file)
--- a/hw/adc/aspeed_adc.c
+++ b/hw/adc/aspeed_adc.c
@@ -11,7 +11,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/log.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "hw/adc/aspeed_adc.h"

diff --git a/hw/adc/zynq-xadc.c b/hw/adc/zynq-xadc.c
index 748a51ba78b80b410371cc20520464dc5b8758a4..1934ef0b1a922f594c005c520ecd4019599962ce 100644 (file)
--- a/hw/adc/zynq-xadc.c
+++ b/hw/adc/zynq-xadc.c
@@ -14,7 +14,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/adc/zynq-xadc.h"
 #include "migration/vmstate.h"
 #include "qemu/timer.h"

diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c
index 4c56f981d71c38f74d00d210e500727156bcb782..01fda4b1c8afdbc291c5ba9b42da5923f72ba10a 100644 (file)
--- a/hw/alpha/typhoon.c
+++ b/hw/alpha/typhoon.c
@@ -13,7 +13,7 @@
 #include "qapi/error.h"
 #include "hw/pci/pci_host.h"
 #include "cpu.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "alpha_sys.h"
 
 

diff --git a/hw/arm/armsse.c b/hw/arm/armsse.c
index 50ab7f48105af444f2a1b9df3d9eb16fc44a6cad..c0d99182bf9cacc65fa3d186779cafc70e899930 100644 (file)
--- a/hw/arm/armsse.c
+++ b/hw/arm/armsse.c
@@ -22,7 +22,7 @@
 #include "hw/arm/armsse.h"
 #include "hw/arm/armsse-version.h"
 #include "hw/arm/boot.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-clock.h"
 
 /*

diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c
index 76001ff0dfc8d86abc56241ed68ecb806af9fc95..2d8e257ca2a45ff4eabaea22a8c16a1bb19a015c 100644 (file)
--- a/hw/arm/exynos4210.c
+++ b/hw/arm/exynos4210.c
@@ -26,7 +26,7 @@
 #include "exec/tswap.h"
 #include "cpu.h"
 #include "hw/cpu/a9mpcore.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "system/blockdev.h"
 #include "system/system.h"
 #include "hw/sysbus.h"

diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c
index 66af0e2376d2cb7d6caf944757a88cf442243b41..f07dd452fcbdce01865d8ddefde0bd301ae9e884 100644 (file)
--- a/hw/arm/exynos4_boards.c
+++ b/hw/arm/exynos4_boards.c
@@ -34,7 +34,7 @@
 #include "hw/net/lan9118.h"
 #include "hw/qdev-properties.h"
 #include "hw/core/boards.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "target/arm/cpu-qom.h"
 
 #define SMDK_LAN9118_BASE_ADDR      0x05000000

diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c
index 436fcdd510112ae3ecbde42a9f5d72bf3b2e89b1..b24df11db92213c929bea102f11fb771bc9aab07 100644 (file)
--- a/hw/arm/integratorcp.c
+++ b/hw/arm/integratorcp.c
@@ -24,7 +24,7 @@
 #include "qemu/error-report.h"
 #include "hw/char/pl011.h"
 #include "hw/hw.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sd/sd.h"
 #include "qom/object.h"
 #include "qemu/audio.h"

diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c
index 3188caf222814be13bf3688f7d6e26692d948ea4..a0d917f9a9eca091ce4e1339301e4605e4c8a346 100644 (file)
--- a/hw/arm/mps2-tz.c
+++ b/hw/arm/mps2-tz.c
@@ -75,7 +75,7 @@
 #include "hw/core/split-irq.h"
 #include "hw/qdev-clock.h"
 #include "qom/object.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 
 #define MPS2TZ_NUMIRQ_MAX 96
 #define MPS2TZ_RAM_MAX 5

diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
index 3e62454096044e78c8d9bd723594764a8d31974d..9852e8f7648cd506b2f8fa9db8c16a80ae9d7d2f 100644 (file)
--- a/hw/arm/musicpal.c
+++ b/hw/arm/musicpal.c
@@ -27,7 +27,7 @@
 #include "ui/console.h"
 #include "hw/i2c/i2c.h"
 #include "hw/i2c/bitbang_i2c.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/or-irq.h"
 #include "hw/audio/wm8750.h"
 #include "system/block-backend.h"

diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c
index 74458fb7c69087e090826c6be3489b64941882b0..994e5a919e1eabc69ee3b1b4ec04403b6537ae71 100644 (file)
--- a/hw/arm/omap1.c
+++ b/hw/arm/omap1.c
@@ -25,7 +25,7 @@
 #include "cpu.h"
 #include "system/address-spaces.h"
 #include "hw/hw.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/omap.h"

diff --git a/hw/arm/realview.c b/hw/arm/realview.c
index 97008490f6a7e850e2867e7d3b69924f7d3c1a48..65506768e41f75f7644da10d689125be8a7857a0 100644 (file)
--- a/hw/arm/realview.c
+++ b/hw/arm/realview.c
@@ -27,7 +27,7 @@
 #include "hw/char/pl011.h"
 #include "hw/cpu/a9mpcore.h"
 #include "hw/intc/realview_gic.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/i2c/arm_sbcon_i2c.h"
 #include "hw/sd/sd.h"
 #include "qemu/audio.h"

diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c
index bcf8af8dc731beaa02fb06ffd615dfd8365ac474..ae4fba15991f9f9b5bd4ea05f0a545f95e8bd2b8 100644 (file)
--- a/hw/arm/smmuv3.c
+++ b/hw/arm/smmuv3.c
@@ -18,7 +18,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/bitops.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/qdev-properties.h"

diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c
index d1cbf43777e5deae3fac24e7090720b8d5a65983..34cbcbe32c26d8a3e7262f280a36b5997d8d18ba 100644 (file)
--- a/hw/arm/stellaris.c
+++ b/hw/arm/stellaris.c
@@ -26,7 +26,7 @@
 #include "hw/arm/armv7m.h"
 #include "hw/char/pl011.h"
 #include "hw/input/stellaris_gamepad.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/watchdog/cmsdk-apb-watchdog.h"
 #include "migration/vmstate.h"
 #include "hw/misc/unimp.h"

diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c
index 059b07907d8c3ca8fdd7c58f68f432f7a745ceb6..95dda0785229ee405d50dbde486fd2578be4bbbe 100644 (file)
--- a/hw/arm/strongarm.c
+++ b/hw/arm/strongarm.c
@@ -28,7 +28,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/sysbus.h"

diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c
index dd1047f6c62e1cc14b0368f3ef6098bf6a89d6e5..94661b83d00ce598f54539eac2e776372c651591 100644 (file)
--- a/hw/arm/versatilepb.c
+++ b/hw/arm/versatilepb.c
@@ -19,7 +19,7 @@
 #include "hw/pci/pci.h"
 #include "hw/i2c/i2c.h"
 #include "hw/i2c/arm_sbcon_i2c.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/core/boards.h"
 #include "hw/block/flash.h"
 #include "qemu/error-report.h"

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 25fb2bab5680adb2765547b540e45271735f8a22..6155db2b0935ec41265455d9854fe19807fd984f 100644 (file)
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -68,7 +68,7 @@
 #include "hw/intc/arm_gic.h"
 #include "hw/intc/arm_gicv3_common.h"
 #include "hw/intc/arm_gicv3_its_common.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "kvm_arm.h"
 #include "hvf_arm.h"
 #include "hw/firmware/smbios.h"

diff --git a/hw/audio/asc.c b/hw/audio/asc.c
index 0abb106979bbf08c22b3984999b45b29364a3874..b6f420450030d1249588655b620bb61cc5374b12 100644 (file)
--- a/hw/audio/asc.c
+++ b/hw/audio/asc.c
@@ -14,7 +14,7 @@
 #include "qemu/timer.h"
 #include "qapi/error.h"
 #include "hw/sysbus.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "qemu/audio.h"
 #include "hw/audio/asc.h"
 #include "hw/qdev-properties.h"

diff --git a/hw/audio/cs4231a.c b/hw/audio/cs4231a.c
index 98fdbc5b7250d060d8709c9960400a8166c2df07..8368172f401c252db2f4da1ea1fe5b69ddc44009 100644 (file)
--- a/hw/audio/cs4231a.c
+++ b/hw/audio/cs4231a.c
@@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 #include "hw/audio/model.h"
 #include "qemu/audio.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/isa/isa.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"

diff --git a/hw/audio/gus.c b/hw/audio/gus.c
index 68f89e994c2a8a2afefef91c2508d958fc8ccadf..6c41b25486e6cc1a16669cd2b0b8b82b99b1278a 100644 (file)
--- a/hw/audio/gus.c
+++ b/hw/audio/gus.c
@@ -27,7 +27,7 @@
 #include "qemu/module.h"
 #include "hw/audio/model.h"
 #include "qemu/audio.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/isa/isa.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"

diff --git a/hw/audio/marvell_88w8618.c b/hw/audio/marvell_88w8618.c
index a483f4e70d198d452cd9c52dcb56e2821977abb6..ba9bd6befd723fd7be8001c1d6fa5cb8ff037fca 100644 (file)
--- a/hw/audio/marvell_88w8618.c
+++ b/hw/audio/marvell_88w8618.c
@@ -13,7 +13,7 @@
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/audio/wm8750.h"
 #include "qemu/audio.h"

diff --git a/hw/audio/pl041.c b/hw/audio/pl041.c
index fd3d09611faf51656082189115a8a19ab5c9f613..7bb2c81afcd3cf79fb6d08e55479cc92ad0c1804 100644 (file)
--- a/hw/audio/pl041.c
+++ b/hw/audio/pl041.c
@@ -21,7 +21,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "qemu/log.h"

diff --git a/hw/audio/sb16.c b/hw/audio/sb16.c
index 1e3c4caf5efc86ae74ddcf930f2a2d17fe0d16d5..6ca31a0e64939975eaff084185607224cefdb6a3 100644 (file)
--- a/hw/audio/sb16.c
+++ b/hw/audio/sb16.c
@@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 #include "hw/audio/model.h"
 #include "qemu/audio.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/isa/isa.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"

diff --git a/hw/block/fdc-isa.c b/hw/block/fdc-isa.c
index 6d1790e0e613832f0eeca29d6b255a8873484a19..0034c3594aeb22517aec95a0c3ffd76cf556cdcc 100644 (file)
--- a/hw/block/fdc-isa.c
+++ b/hw/block/fdc-isa.c
@@ -33,7 +33,7 @@
 #include "qemu/error-report.h"
 #include "qemu/timer.h"
 #include "hw/acpi/acpi_aml_interface.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/isa/isa.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"

diff --git a/hw/block/fdc.c b/hw/block/fdc.c
index d0f08c7be543bf26f08fb4a4501c2080c3a65885..e0e53ba0382151408a53de0d4e3f2b18aa08bc95 100644 (file)
--- a/hw/block/fdc.c
+++ b/hw/block/fdc.c
@@ -33,7 +33,7 @@
 #include "qemu/error-report.h"
 #include "qemu/timer.h"
 #include "qemu/memalign.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/isa/isa.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"

diff --git a/hw/char/avr_usart.c b/hw/char/avr_usart.c
index fae15217e9f0eac6a5cf77abe93d58a351156013..e98ad53e4478b0312778f173b6f7b5e2773d5291 100644 (file)
--- a/hw/char/avr_usart.c
+++ b/hw/char/avr_usart.c
@@ -22,7 +22,7 @@
 #include "qemu/osdep.h"
 #include "hw/char/avr_usart.h"
 #include "qemu/log.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 

diff --git a/hw/char/bcm2835_aux.c b/hw/char/bcm2835_aux.c
index 2b397f2ff39cb67e8ce09e51cc3dc3dabd161685..03428efeea84a7c6a4c8e4211e75e8a32d0a838e 100644 (file)
--- a/hw/char/bcm2835_aux.c
+++ b/hw/char/bcm2835_aux.c
@@ -22,7 +22,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/char/bcm2835_aux.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "migration/vmstate.h"

diff --git a/hw/char/cadence_uart.c b/hw/char/cadence_uart.c
index 0dfa356b6d0db039be1556d41c7b6243ff095063..738ba3114b909dad25c845805bb96cfacf06f6d2 100644 (file)
--- a/hw/char/cadence_uart.c
+++ b/hw/char/cadence_uart.c
@@ -30,7 +30,7 @@
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "hw/char/cadence_uart.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-clock.h"
 #include "hw/qdev-properties-system.h"
 #include "trace.h"

diff --git a/hw/char/cmsdk-apb-uart.c b/hw/char/cmsdk-apb-uart.c
index 32090f3516f6accad32bcd9fe9b10d572f17ed12..a5ec61a00440226192b46a80be6050151cdaf0cd 100644 (file)
--- a/hw/char/cmsdk-apb-uart.c
+++ b/hw/char/cmsdk-apb-uart.c
@@ -26,7 +26,7 @@
 #include "chardev/char-fe.h"
 #include "chardev/char-serial.h"
 #include "hw/char/cmsdk-apb-uart.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties-system.h"
 
 REG32(DATA, 0)

diff --git a/hw/char/diva-gsp.c b/hw/char/diva-gsp.c
index e1f0713cb794d0442c56935dfe56d784d96949f0..835594e5cb6d1a850c37e112a8894f0a83388f61 100644 (file)
--- a/hw/char/diva-gsp.c
+++ b/hw/char/diva-gsp.c
@@ -18,7 +18,7 @@
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 #include "hw/char/serial.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/pci/pci_device.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"

diff --git a/hw/char/escc.c b/hw/char/escc.c
index afe4ca483e75fd20848faf379a992ddb61e7c86d..27269dca6433bc113c641b17a924d78cf610e7cc 100644 (file)
--- a/hw/char/escc.c
+++ b/hw/char/escc.c
@@ -23,7 +23,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/sysbus.h"

diff --git a/hw/char/exynos4210_uart.c b/hw/char/exynos4210_uart.c
index 9e45d8199048125bd3943fe2ff1380bc1ef7952a..8ba310fd7acb85ea23e65d385dd8e06883888fc6 100644 (file)
--- a/hw/char/exynos4210_uart.c
+++ b/hw/char/exynos4210_uart.c
@@ -30,7 +30,7 @@
 #include "chardev/char-serial.h"
 
 #include "hw/arm/exynos4210.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 

diff --git a/hw/char/goldfish_tty.c b/hw/char/goldfish_tty.c
index a37408adae59eb3611c9e3e9937956adf71d0223..821b32185027554b441f3a473d0b2ce1adf5c419 100644 (file)
--- a/hw/char/goldfish_tty.c
+++ b/hw/char/goldfish_tty.c
@@ -8,7 +8,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"

diff --git a/hw/char/grlib_apbuart.c b/hw/char/grlib_apbuart.c
index b2d5a40bb4ddaa69d1bb330ceeb4d4bf852b1e26..15925eb2e6398d04e1ee8ba5787d8d0cc43690d4 100644 (file)
--- a/hw/char/grlib_apbuart.c
+++ b/hw/char/grlib_apbuart.c
@@ -25,7 +25,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/char/grlib_uart.h"

diff --git a/hw/char/ibex_uart.c b/hw/char/ibex_uart.c
index d6f0d18c77748b66e69391255635f2610e0b787e..db8525110919e77ebcfdd530e40df9ec4904b09d 100644 (file)
--- a/hw/char/ibex_uart.c
+++ b/hw/char/ibex_uart.c
@@ -27,7 +27,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/char/ibex_uart.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-clock.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"

diff --git a/hw/char/imx_serial.c b/hw/char/imx_serial.c
index 509b0141d051b43adb5a5a67950e12d6a2d58156..9f13236f29c8f4215b868028526693cc2f9fc935 100644 (file)
--- a/hw/char/imx_serial.c
+++ b/hw/char/imx_serial.c
@@ -20,7 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/char/imx_serial.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "migration/vmstate.h"

diff --git a/hw/char/ipoctal232.c b/hw/char/ipoctal232.c
index 25d7fc9574a5944c34211925311dd303e4d27c38..6e38916150c4136d954976af434a56f959330822 100644 (file)
--- a/hw/char/ipoctal232.c
+++ b/hw/char/ipoctal232.c
@@ -10,7 +10,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/ipack/ipack.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "migration/vmstate.h"

diff --git a/hw/char/max78000_uart.c b/hw/char/max78000_uart.c
index c76c0e759b6affaf3e2b738839e8ed3e237789d5..5fc933123e9d77c3e56408f5d89085ee7b8d2c44 100644 (file)
--- a/hw/char/max78000_uart.c
+++ b/hw/char/max78000_uart.c
@@ -8,7 +8,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/char/max78000_uart.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "qemu/log.h"

diff --git a/hw/char/mcf_uart.c b/hw/char/mcf_uart.c
index f14de59530cca0a9ed8bcda62e928b6b64192c21..d9d551924b3f0603c3ec469826f59c00830f0c05 100644 (file)
--- a/hw/char/mcf_uart.c
+++ b/hw/char/mcf_uart.c
@@ -7,7 +7,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sysbus.h"
 #include "qemu/module.h"
 #include "qapi/error.h"

diff --git a/hw/char/nrf51_uart.c b/hw/char/nrf51_uart.c
index 41d423446f3ed3b689c0baef81ab5a51544f98d4..39d144538d10fe9fa82417468545ec871fcde29d 100644 (file)
--- a/hw/char/nrf51_uart.c
+++ b/hw/char/nrf51_uart.c
@@ -16,7 +16,7 @@
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "hw/char/nrf51_uart.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "migration/vmstate.h"

diff --git a/hw/char/pl011.c b/hw/char/pl011.c
index 01335d9437d684a78b2aa2c6e64233081a2a444e..75fdb8158e40cfaed9d888f10fa710d5654afb89 100644 (file)
--- a/hw/char/pl011.c
+++ b/hw/char/pl011.c
@@ -21,7 +21,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "hw/char/pl011.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sysbus.h"
 #include "hw/qdev-clock.h"
 #include "hw/qdev-properties.h"

diff --git a/hw/char/renesas_sci.c b/hw/char/renesas_sci.c
index b9d0ed1c89b9506915e6e287c4a6c666c8888cdb..b32e41d5b8a93f00bc70f69014ff4cb910f2c926 100644 (file)
--- a/hw/char/renesas_sci.c
+++ b/hw/char/renesas_sci.c
@@ -23,7 +23,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/registerfields.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"

diff --git a/hw/char/serial-pci-multi.c b/hw/char/serial-pci-multi.c
index 34f30fb70b80ca3c9e61c05be803964139aad8db..34608569988b9b91da0daf01c85fc4a2dcda6d3d 100644 (file)
--- a/hw/char/serial-pci-multi.c
+++ b/hw/char/serial-pci-multi.c
@@ -30,7 +30,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "hw/char/serial.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/pci/pci_device.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"

diff --git a/hw/char/serial-pci.c b/hw/char/serial-pci.c
index 46efabc4cbe5462f255c2ad6a70d990bae9bf215..d05d0898998b13c64c4a09aeabd6856f391f6d09 100644 (file)
--- a/hw/char/serial-pci.c
+++ b/hw/char/serial-pci.c
@@ -29,7 +29,7 @@
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "hw/char/serial.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/pci/pci_device.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"

diff --git a/hw/char/serial.c b/hw/char/serial.c
index 03fec3fe75bf4b0a6f7240b40017ee6ece37ac3f..11685b397b76b2d267213a7c072fdf022a5af6df 100644 (file)
--- a/hw/char/serial.c
+++ b/hw/char/serial.c
@@ -26,7 +26,7 @@
 #include "qemu/osdep.h"
 #include "qemu/bitops.h"
 #include "hw/char/serial.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "migration/vmstate.h"
 #include "chardev/char-serial.h"
 #include "qapi/error.h"

diff --git a/hw/char/sh_serial.c b/hw/char/sh_serial.c
index 83227a84a609fa4ff1d398379909eb1b78c76486..ee430dd3d261eca51f63a09d78ecf177f5d33b1f 100644 (file)
--- a/hw/char/sh_serial.c
+++ b/hw/char/sh_serial.c
@@ -27,7 +27,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-core.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"

diff --git a/hw/char/sifive_uart.c b/hw/char/sifive_uart.c
index e7357d585a1ae52d961cfa9ac56363e61ab07c61..473374d3de100e61b3ced50b4ccd0513054acd8c 100644 (file)
--- a/hw/char/sifive_uart.c
+++ b/hw/char/sifive_uart.c
@@ -22,7 +22,7 @@
 #include "migration/vmstate.h"
 #include "chardev/char.h"
 #include "chardev/char-fe.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/char/sifive_uart.h"
 #include "hw/qdev-properties-system.h"
 

diff --git a/hw/char/stm32f2xx_usart.c b/hw/char/stm32f2xx_usart.c
index 45c30643a74afaaf801c5f30a573008d0564a8d8..49bbda03b870480e1bdfdf13804742ff4391cbdc 100644 (file)
--- a/hw/char/stm32f2xx_usart.c
+++ b/hw/char/stm32f2xx_usart.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/char/stm32f2xx_usart.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "qemu/log.h"

diff --git a/hw/char/stm32l4x5_usart.c b/hw/char/stm32l4x5_usart.c
index 60d8ab5a0e5603527e59e570ae2a970f36cd1872..ce4a35da8f492b0cd8f22a2b4219c4ff8fcc234c 100644 (file)
--- a/hw/char/stm32l4x5_usart.c
+++ b/hw/char/stm32l4x5_usart.c
@@ -24,7 +24,7 @@
 #include "migration/vmstate.h"
 #include "hw/char/stm32l4x5_usart.h"
 #include "hw/core/clock.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-clock.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"

diff --git a/hw/char/xilinx_uartlite.c b/hw/char/xilinx_uartlite.c
index 8feb58a898e452bc0a05b08bf9e79d3038ca0948..da1ecd249c7da1e47ba376b6f87831dec43bfa45 100644 (file)
--- a/hw/char/xilinx_uartlite.c
+++ b/hw/char/xilinx_uartlite.c
@@ -26,7 +26,7 @@
 #include "qemu/log.h"
 #include "qapi/error.h"
 #include "hw/char/xilinx_uartlite.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/sysbus.h"

diff --git a/hw/core/gpio.c b/hw/core/gpio.c
index c7c2936fc55cd9691c7a276ddabeb2e0a8b6a874..11f26a2f2dd3e8b8243dd0ed518b0fc0dae86cb2 100644 (file)
--- a/hw/core/gpio.c
+++ b/hw/core/gpio.c
@@ -19,7 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/qdev-core.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "qapi/error.h"
 
 static NamedGPIOList *qdev_get_named_gpio_list(DeviceState *dev,

diff --git a/hw/core/irq.c b/hw/core/irq.c
index 0c768f7704e919c4211be83560e350a59739e910..106805e2417f9e392efdf504f5512aec4f8977db 100644 (file)
--- a/hw/core/irq.c
+++ b/hw/core/irq.c
@@ -23,7 +23,7 @@
  */
 #include "qemu/osdep.h"
 #include "qemu/main-loop.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "qom/object.h"
 
 void qemu_set_irq(qemu_irq irq, int level)

diff --git a/hw/core/or-irq.c b/hw/core/or-irq.c
index 3942c7099396605f212dc5ee6a09245a75138d15..61006672ad6a6ae0282418dcd74197e47dd2dec9 100644 (file)
--- a/hw/core/or-irq.c
+++ b/hw/core/or-irq.c
@@ -23,7 +23,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/or-irq.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"

diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index 423a3a1d66099df5dd09760327c8d02d3d2bf8ec..f9f56c66aecd53a173e98a6b6104a2721272de34 100644 (file)
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -32,7 +32,7 @@
 #include "qapi/visitor.h"
 #include "qemu/error-report.h"
 #include "qemu/option.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/core/boards.h"
 #include "hw/sysbus.h"

diff --git a/hw/core/split-irq.c b/hw/core/split-irq.c
index f8b48750c5b599057cc003996b66f2d66b4a250b..d0aaa108eb95ec5905caa7e9ca3a2fbe0c0f5402 100644 (file)
--- a/hw/core/split-irq.c
+++ b/hw/core/split-irq.c
@@ -25,7 +25,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/core/split-irq.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "qapi/error.h"
 #include "qemu/module.h"

diff --git a/hw/cpu/a15mpcore.c b/hw/cpu/a15mpcore.c
index bd36dd94d4abcbfc5f45814b9d4e7cfa84d1ec0f..1a6fb914f3ba2e389447e91bfca56fb95dd99d80 100644 (file)
--- a/hw/cpu/a15mpcore.c
+++ b/hw/cpu/a15mpcore.c
@@ -22,7 +22,7 @@
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "hw/cpu/a15mpcore.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "system/kvm.h"
 #include "kvm_arm.h"

diff --git a/hw/cpu/a9mpcore.c b/hw/cpu/a9mpcore.c
index 64bebbd19cbb69099ead452dcd930b94ac539722..9f8e0f70c4926c6b37603a9ab1e309f7fef2068d 100644 (file)
--- a/hw/cpu/a9mpcore.c
+++ b/hw/cpu/a9mpcore.c
@@ -12,7 +12,7 @@
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "hw/cpu/a9mpcore.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/core/cpu.h"
 #include "target/arm/cpu-qom.h"

diff --git a/hw/cpu/arm11mpcore.c b/hw/cpu/arm11mpcore.c
index 01772e7f77b77b1f42a68bde1fd3b71168f6aad7..1953d12f61b6e914f8e29e3cf4b1a1eb6a4d4828 100644 (file)
--- a/hw/cpu/arm11mpcore.c
+++ b/hw/cpu/arm11mpcore.c
@@ -12,7 +12,7 @@
 #include "qemu/module.h"
 #include "hw/cpu/arm11mpcore.h"
 #include "hw/intc/realview_gic.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 
 #define ARM11MPCORE_NUM_GIC_PRIORITY_BITS    4

diff --git a/hw/cpu/realview_mpcore.c b/hw/cpu/realview_mpcore.c
index 099b71a9ef2dca10fa62ff2bbcdf1e6af020d01d..525f03e9e54cf5e7334cfbfab84183163211178c 100644 (file)
--- a/hw/cpu/realview_mpcore.c
+++ b/hw/cpu/realview_mpcore.c
@@ -13,7 +13,7 @@
 #include "qemu/module.h"
 #include "hw/cpu/arm11mpcore.h"
 #include "hw/intc/realview_gic.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "qom/object.h"
 
 #define TYPE_REALVIEW_MPCORE_RIRQ "realview_mpcore"

diff --git a/hw/display/apple-gfx-mmio.m b/hw/display/apple-gfx-mmio.m
index b0b6e2993eb99cefadd5c893d51738b1873d05ac..b83f5f4fe624f3644dd8421b66acb9cce7efdc6f 100644 (file)
--- a/hw/display/apple-gfx-mmio.m
+++ b/hw/display/apple-gfx-mmio.m
@@ -16,7 +16,7 @@
 #include "qemu/log.h"
 #include "block/aio-wait.h"
 #include "hw/sysbus.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "apple-gfx.h"
 #include "trace.h"
 

diff --git a/hw/display/bcm2835_fb.c b/hw/display/bcm2835_fb.c
index 1bb2ee45a015708a278a57a6b8fc87b41447c293..f8f13b55cb43134485689fdf993d53524cd9361a 100644 (file)
--- a/hw/display/bcm2835_fb.c
+++ b/hw/display/bcm2835_fb.c
@@ -26,7 +26,7 @@
 #include "qapi/error.h"
 #include "hw/display/bcm2835_fb.h"
 #include "hw/hw.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "ui/console.h"
 #include "framebuffer.h"
 #include "ui/pixel_ops.h"

diff --git a/hw/display/cg3.c b/hw/display/cg3.c
index daeef15217453211e833f478e73daf6cfd30da68..8191237124e94d0625c51389411d476358a25da8 100644 (file)
--- a/hw/display/cg3.c
+++ b/hw/display/cg3.c
@@ -30,7 +30,7 @@
 #include "ui/console.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/loader.h"
 #include "hw/qdev-properties.h"
 #include "qemu/log.h"

diff --git a/hw/display/dm163.c b/hw/display/dm163.c
index f8340d8275e92765c005e49d7d270fe0df8b8bc8..e78804693cda65108367e6a59fa526a821d71146 100644 (file)
--- a/hw/display/dm163.c
+++ b/hw/display/dm163.c
@@ -17,7 +17,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "migration/vmstate.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/display/dm163.h"
 #include "ui/console.h"

diff --git a/hw/display/exynos4210_fimd.c b/hw/display/exynos4210_fimd.c
index 49c180fec0c52bdd8e15da6080f7b8222a4079e1..8d8062f427c48649b17048b4339641a833747917 100644 (file)
--- a/hw/display/exynos4210_fimd.c
+++ b/hw/display/exynos4210_fimd.c
@@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 #include "hw/qdev-properties.h"
 #include "hw/hw.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "ui/console.h"

diff --git a/hw/display/g364fb.c b/hw/display/g364fb.c
index a6ddc21d3e4a363e2001ef955ddfb61109befc39..10686cd6763013f106469eb0c51caeb59d52f8f0 100644 (file)
--- a/hw/display/g364fb.c
+++ b/hw/display/g364fb.c
@@ -20,7 +20,7 @@
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 #include "hw/hw.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"

diff --git a/hw/display/omap_lcdc.c b/hw/display/omap_lcdc.c
index 3532a801be292473213bc0be06caff3a7bc61c58..90a9731454165d2c7f3d0204f71623018d37fd5e 100644 (file)
--- a/hw/display/omap_lcdc.c
+++ b/hw/display/omap_lcdc.c
@@ -18,7 +18,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "ui/console.h"
 #include "hw/arm/omap.h"
 #include "framebuffer.h"

diff --git a/hw/display/pl110.c b/hw/display/pl110.c
index 09c3c59e0ed60f74aad44bab9bbc53102aae9f3d..e78a55184e9540c1f62c44fe156352e7f68dad2b 100644 (file)
--- a/hw/display/pl110.c
+++ b/hw/display/pl110.c
@@ -8,7 +8,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sysbus.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"

diff --git a/hw/display/xlnx_dp.c b/hw/display/xlnx_dp.c
index a248b943a5ae106a8c4e1cb3e3449039212f2d8d..a24e95f0a7303cd853bb55a8e8eada0d5711c301 100644 (file)
--- a/hw/display/xlnx_dp.c
+++ b/hw/display/xlnx_dp.c
@@ -28,7 +28,7 @@
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "hw/display/xlnx_dp.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "migration/vmstate.h"
 
 #ifndef DEBUG_DP

diff --git a/hw/dma/bcm2835_dma.c b/hw/dma/bcm2835_dma.c
index a2771ddcb52345973de6ba5607bcc6bacea456c9..d07459de2d0fb5fa3d713ad28c610750462a9e8c 100644 (file)
--- a/hw/dma/bcm2835_dma.c
+++ b/hw/dma/bcm2835_dma.c
@@ -8,7 +8,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "hw/dma/bcm2835_dma.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/dma/omap_dma.c b/hw/dma/omap_dma.c
index 101f91f4a3340cbae7eab5159cf692d1ad8b7bae..2bf9ebad565a8f474e6c568971c839bdefb0526e 100644 (file)
--- a/hw/dma/omap_dma.c
+++ b/hw/dma/omap_dma.c
@@ -21,7 +21,7 @@
 #include "qemu/log.h"
 #include "qemu/timer.h"
 #include "hw/arm/omap.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/arm/soc_dma.h"
 
 struct omap_dma_channel_s {

diff --git a/hw/dma/pl080.c b/hw/dma/pl080.c
index 277d9343223b285c32156f52a66e3bc11b675e57..28f793716465dc56ec4182e5983fe92a11d0ec36 100644 (file)
--- a/hw/dma/pl080.c
+++ b/hw/dma/pl080.c
@@ -14,7 +14,7 @@
 #include "qemu/module.h"
 #include "hw/dma/pl080.h"
 #include "hw/hw.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "qapi/error.h"
 

diff --git a/hw/dma/pl330.c b/hw/dma/pl330.c
index f9c91f924bb6be142166e0bfbe8282a77a736643..a9e6d2746f012a5a3fad40676d27c9caf3302f66 100644 (file)
--- a/hw/dma/pl330.c
+++ b/hw/dma/pl330.c
@@ -16,7 +16,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/cutils.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"

diff --git a/hw/dma/rc4030.c b/hw/dma/rc4030.c
index b6ed1d4643366a7fffcdbbdf45adb26d16921598..8ce74257b62293e3ef74b8730e609b8e09a452cc 100644 (file)
--- a/hw/dma/rc4030.c
+++ b/hw/dma/rc4030.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/units.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/mips/mips.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"

diff --git a/hw/dma/sifive_pdma.c b/hw/dma/sifive_pdma.c
index 48de3a24785b8aaa545a81af0134ba756ebcfa5c..bae77544b23d10ef47106a60549ab134daa973e9 100644 (file)
--- a/hw/dma/sifive_pdma.c
+++ b/hw/dma/sifive_pdma.c
@@ -24,7 +24,7 @@
 #include "qemu/bitops.h"
 #include "qemu/log.h"
 #include "qapi/error.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"

diff --git a/hw/dma/sparc32_dma.c b/hw/dma/sparc32_dma.c
index 60c23b69e5cb43b484d87cd42402eb28a92f5413..9f56faf9a53ccdb339c603e546ab7eafe389f520 100644 (file)
--- a/hw/dma/sparc32_dma.c
+++ b/hw/dma/sparc32_dma.c
@@ -26,7 +26,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/sparc/sparc32_dma.h"
 #include "hw/sparc/sun4m_iommu.h"

diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c
index 2020399fd596b4469402e0f66b27c507d28f9e48..9b05080ae5939bf3b627af0c8c5785f4c4ea67c5 100644 (file)
--- a/hw/dma/xilinx_axidma.c
+++ b/hw/dma/xilinx_axidma.c
@@ -27,7 +27,7 @@
 #include "qapi/error.h"
 #include "qemu/timer.h"
 #include "hw/hw.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/ptimer.h"
 #include "hw/qdev-properties.h"
 #include "qemu/log.h"

diff --git a/hw/dma/xlnx-zdma.c b/hw/dma/xlnx-zdma.c
index 0c075e7d0d10fdb47d17abc26bd2405a96b255aa..660fc21b6d16cd620d022b1c71ef345f9e3b546e 100644 (file)
--- a/hw/dma/xlnx-zdma.c
+++ b/hw/dma/xlnx-zdma.c
@@ -28,7 +28,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/dma/xlnx-zdma.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qemu/bitops.h"

diff --git a/hw/dma/xlnx-zynq-devcfg.c b/hw/dma/xlnx-zynq-devcfg.c
index 8141d46033873408293d65105ca784f9975b4749..cf00aa863d5587ef995cdae1661a4553774b6419 100644 (file)
--- a/hw/dma/xlnx-zynq-devcfg.c
+++ b/hw/dma/xlnx-zynq-devcfg.c
@@ -26,7 +26,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/dma/xlnx-zynq-devcfg.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "migration/vmstate.h"
 #include "qemu/bitops.h"
 #include "system/dma.h"

diff --git a/hw/dma/xlnx_csu_dma.c b/hw/dma/xlnx_csu_dma.c
index d8c7da1a501c823e87f67d6d4d0c30388fd7d7dd..0b1185325ba2d1cf66f363175d3497f018f9005e 100644 (file)
--- a/hw/dma/xlnx_csu_dma.c
+++ b/hw/dma/xlnx_csu_dma.c
@@ -21,7 +21,7 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "qapi/error.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"

diff --git a/hw/dma/xlnx_dpdma.c b/hw/dma/xlnx_dpdma.c
index 3d88ccc8da9182cc8bba4deb6cb4faa8825dbae7..32f56036a4caa6eb7704302d66065b949ef73cac 100644 (file)
--- a/hw/dma/xlnx_dpdma.c
+++ b/hw/dma/xlnx_dpdma.c
@@ -27,7 +27,7 @@
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "hw/dma/xlnx_dpdma.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "migration/vmstate.h"
 
 #ifndef DEBUG_DPDMA

diff --git a/hw/gpio/aspeed_gpio.c b/hw/gpio/aspeed_gpio.c
index 2d78bf9515c405da59c9c0518abad391e048f1c0..85a5acd708742bc335c189af4364e66f3a383d9e 100644 (file)
--- a/hw/gpio/aspeed_gpio.c
+++ b/hw/gpio/aspeed_gpio.c
@@ -13,7 +13,7 @@
 #include "hw/misc/aspeed_scu.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "migration/vmstate.h"
 #include "trace.h"
 #include "hw/registerfields.h"

diff --git a/hw/gpio/bcm2835_gpio.c b/hw/gpio/bcm2835_gpio.c
index dfb5d5cb578df41bd7f327e055158a5ed53d05c8..bd9170b8932f3ea748e23999c8d0d96a464ff9d2 100644 (file)
--- a/hw/gpio/bcm2835_gpio.c
+++ b/hw/gpio/bcm2835_gpio.c
@@ -20,7 +20,7 @@
 #include "migration/vmstate.h"
 #include "hw/sd/sd.h"
 #include "hw/gpio/bcm2835_gpio.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 
 #define GPFSEL0   0x00
 #define GPFSEL1   0x04

diff --git a/hw/gpio/bcm2838_gpio.c b/hw/gpio/bcm2838_gpio.c
index 1069e7811bbb1d070130e7759cc6082f5327c8fc..dab50faf28502f07dbb0235d53c891f9bb66492a 100644 (file)
--- a/hw/gpio/bcm2838_gpio.c
+++ b/hw/gpio/bcm2838_gpio.c
@@ -19,7 +19,7 @@
 #include "migration/vmstate.h"
 #include "hw/sd/sd.h"
 #include "hw/gpio/bcm2838_gpio.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 
 #define GPFSEL0   0x00
 #define GPFSEL1   0x04

diff --git a/hw/gpio/gpio_key.c b/hw/gpio/gpio_key.c
index 40c028bed9ecf6381f4b8a960ad02fde68093d63..f8cf4da239a9742f272234ae5d381cf27777eb12 100644 (file)
--- a/hw/gpio/gpio_key.c
+++ b/hw/gpio/gpio_key.c
@@ -23,7 +23,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"

diff --git a/hw/gpio/imx_gpio.c b/hw/gpio/imx_gpio.c
index 450ece45482222dfeab114ccc7731eec44c95047..842c997a2a6d0ebca9e246fd3f44c7f615bcaa6b 100644 (file)
--- a/hw/gpio/imx_gpio.c
+++ b/hw/gpio/imx_gpio.c
@@ -19,7 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/gpio/imx_gpio.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"

diff --git a/hw/gpio/mpc8xxx.c b/hw/gpio/mpc8xxx.c
index 257497af5847cd8f87fdc5a339174f6cf70b1bb6..377832e9d245900914edd31b837bc34feeb88e73 100644 (file)
--- a/hw/gpio/mpc8xxx.c
+++ b/hw/gpio/mpc8xxx.c
@@ -20,7 +20,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "qom/object.h"

diff --git a/hw/gpio/npcm7xx_gpio.c b/hw/gpio/npcm7xx_gpio.c
index 66f8256a7a78e5b8cbca81372e0036c9c5df4630..59b95d232bf82edc2644066ea22a6f9d5261a7ab 100644 (file)
--- a/hw/gpio/npcm7xx_gpio.c
+++ b/hw/gpio/npcm7xx_gpio.c
@@ -16,7 +16,7 @@
 #include "qemu/osdep.h"
 
 #include "hw/gpio/npcm7xx_gpio.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"

diff --git a/hw/gpio/nrf51_gpio.c b/hw/gpio/nrf51_gpio.c
index d94c0c47da25524725be3646ca4f302f0d82b7c2..567eb1fe7daeedaa4937c86cf0749afe9b12de70 100644 (file)
--- a/hw/gpio/nrf51_gpio.c
+++ b/hw/gpio/nrf51_gpio.c
@@ -14,7 +14,7 @@
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "hw/gpio/nrf51_gpio.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "migration/vmstate.h"
 #include "trace.h"
 

diff --git a/hw/gpio/omap_gpio.c b/hw/gpio/omap_gpio.c
index f27806b774ae82e8acb058e8a7f62ede98106c4c..547f0a15a271742ac8f7d9bac042af6560936493 100644 (file)
--- a/hw/gpio/omap_gpio.c
+++ b/hw/gpio/omap_gpio.c
@@ -20,7 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/arm/omap.h"
 #include "hw/sysbus.h"

diff --git a/hw/gpio/pca9552.c b/hw/gpio/pca9552.c
index 1e10238b2e011aeeee20c5c6250267ff7f91038a..fe1d8dbffa20492970801ede128cfde0babed15e 100644 (file)
--- a/hw/gpio/pca9552.c
+++ b/hw/gpio/pca9552.c
@@ -17,7 +17,7 @@
 #include "hw/qdev-properties.h"
 #include "hw/gpio/pca9552.h"
 #include "hw/gpio/pca9552_regs.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"

diff --git a/hw/gpio/pca9554.c b/hw/gpio/pca9554.c
index eac0d23be34a59b301327af2a17034f4539f2377..c6cdd27b3ff162085984905215bff706af7b910c 100644 (file)
--- a/hw/gpio/pca9554.c
+++ b/hw/gpio/pca9554.c
@@ -13,7 +13,7 @@
 #include "hw/qdev-properties.h"
 #include "hw/gpio/pca9554.h"
 #include "hw/gpio/pca9554_regs.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"

diff --git a/hw/gpio/pcf8574.c b/hw/gpio/pcf8574.c
index 274b44bb616691cd2d54df942931ff4737bb2c6e..f871f1e788091ee9b73a55bc536f4fbff702a7ea 100644 (file)
--- a/hw/gpio/pcf8574.c
+++ b/hw/gpio/pcf8574.c
@@ -9,7 +9,7 @@
 #include "qemu/osdep.h"
 #include "hw/i2c/i2c.h"
 #include "hw/gpio/pcf8574.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/gpio/pl061.c b/hw/gpio/pl061.c
index a3ac038c2f751b2e979f6f176c6bd48ca5462e2f..09b32247127abfa3b79e9d6a385efabebae10c23 100644 (file)
--- a/hw/gpio/pl061.c
+++ b/hw/gpio/pl061.c
@@ -30,7 +30,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sysbus.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"

diff --git a/hw/gpio/sifive_gpio.c b/hw/gpio/sifive_gpio.c
index 5831647b4d0a65c48c63206123fb685840ce45b4..63ca721fadd98c52355c23598c5b61a55869f34c 100644 (file)
--- a/hw/gpio/sifive_gpio.c
+++ b/hw/gpio/sifive_gpio.c
@@ -13,7 +13,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/gpio/sifive_gpio.h"
 #include "migration/vmstate.h"

diff --git a/hw/gpio/stm32l4x5_gpio.c b/hw/gpio/stm32l4x5_gpio.c
index 42fe984c493527ec850ee08fc495a13f7c9cc810..a5a38da63845b11f109a75baf568401914adeed1 100644 (file)
--- a/hw/gpio/stm32l4x5_gpio.c
+++ b/hw/gpio/stm32l4x5_gpio.c
@@ -19,7 +19,7 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "hw/gpio/stm32l4x5_gpio.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/core/clock.h"
 #include "hw/qdev-clock.h"
 #include "hw/qdev-properties.h"

diff --git a/hw/gpio/zaurus.c b/hw/gpio/zaurus.c
index 590ffde89d129cbab9bfe183140ac1013bd3e945..0a9f76e7743b70b183966fc85b3be1d37661a14f 100644 (file)
--- a/hw/gpio/zaurus.c
+++ b/hw/gpio/zaurus.c
@@ -17,7 +17,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"

diff --git a/hw/i2c/allwinner-i2c.c b/hw/i2c/allwinner-i2c.c
index fe887e1c6a9b9393e629aba67360cd330eab85c9..c879e5009df191b8f650a599ba84462594e2f9b0 100644 (file)
--- a/hw/i2c/allwinner-i2c.c
+++ b/hw/i2c/allwinner-i2c.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/i2c/allwinner-i2c.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "migration/vmstate.h"
 #include "hw/i2c/i2c.h"
 #include "qemu/log.h"

diff --git a/hw/i2c/aspeed_i2c.c b/hw/i2c/aspeed_i2c.c
index 83fb906bdc7541baab3167c8b412ddd3df11aba5..3d66dd863a1766512a74e4c06ff3a1341567d68b 100644 (file)
--- a/hw/i2c/aspeed_i2c.c
+++ b/hw/i2c/aspeed_i2c.c
@@ -27,7 +27,7 @@
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "hw/i2c/aspeed_i2c.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/registerfields.h"
 #include "trace.h"

diff --git a/hw/i2c/bcm2835_i2c.c b/hw/i2c/bcm2835_i2c.c
index be11cca2a93aeb9314a4d566f977054553b775fe..34de1f36e5b3875acb02e42f8fa8303998915651 100644 (file)
--- a/hw/i2c/bcm2835_i2c.c
+++ b/hw/i2c/bcm2835_i2c.c
@@ -27,7 +27,7 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "hw/i2c/bcm2835_i2c.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "migration/vmstate.h"
 
 static void bcm2835_i2c_update_interrupt(BCM2835I2CState *s)

diff --git a/hw/i2c/bitbang_i2c.c b/hw/i2c/bitbang_i2c.c
index e020f314e2aaa0dde16a239c7c4ee685bfa0fdfb..d379cfd775110572179b8299c7a504e1ccb5bbc6 100644 (file)
--- a/hw/i2c/bitbang_i2c.c
+++ b/hw/i2c/bitbang_i2c.c
@@ -11,7 +11,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/i2c/bitbang_i2c.h"
 #include "hw/sysbus.h"
 #include "qemu/module.h"

diff --git a/hw/i2c/exynos4210_i2c.c b/hw/i2c/exynos4210_i2c.c
index 9d0c1cdaa8a9df7b67d988044353241d08fc711d..dd72dda4fd0a998b49f7fac8ab6dba573cef47da 100644 (file)
--- a/hw/i2c/exynos4210_i2c.c
+++ b/hw/i2c/exynos4210_i2c.c
@@ -26,7 +26,7 @@
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/i2c/i2c.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "qom/object.h"
 
 #ifndef EXYNOS4_I2C_DEBUG

diff --git a/hw/i2c/imx_i2c.c b/hw/i2c/imx_i2c.c
index d26177c85df94c7c54cd3a8b0e9920171b0c1c2e..88269653e2ca2c74fe94440afee0ccf9640f4519 100644 (file)
--- a/hw/i2c/imx_i2c.c
+++ b/hw/i2c/imx_i2c.c
@@ -20,7 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/i2c/imx_i2c.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "migration/vmstate.h"
 #include "hw/i2c/i2c.h"
 #include "qemu/log.h"

diff --git a/hw/i2c/mpc_i2c.c b/hw/i2c/mpc_i2c.c
index 25f91b7bc821b8dafacdab6d2d52c1f57415cf2f..e2097f819cedb1688f57ddf0f1a0bef4d2daae5d 100644 (file)
--- a/hw/i2c/mpc_i2c.c
+++ b/hw/i2c/mpc_i2c.c
@@ -19,7 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/i2c/i2c.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "qom/object.h"

diff --git a/hw/i2c/omap_i2c.c b/hw/i2c/omap_i2c.c
index 751bf748fd949c2ac89938a0fc20b7ff15bb3708..6ac151d851543957d09d861f5c40540cea41519a 100644 (file)
--- a/hw/i2c/omap_i2c.c
+++ b/hw/i2c/omap_i2c.c
@@ -21,7 +21,7 @@
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "hw/i2c/i2c.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/arm/omap.h"
 #include "hw/sysbus.h"

diff --git a/hw/i2c/ppc4xx_i2c.c b/hw/i2c/ppc4xx_i2c.c
index 09d4c49d6575d384bde715f69eac5b070957ca12..d38efd72883d637e764495dafd5562086297a2c3 100644 (file)
--- a/hw/i2c/ppc4xx_i2c.c
+++ b/hw/i2c/ppc4xx_i2c.c
@@ -30,7 +30,7 @@
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "hw/i2c/ppc4xx_i2c.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 
 #define PPC4xx_I2C_MEM_SIZE 18
 

diff --git a/hw/i386/kvm/i8259.c b/hw/i386/kvm/i8259.c
index 8a72d6e4dd3bdc1803300341d08b8b9501e17bfd..66f37e13039afd6fd3444def48eb7688626f59ec 100644 (file)
--- a/hw/i386/kvm/i8259.c
+++ b/hw/i386/kvm/i8259.c
@@ -15,7 +15,7 @@
 #include "hw/intc/i8259.h"
 #include "qemu/module.h"
 #include "hw/intc/kvm_irqcount.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "system/kvm.h"
 #include "qom/object.h"
 

diff --git a/hw/i386/kvm/xen_evtchn.c b/hw/i386/kvm/xen_evtchn.c
index dd566c496796e0a2d7cde6f0ba01088a0f12a615..a510ab871defa25bc074a1207a5d4b4a871fc343 100644 (file)
--- a/hw/i386/kvm/xen_evtchn.c
+++ b/hw/i386/kvm/xen_evtchn.c
@@ -34,7 +34,7 @@
 #include "hw/pci/pci.h"
 #include "hw/pci/msi.h"
 #include "hw/pci/msix.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/xen/xen_backend_ops.h"
 
 #include "xen_evtchn.h"

diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c
index 94d22a232aca1f82590d80c2ac6cc279bb9ff808..e3bafb83af94e7f3cd19506129816e82d32159f1 100644 (file)
--- a/hw/i386/microvm.c
+++ b/hw/i386/microvm.c
@@ -31,7 +31,7 @@
 #include "microvm-dt.h"
 
 #include "hw/loader.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/i386/kvm/clock.h"
 #include "hw/i386/microvm.h"
 #include "hw/i386/x86.h"

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index f6b9a1bc40618226bfdccfd00ecb413f362503ae..3f8fd0783187e6f383d7c3d13a24a90b35839b2c 100644 (file)
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -38,7 +38,7 @@
 #include "hw/usb/usb.h"
 #include "net/net.h"
 #include "hw/ide/pci.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "system/kvm.h"
 #include "hw/i386/kvm/clock.h"
 #include "hw/sysbus.h"

diff --git a/hw/i386/port92.c b/hw/i386/port92.c
index 39b6f3178fefed2919beba0a7f05a8300052252f..48a174316fdeb36663cc8b097bb0df8af6a4b451 100644 (file)
--- a/hw/i386/port92.c
+++ b/hw/i386/port92.c
@@ -9,7 +9,7 @@
 #include "qemu/osdep.h"
 #include "system/runstate.h"
 #include "migration/vmstate.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/isa/isa.h"
 #include "hw/i386/pc.h"
 #include "trace.h"

diff --git a/hw/i386/x86-common.c b/hw/i386/x86-common.c
index f77e2e63046ff56d079363e411a9ee0eca365291..397e856b37e3b109066ea2f71b63a7caa69f726e 100644 (file)
--- a/hw/i386/x86-common.c
+++ b/hw/i386/x86-common.c
@@ -37,7 +37,7 @@
 #include "target/i386/sev.h"
 
 #include "hw/acpi/cpu_hotplug.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/loader.h"
 #include "multiboot.h"
 #include "elf.h"

diff --git a/hw/i386/x86-cpu.c b/hw/i386/x86-cpu.c
index 1a86a853d5ffc735e1225f71716cc47b97061b31..276f2b0cdf89044e808b34666c391fb13558f1df 100644 (file)
--- a/hw/i386/x86-cpu.c
+++ b/hw/i386/x86-cpu.c
@@ -28,7 +28,7 @@
 #include "hw/i386/x86.h"
 #include "target/i386/cpu.h"
 #include "hw/intc/i8259.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "system/kvm.h"
 
 /* TSC handling */

diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c
index ceb2242aa71008769175d3e39a3c31d0b5b341b2..591da26d4533f445c48113907a3aae140a6ba6b6 100644 (file)
--- a/hw/i386/xen/xen-hvm.c
+++ b/hw/i386/xen/xen-hvm.c
@@ -17,7 +17,7 @@
 
 #include "hw/hw.h"
 #include "hw/i386/pc.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/i386/apic-msidef.h"
 #include "hw/xen/xen-x86.h"
 #include "qemu/range.h"

diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index 14bc66fb7fad649e9b2cfc5839d1b460b51da55e..08f51c8e3614214baece807ceee484eee089fb13 100644 (file)
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -22,7 +22,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "migration/vmstate.h"
 
 #include "qemu/error-report.h"

diff --git a/hw/ide/core.c b/hw/ide/core.c
index 8c380abf7c162fdc563a540e136383506bd3f839..b45abf067b20a837e3b8c4cf1f855db140989780 100644 (file)
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -24,7 +24,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/isa/isa.h"
 #include "migration/vmstate.h"
 #include "qemu/error-report.h"

diff --git a/hw/ide/macio.c b/hw/ide/macio.c
index c23bf32d2b1c4ccbfc52eb5dae611c18991c3443..07db7dc34aafde89a06666b0a5d834b5264d58cc 100644 (file)
--- a/hw/ide/macio.c
+++ b/hw/ide/macio.c
@@ -24,7 +24,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/ppc/mac_dbdma.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"

diff --git a/hw/ide/pci.c b/hw/ide/pci.c
index 1e50bb9e483ac4859eeac71ce92c629322553e37..7ce1ae67ab22f86f2a624ca7dffe037c3952caf7 100644 (file)
--- a/hw/ide/pci.c
+++ b/hw/ide/pci.c
@@ -24,7 +24,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/pci/pci.h"
 #include "migration/vmstate.h"
 #include "system/dma.h"

diff --git a/hw/ide/via.c b/hw/ide/via.c
index dedc2674c002f9de8894e6c49cdb3989cb0deccc..3a77d744caf1b3de117bde068149b0d7bf8a7871 100644 (file)
--- a/hw/ide/via.c
+++ b/hw/ide/via.c
@@ -32,7 +32,7 @@
 #include "system/dma.h"
 #include "hw/isa/vt82c686.h"
 #include "hw/ide/pci.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "ide-internal.h"
 #include "trace.h"
 

diff --git a/hw/input/lasips2.c b/hw/input/lasips2.c
index de625723c78b685f9327b40d0b2fa3a9866fe0ee..70a179907ca03815322d200a8a3f99bd84a1a118 100644 (file)
--- a/hw/input/lasips2.c
+++ b/hw/input/lasips2.c
@@ -31,7 +31,7 @@
 #include "trace.h"
 #include "system/address-spaces.h"
 #include "migration/vmstate.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "qapi/error.h"
 
 

diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c
index 71f5f976e9ce47d22ea8105613b708b6ae5002ac..48b457cac76be73909ba171d827f134657ea2cbd 100644 (file)
--- a/hw/input/pckbd.c
+++ b/hw/input/pckbd.c
@@ -31,7 +31,7 @@
 #include "migration/vmstate.h"
 #include "hw/acpi/acpi_aml_interface.h"
 #include "hw/input/ps2.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/input/i8042.h"
 #include "hw/qdev-properties.h"
 #include "system/reset.h"

diff --git a/hw/input/pl050.c b/hw/input/pl050.c
index c5f4a3fa8431a930ae397c45fbcf49e334698666..cb8efc74f77b9c931cb22b454c8cee201682c2f2 100644 (file)
--- a/hw/input/pl050.c
+++ b/hw/input/pl050.c
@@ -20,7 +20,7 @@
 #include "migration/vmstate.h"
 #include "hw/input/ps2.h"
 #include "hw/input/pl050.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "qom/object.h"

diff --git a/hw/input/ps2.c b/hw/input/ps2.c
index 7f7b1fce2e5758311a8ab0daceed3bec6bebfbbb..96850124a7ba90d2e1b51f70691b423565823686 100644 (file)
--- a/hw/input/ps2.c
+++ b/hw/input/ps2.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sysbus.h"
 #include "hw/input/ps2.h"
 #include "migration/vmstate.h"

diff --git a/hw/input/stellaris_gamepad.c b/hw/input/stellaris_gamepad.c
index fec1161c9c12eab5c2f7adde7985c2f2dad39474..bd80db6fac5c62ffa16091fc2f6e755e9a0c10ee 100644 (file)
--- a/hw/input/stellaris_gamepad.c
+++ b/hw/input/stellaris_gamepad.c
@@ -10,7 +10,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "hw/input/stellaris_gamepad.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "ui/console.h"

diff --git a/hw/intc/allwinner-a10-pic.c b/hw/intc/allwinner-a10-pic.c
index 040973415570d3f7894b293acc316a01d26cd4dd..0e1ec521e428fe1959683397d3669925c59cfdcb 100644 (file)
--- a/hw/intc/allwinner-a10-pic.c
+++ b/hw/intc/allwinner-a10-pic.c
@@ -19,7 +19,7 @@
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/intc/allwinner-a10-pic.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
 

diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c
index 899f1333633c674690a46b87c0d6f9823bbc66ce..e27bb20bf8c12b3fb4bb5640bbc0e13c72559c5f 100644 (file)
--- a/hw/intc/arm_gic.c
+++ b/hw/intc/arm_gic.c
@@ -19,7 +19,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sysbus.h"
 #include "gic_internal.h"
 #include "qapi/error.h"

diff --git a/hw/intc/arm_gicv2m.c b/hw/intc/arm_gicv2m.c
index cef068822166ec362f5cff565a2a01e81263a681..e823fcc97fc1a54d4358048039d849bd8a0603fb 100644 (file)
--- a/hw/intc/arm_gicv2m.c
+++ b/hw/intc/arm_gicv2m.c
@@ -28,7 +28,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "hw/sysbus.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/pci/msi.h"
 #include "hw/qdev-properties.h"
 #include "system/kvm.h"

diff --git a/hw/intc/arm_gicv3_cpuif.c b/hw/intc/arm_gicv3_cpuif.c
index 2e6c1f778a9cf3da5b736cb95f9bbe9fb10693bb..eaf1e512eded9b3488fff1e9d1614c3245235d8c 100644 (file)
--- a/hw/intc/arm_gicv3_cpuif.c
+++ b/hw/intc/arm_gicv3_cpuif.c
@@ -18,7 +18,7 @@
 #include "qemu/main-loop.h"
 #include "trace.h"
 #include "gicv3_internal.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "cpu.h"
 #include "target/arm/cpregs.h"
 #include "target/arm/cpu-features.h"

diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c
index 7c78961040ec1858e9c2f05dd31199e1999cd353..bb39a690a59ba4b900d2b35f5d247d23b2b1f31d 100644 (file)
--- a/hw/intc/armv7m_nvic.c
+++ b/hw/intc/armv7m_nvic.c
@@ -16,7 +16,7 @@
 #include "migration/vmstate.h"
 #include "qemu/timer.h"
 #include "hw/intc/armv7m_nvic.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "system/tcg.h"
 #include "system/runstate.h"

diff --git a/hw/intc/aspeed_intc.c b/hw/intc/aspeed_intc.c
index 5cd786dee6cdf504893598699d2ab275f1bd1d84..d92305b9ca101b2399250526fed2fc73896d144d 100644 (file)
--- a/hw/intc/aspeed_intc.c
+++ b/hw/intc/aspeed_intc.c
@@ -8,7 +8,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/intc/aspeed_intc.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "qemu/log.h"
 #include "trace.h"
 #include "hw/registerfields.h"

diff --git a/hw/intc/aspeed_vic.c b/hw/intc/aspeed_vic.c
index 7120088454c79344b6c3eeae2accadf97c866fc5..b0a9a39705524e5222985a9ab20bbeb343617658 100644 (file)
--- a/hw/intc/aspeed_vic.c
+++ b/hw/intc/aspeed_vic.c
@@ -29,7 +29,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/intc/aspeed_vic.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "migration/vmstate.h"
 #include "qemu/bitops.h"
 #include "qemu/log.h"

diff --git a/hw/intc/bcm2835_ic.c b/hw/intc/bcm2835_ic.c
index 55e0a5a503b21a6ed304a901d5c14be61f6da605..71bf671761bc0a7cf386791cda665322c81838e5 100644 (file)
--- a/hw/intc/bcm2835_ic.c
+++ b/hw/intc/bcm2835_ic.c
@@ -14,7 +14,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/intc/bcm2835_ic.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/intc/bcm2836_control.c b/hw/intc/bcm2836_control.c
index 1c028536696b4dfeb002a83174f05b5cfd0bf450..f1deafaf7a2c0bb036ceb64fdea0dfaf668c2f8c 100644 (file)
--- a/hw/intc/bcm2836_control.c
+++ b/hw/intc/bcm2836_control.c
@@ -19,7 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/intc/bcm2836_control.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/intc/exynos4210_combiner.c b/hw/intc/exynos4210_combiner.c
index ebbe23436f4e9553e9ecd066f6fa76d1ad2c3796..b9e74d19c372b77df7e618f0aaa86885104afe96 100644 (file)
--- a/hw/intc/exynos4210_combiner.c
+++ b/hw/intc/exynos4210_combiner.c
@@ -34,7 +34,7 @@
 #include "hw/intc/exynos4210_combiner.h"
 #include "hw/arm/exynos4210.h"
 #include "hw/hw.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "qom/object.h"
 

diff --git a/hw/intc/exynos4210_gic.c b/hw/intc/exynos4210_gic.c
index 7e2d79d00cd2fca8593f1d96fc59183160866617..5b156f7ef5a46165cc5f2f98f7dfee0e99d9ed34 100644 (file)
--- a/hw/intc/exynos4210_gic.c
+++ b/hw/intc/exynos4210_gic.c
@@ -25,7 +25,7 @@
 #include "migration/vmstate.h"
 #include "qapi/error.h"
 #include "qemu/module.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/intc/exynos4210_gic.h"
 #include "hw/arm/exynos4210.h"

diff --git a/hw/intc/goldfish_pic.c b/hw/intc/goldfish_pic.c
index 2359861785d1415104c60a0319385237b4073797..7aaccba75ae147782383d1014d59269feea633f3 100644 (file)
--- a/hw/intc/goldfish_pic.c
+++ b/hw/intc/goldfish_pic.c
@@ -8,7 +8,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"

diff --git a/hw/intc/grlib_irqmp.c b/hw/intc/grlib_irqmp.c
index e0f26466ba3a1200d8c3df385d0fef39df846fb2..bb2ee5f8015f6d0e2ced1819cea1cfb2f9c4dbee 100644 (file)
--- a/hw/intc/grlib_irqmp.c
+++ b/hw/intc/grlib_irqmp.c
@@ -27,7 +27,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sysbus.h"
 
 #include "hw/qdev-properties.h"

diff --git a/hw/intc/heathrow_pic.c b/hw/intc/heathrow_pic.c
index 447e8c25d8d89f02958879f3e4b022e7fc914076..b65ec04e4752f4b0da1fdbb98298136099493e48 100644 (file)
--- a/hw/intc/heathrow_pic.c
+++ b/hw/intc/heathrow_pic.c
@@ -27,7 +27,7 @@
 #include "migration/vmstate.h"
 #include "qemu/module.h"
 #include "hw/intc/heathrow_pic.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "trace.h"
 
 static inline int heathrow_check_irq(HeathrowPICState *pic)

diff --git a/hw/intc/i8259.c b/hw/intc/i8259.c
index b6f96bf208cadcf022df0f1131d1ce1a1c374d71..8f2aa1f0fb115ecb107b705add80852f99f8d32e 100644 (file)
--- a/hw/intc/i8259.c
+++ b/hw/intc/i8259.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/intc/i8259.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/isa/isa.h"
 #include "qemu/timer.h"
 #include "qemu/log.h"

diff --git a/hw/intc/imx_avic.c b/hw/intc/imx_avic.c
index 09c3bfac0b626c6a1d120d84f77be7c9ae4cffbc..a3d71aba8ef6fac8f2de15e67480a7efb03b0817 100644 (file)
--- a/hw/intc/imx_avic.c
+++ b/hw/intc/imx_avic.c
@@ -17,7 +17,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/intc/imx_avic.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/intc/loongarch_dintc.c b/hw/intc/loongarch_dintc.c
index 32bdd171c588f2d1782166f3f6bb8f0df25d8074..082755d28bb6fec925639bc90f78b872d42b85ea 100644 (file)
--- a/hw/intc/loongarch_dintc.c
+++ b/hw/intc/loongarch_dintc.c
@@ -7,7 +7,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/intc/loongarch_pch_msi.h"
 #include "hw/intc/loongarch_pch_pic.h"
 #include "hw/intc/loongarch_dintc.h"

diff --git a/hw/intc/loongarch_extioi.c b/hw/intc/loongarch_extioi.c
index 3e9c88d1d9ca73446243ac29652043695be7da85..29997402694c9540dfb5aec580981a11ca9cc008 100644 (file)
--- a/hw/intc/loongarch_extioi.c
+++ b/hw/intc/loongarch_extioi.c
@@ -9,7 +9,7 @@
 #include "qemu/module.h"
 #include "qemu/log.h"
 #include "qapi/error.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/loongarch/virt.h"
 #include "system/address-spaces.h"
 #include "system/kvm.h"

diff --git a/hw/intc/loongarch_pch_msi.c b/hw/intc/loongarch_pch_msi.c
index f6d163158da3ac28c87dd654f7f1487cb3f1be74..63090b272619af976e19a4f0e1d56c66e3f7f507 100644 (file)
--- a/hw/intc/loongarch_pch_msi.c
+++ b/hw/intc/loongarch_pch_msi.c
@@ -7,7 +7,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/intc/loongarch_pch_msi.h"
 #include "hw/intc/loongarch_pch_pic.h"
 #include "hw/pci/msi.h"

diff --git a/hw/intc/loongarch_pch_pic.c b/hw/intc/loongarch_pch_pic.c
index 32f01aabf0ed583339cc0e4817e2a131e6901807..82e16be3918cfc9366a4ae00fb616151c990bc0e 100644 (file)
--- a/hw/intc/loongarch_pch_pic.c
+++ b/hw/intc/loongarch_pch_pic.c
@@ -8,7 +8,7 @@
 #include "qemu/osdep.h"
 #include "qemu/bitops.h"
 #include "qemu/log.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/intc/loongarch_pch_pic.h"
 #include "system/kvm.h"
 #include "trace.h"

diff --git a/hw/intc/loongson_ipi_common.c b/hw/intc/loongson_ipi_common.c
index 8cd78d48589e02135ede5fdc222c32962100a2d5..b3d8e781ca16869b5985da37027dd23f606ce8a1 100644 (file)
--- a/hw/intc/loongson_ipi_common.c
+++ b/hw/intc/loongson_ipi_common.c
@@ -8,7 +8,7 @@
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "hw/intc/loongson_ipi_common.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "qemu/log.h"
 #include "migration/vmstate.h"
 #include "system/kvm.h"

diff --git a/hw/intc/loongson_liointc.c b/hw/intc/loongson_liointc.c
index c10fb97a06363c850ea0a713c14fc5e5a8244815..4c24f330ed7c6fc86f38f9266d649ef8d4bbf2f4 100644 (file)
--- a/hw/intc/loongson_liointc.c
+++ b/hw/intc/loongson_liointc.c
@@ -22,7 +22,7 @@
 #include "qemu/osdep.h"
 #include "qemu/module.h"
 #include "qemu/log.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/intc/loongson_liointc.h"
 

diff --git a/hw/intc/mips_gic.c b/hw/intc/mips_gic.c
index 0c50ba41f62246e2c093175c9919f6cce97a4de8..08925fe1e41224033c9d97335aa41852b16c5832 100644 (file)
--- a/hw/intc/mips_gic.c
+++ b/hw/intc/mips_gic.c
@@ -19,7 +19,7 @@
 #include "system/reset.h"
 #include "kvm_mips.h"
 #include "hw/intc/mips_gic.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 
 static void mips_gic_set_vp_irq(MIPSGICState *gic, int vp, int pin)

diff --git a/hw/intc/omap_intc.c b/hw/intc/omap_intc.c
index c61158bddd302c22e29bcf0be76f30eed68ce639..7b23b6d2cec06da435d6565cb91e819e4be4d928 100644 (file)
--- a/hw/intc/omap_intc.c
+++ b/hw/intc/omap_intc.c
@@ -19,7 +19,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/arm/omap.h"
 #include "hw/sysbus.h"

diff --git a/hw/intc/ompic.c b/hw/intc/ompic.c
index 047c367478dfe1f6da634f9b3ee00ee85cad4e57..5a630bd51cb21ff99cbfb351d81a930de1ec4c24 100644 (file)
--- a/hw/intc/ompic.c
+++ b/hw/intc/ompic.c
@@ -9,7 +9,7 @@
 #include "qemu/osdep.h"
 #include "qemu/module.h"
 #include "qapi/error.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"

diff --git a/hw/intc/openpic.c b/hw/intc/openpic.c
index 87733eb7c301f80330a81802da11c4b898970485..edac46227f500c7015e4f2ac3263821af4631a9a 100644 (file)
--- a/hw/intc/openpic.c
+++ b/hw/intc/openpic.c
@@ -31,7 +31,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/pci/pci.h"
 #include "hw/ppc/openpic.h"
 #include "hw/ppc/ppc_e500.h"

diff --git a/hw/intc/pl190.c b/hw/intc/pl190.c
index 838c21c4a02909d53c03cb946be6a52c46fa81a7..f1e4959e9aefd67d31a968a9e4b7701178948ea0 100644 (file)
--- a/hw/intc/pl190.c
+++ b/hw/intc/pl190.c
@@ -8,7 +8,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"

diff --git a/hw/intc/ppc-uic.c b/hw/intc/ppc-uic.c
index bc4dc90ade1cfec4843ca6d3bcfae318be50d8d8..bfc4a4fbceb84f1c3b6831ace7b36156fa5d3b60 100644 (file)
--- a/hw/intc/ppc-uic.c
+++ b/hw/intc/ppc-uic.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/intc/ppc-uic.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 

diff --git a/hw/intc/realview_gic.c b/hw/intc/realview_gic.c
index 63e25c2a7814c34489299c26e6a4346fce391f92..ecaf8201fd6c127b90b847a77631f5f20d5933b9 100644 (file)
--- a/hw/intc/realview_gic.c
+++ b/hw/intc/realview_gic.c
@@ -11,7 +11,7 @@
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "hw/intc/realview_gic.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 
 static void realview_gic_set_irq(void *opaque, int irq, int level)

diff --git a/hw/intc/riscv_aclint.c b/hw/intc/riscv_aclint.c
index c6f13f647ec6d7d2c6f2c7cb1b6ad36fcfee16d2..f3e37df47d16f6beeca16562deac602c13c8198e 100644 (file)
--- a/hw/intc/riscv_aclint.c
+++ b/hw/intc/riscv_aclint.c
@@ -32,7 +32,7 @@
 #include "hw/qdev-properties.h"
 #include "hw/intc/riscv_aclint.h"
 #include "qemu/timer.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "migration/vmstate.h"
 
 typedef struct riscv_aclint_mtimer_callback {

diff --git a/hw/intc/riscv_aplic.c b/hw/intc/riscv_aplic.c
index a559664c40ba473afb38d916b9f2064e2b8d5ce2..580622d1712db5883a933b61509b8e601417e531 100644 (file)
--- a/hw/intc/riscv_aplic.c
+++ b/hw/intc/riscv_aplic.c
@@ -28,7 +28,7 @@
 #include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "hw/intc/riscv_aplic.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "target/riscv/cpu.h"
 #include "system/system.h"
 #include "system/kvm.h"

diff --git a/hw/intc/riscv_imsic.c b/hw/intc/riscv_imsic.c
index 513e38d9c1207e97a04066ab2036ecaf2dbcc8c9..54e72b81e789204941fe99bfc99549118f00663b 100644 (file)
--- a/hw/intc/riscv_imsic.c
+++ b/hw/intc/riscv_imsic.c
@@ -28,7 +28,7 @@
 #include "hw/core/boards.h"
 #include "hw/qdev-properties.h"
 #include "hw/intc/riscv_imsic.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "target/riscv/cpu.h"
 #include "target/riscv/cpu_bits.h"
 #include "system/system.h"

diff --git a/hw/intc/rx_icu.c b/hw/intc/rx_icu.c
index f8615527b75ba59de2257156fdc1173190b6a533..84712e2e4d00bf36376e1ad68d98b62b19b9f105 100644 (file)
--- a/hw/intc/rx_icu.c
+++ b/hw/intc/rx_icu.c
@@ -26,7 +26,7 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "qemu/error-report.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/registerfields.h"
 #include "hw/qdev-properties.h"
 #include "hw/intc/rx_icu.h"

diff --git a/hw/intc/sh_intc.c b/hw/intc/sh_intc.c
index c9b0b0c1eccedb582ac3ddf4e56a5ee254029e15..16e4b619d6de253490bda85e5dc476334ca40a75 100644 (file)
--- a/hw/intc/sh_intc.c
+++ b/hw/intc/sh_intc.c
@@ -12,7 +12,7 @@
 #include "qemu/log.h"
 #include "cpu.h"
 #include "hw/sh4/sh_intc.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sh4/sh.h"
 #include "trace.h"
 

diff --git a/hw/intc/sifive_plic.c b/hw/intc/sifive_plic.c
index 3160b216fdc9797b6108244f4918159f3097b099..c578b6e36d2fdc8da009ee005c6050c6517a63f6 100644 (file)
--- a/hw/intc/sifive_plic.c
+++ b/hw/intc/sifive_plic.c
@@ -29,7 +29,7 @@
 #include "hw/intc/sifive_plic.h"
 #include "target/riscv/cpu.h"
 #include "migration/vmstate.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "system/kvm.h"
 
 static bool addr_between(uint32_t addr, uint32_t base, uint32_t num)

diff --git a/hw/intc/slavio_intctl.c b/hw/intc/slavio_intctl.c
index 00b80bb177cfedb76830f5dc4e824a1dcc16360c..b12c8cbd69f1af9862c172f27c7ffe937aaacc5d 100644 (file)
--- a/hw/intc/slavio_intctl.c
+++ b/hw/intc/slavio_intctl.c
@@ -27,7 +27,7 @@
 #include "qemu/module.h"
 #include "hw/sysbus.h"
 #include "hw/intc/intc.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "trace.h"
 #include "qom/object.h"
 

diff --git a/hw/intc/xics.c b/hw/intc/xics.c
index 200710eb6ca9c6045abe395e20016cdfd4fdce32..e87c0ad2bcd7cde307856863f34edc8da4fbf4a5 100644 (file)
--- a/hw/intc/xics.c
+++ b/hw/intc/xics.c
@@ -36,7 +36,7 @@
 #include "qapi/visitor.h"
 #include "migration/vmstate.h"
 #include "hw/intc/intc.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "system/kvm.h"
 #include "system/reset.h"
 #include "target/ppc/cpu.h"

diff --git a/hw/intc/xilinx_intc.c b/hw/intc/xilinx_intc.c
index 5257ad54b17aba9b550b92093a9dd39d1fd3fd24..f5a59d89830d930737baad1f5219af0e22d94164 100644 (file)
--- a/hw/intc/xilinx_intc.c
+++ b/hw/intc/xilinx_intc.c
@@ -29,7 +29,7 @@
 #include "qapi/error.h"
 #include "hw/sysbus.h"
 #include "qemu/module.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "qom/object.h"

diff --git a/hw/intc/xive.c b/hw/intc/xive.c
index e0ffcf89ebff63a75163c66f22cb9da368ce8b2f..6f9babf601cb8ceb89e8b4bf1a96244ba41f3c04 100644 (file)
--- a/hw/intc/xive.c
+++ b/hw/intc/xive.c
@@ -16,7 +16,7 @@
 #include "system/reset.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/ppc/xive.h"
 #include "hw/ppc/xive2.h"
 #include "hw/ppc/xive_regs.h"

diff --git a/hw/intc/xlnx-pmu-iomod-intc.c b/hw/intc/xlnx-pmu-iomod-intc.c
index 9200585e3252b9b034d7a2b632c5d5045cbec637..098c1f327cd6e88df30f38250e86a3de9fa75bde 100644 (file)
--- a/hw/intc/xlnx-pmu-iomod-intc.c
+++ b/hw/intc/xlnx-pmu-iomod-intc.c
@@ -32,7 +32,7 @@
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "hw/intc/xlnx-pmu-iomod-intc.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.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 610cd0e31645db00c62dac5099c3c2e07709c2bc..99566bc2e2019823286bff966c7f7f6a3d588b59 100644 (file)
--- a/hw/intc/xlnx-zynqmp-ipi.c
+++ b/hw/intc/xlnx-zynqmp-ipi.c
@@ -33,7 +33,7 @@
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "hw/intc/xlnx-zynqmp-ipi.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 
 #ifndef XLNX_ZYNQMP_IPI_ERR_DEBUG
 #define XLNX_ZYNQMP_IPI_ERR_DEBUG 0

diff --git a/hw/ipack/ipack.c b/hw/ipack/ipack.c
index ab602bff734025e24ca8d5511eb1629f5aff293e..4a710eb1876e82d3b2a7b8f21941551dc8e25583 100644 (file)
--- a/hw/ipack/ipack.c
+++ b/hw/ipack/ipack.c
@@ -12,7 +12,7 @@
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "hw/ipack/ipack.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 

diff --git a/hw/ipack/tpci200.c b/hw/ipack/tpci200.c
index 40b30517c75b203e7fed0c56d7185fbe3500bf58..b074b8727dc35e6bb766417730c47d8ec9562862 100644 (file)
--- a/hw/ipack/tpci200.c
+++ b/hw/ipack/tpci200.c
@@ -11,7 +11,7 @@
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 #include "hw/ipack/ipack.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/pci/pci_device.h"
 #include "migration/vmstate.h"
 #include "qemu/bitops.h"

diff --git a/hw/ipmi/isa_ipmi_bt.c b/hw/ipmi/isa_ipmi_bt.c
index 0ad91ccf6893bfcc1ea054245e5f3a2713e7723e..2b26f9c9f0f25940e07010f3d47f1e2ab57e6b9e 100644 (file)
--- a/hw/ipmi/isa_ipmi_bt.c
+++ b/hw/ipmi/isa_ipmi_bt.c
@@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 #include "qemu/module.h"
 #include "qapi/error.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/ipmi/ipmi_bt.h"
 #include "hw/isa/isa.h"
 #include "hw/qdev-properties.h"

diff --git a/hw/ipmi/isa_ipmi_kcs.c b/hw/ipmi/isa_ipmi_kcs.c
index 418d234e0f1badc9dfe4ecbf70493d3d0a441c28..14e85e6e9fd83083e193287dd74f72ba9de6a278 100644 (file)
--- a/hw/ipmi/isa_ipmi_kcs.c
+++ b/hw/ipmi/isa_ipmi_kcs.c
@@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 #include "qemu/module.h"
 #include "qapi/error.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/ipmi/ipmi_kcs.h"
 #include "hw/isa/isa.h"
 #include "hw/qdev-properties.h"

diff --git a/hw/isa/i82378.c b/hw/isa/i82378.c
index 06e8f0ce3e0ca35081b6d078fd10f6e22764b766..dfa8a3775cf905d4d54d3958e81077f4f7c76e50 100644 (file)
--- a/hw/isa/i82378.c
+++ b/hw/isa/i82378.c
@@ -19,7 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/pci/pci_device.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/intc/i8259.h"
 #include "hw/timer/i8254.h"
 #include "migration/vmstate.h"

diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c
index c9cb8f7779952f9bec671d3beffb1cbc604872d1..6e772eca57351d8eb6d4677d8e41707c96d5c237 100644 (file)
--- a/hw/isa/lpc_ich9.c
+++ b/hw/isa/lpc_ich9.c
@@ -37,7 +37,7 @@
 #include "hw/dma/i8257.h"
 #include "hw/isa/isa.h"
 #include "migration/vmstate.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/isa/apm.h"
 #include "hw/pci/pci.h"
 #include "hw/southbridge/ich9.h"

diff --git a/hw/isa/piix.c b/hw/isa/piix.c
index 52c14d3cd5b8d00936b11b280aca8d8d8ac8e003..bf1c79a3e63da6c761f0d25d314a17a6407783d9 100644 (file)
--- a/hw/isa/piix.c
+++ b/hw/isa/piix.c
@@ -29,7 +29,7 @@
 #include "hw/dma/i8257.h"
 #include "hw/southbridge/piix.h"
 #include "hw/timer/i8254.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/ide/piix.h"
 #include "hw/intc/i8259.h"

diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c
index 337958617a46a9e457d9ac6b9a62c014ef2524ec..1362a1f40423259442f0f56e0d8b25fc3d9170d7 100644 (file)
--- a/hw/isa/vt82c686.c
+++ b/hw/isa/vt82c686.c
@@ -24,7 +24,7 @@
 #include "hw/isa/isa.h"
 #include "hw/isa/superio.h"
 #include "hw/intc/i8259.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/dma/i8257.h"
 #include "hw/usb/hcd-uhci.h"
 #include "hw/timer/i8254.h"

diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index a78a9bc03d8684d924e6a03056ad5479fbd67813..0e11eb340f0ae3cffb7401cf71e52dddbfebe85f 100644 (file)
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -20,7 +20,7 @@
 #include "system/rtc.h"
 #include "hw/loongarch/virt.h"
 #include "system/address-spaces.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "net/net.h"
 #include "hw/loader.h"
 #include "elf.h"

diff --git a/hw/m68k/mcf5206.c b/hw/m68k/mcf5206.c
index 6359aa81d0e207a188cbe7efd9d7b36d450224ae..4cf86d510b3a09e28662438575478d866543301d 100644 (file)
--- a/hw/m68k/mcf5206.c
+++ b/hw/m68k/mcf5206.c
@@ -12,7 +12,7 @@
 #include "cpu.h"
 #include "hw/qdev-properties.h"
 #include "hw/core/boards.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/m68k/mcf.h"
 #include "qemu/timer.h"
 #include "hw/ptimer.h"

diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c
index c1067435bf8a1fbf6f21ee30c7d1eec92bc87413..b2b02f25ff1e6e973429e0cf6de183406897bb31 100644 (file)
--- a/hw/m68k/mcf5208.c
+++ b/hw/m68k/mcf5208.c
@@ -21,7 +21,7 @@
 #include "qapi/error.h"
 #include "qemu/datadir.h"
 #include "cpu.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/m68k/mcf.h"
 #include "hw/m68k/mcf_fec.h"
 #include "qemu/timer.h"

diff --git a/hw/m68k/mcf_intc.c b/hw/m68k/mcf_intc.c
index e3055b841e83eb88dda0bc0874ac8fd32a813ee6..efac6802a971dcd38b195b45112adb3878fae9b3 100644 (file)
--- a/hw/m68k/mcf_intc.c
+++ b/hw/m68k/mcf_intc.c
@@ -11,7 +11,7 @@
 #include "qemu/module.h"
 #include "qemu/log.h"
 #include "cpu.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sysbus.h"
 #include "hw/m68k/mcf.h"
 #include "hw/qdev-properties.h"

diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c
index d7c460bcd4b6e57d5ed9d0ba2fa0945d84a4a2a0..1411436a463ddf59545feced0d961962cacbac81 100644 (file)
--- a/hw/m68k/next-cube.c
+++ b/hw/m68k/next-cube.c
@@ -15,7 +15,7 @@
 #include "exec/cpu-interrupt.h"
 #include "system/system.h"
 #include "system/qtest.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/m68k/next-cube.h"
 #include "hw/core/boards.h"
 #include "hw/loader.h"

diff --git a/hw/m68k/q800-glue.c b/hw/m68k/q800-glue.c
index d663d124fce863d11145c891c237077a36be7731..94f47175ae59fe289d4da1840d34795a61fed38c 100644 (file)
--- a/hw/m68k/q800-glue.c
+++ b/hw/m68k/q800-glue.c
@@ -24,7 +24,7 @@
 #include "cpu.h"
 #include "hw/m68k/q800-glue.h"
 #include "hw/core/boards.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/nmi.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"

diff --git a/hw/mips/malta.c b/hw/mips/malta.c
index 44ae8bc6c72591b555913b1f951040a2d35397cf..c63d77d4cca2a09705fd485c88900c33857a4666 100644 (file)
--- a/hw/mips/malta.c
+++ b/hw/mips/malta.c
@@ -43,7 +43,7 @@
 #include "hw/pci/pci_bus.h"
 #include "qemu/log.h"
 #include "hw/ide/pci.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/loader.h"
 #include "elf.h"
 #include "qom/object.h"

diff --git a/hw/mips/mips_int.c b/hw/mips/mips_int.c
index 26fdb934f5051ac0fe446618d256b03b7ac1d7d9..2b740afc4d854bf49d7199b45450f404074a69a5 100644 (file)
--- a/hw/mips/mips_int.c
+++ b/hw/mips/mips_int.c
@@ -22,7 +22,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/main-loop.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "system/kvm.h"
 #include "kvm_mips.h"
 

diff --git a/hw/misc/arm_sysctl.c b/hw/misc/arm_sysctl.c
index 0f4e37cd474776de5eae6515366e7509b7487b27..8995eaeec36c0bba9ef6e74057134af9c1fef15c 100644 (file)
--- a/hw/misc/arm_sysctl.c
+++ b/hw/misc/arm_sysctl.c
@@ -8,7 +8,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "qemu/timer.h"
 #include "system/runstate.h"

diff --git a/hw/misc/armsse-mhu.c b/hw/misc/armsse-mhu.c
index d5d307a186c9a128090527bfe03f262a4d2cb6e4..2673c2de3ef6f63cbea0189f225ad2f9559294e8 100644 (file)
--- a/hw/misc/armsse-mhu.c
+++ b/hw/misc/armsse-mhu.c
@@ -23,7 +23,7 @@
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/registerfields.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/misc/armsse-mhu.h"
 
 REG32(CPU0INTR_STAT, 0x0)

diff --git a/hw/misc/aspeed_hace.c b/hw/misc/aspeed_hace.c
index 726368fbbc2e420321477ffe51ad15bc90e31f09..51c73ca2a5294ad697935b6905eb367e3e73ee06 100644 (file)
--- a/hw/misc/aspeed_hace.c
+++ b/hw/misc/aspeed_hace.c
@@ -19,7 +19,7 @@
 #include "migration/vmstate.h"
 #include "crypto/hash.h"
 #include "hw/qdev-properties.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "trace.h"
 
 #define R_CRYPT_CMD     (0x10 / 4)

diff --git a/hw/misc/aspeed_lpc.c b/hw/misc/aspeed_lpc.c
index 78406dae24868340dbb9f7d74ede041ddc64263a..829955e6f160c7194f249741a0e10e25e8e4ad49 100644 (file)
--- a/hw/misc/aspeed_lpc.c
+++ b/hw/misc/aspeed_lpc.c
@@ -13,7 +13,7 @@
 #include "hw/misc/aspeed_lpc.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 

diff --git a/hw/misc/aspeed_peci.c b/hw/misc/aspeed_peci.c
index a7a449a923668924d97a56cedf658a4e2fe0cb3a..cf902a8ab8c1b1ad3b1c8eff05d75b7f3474665f 100644 (file)
--- a/hw/misc/aspeed_peci.c
+++ b/hw/misc/aspeed_peci.c
@@ -9,7 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/misc/aspeed_peci.h"
 #include "hw/registerfields.h"
 #include "trace.h"

diff --git a/hw/misc/aspeed_xdma.c b/hw/misc/aspeed_xdma.c
index c448ad32ff2f9ce051f223724d39e5f91b9aac31..3e2beafcedfbc8d8eab9f3d556ca31c89b9f21dd 100644 (file)
--- a/hw/misc/aspeed_xdma.c
+++ b/hw/misc/aspeed_xdma.c
@@ -9,7 +9,7 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "qemu/error-report.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/misc/aspeed_xdma.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"

diff --git a/hw/misc/avr_power.c b/hw/misc/avr_power.c
index 411f016c99771730b5c4880030e27768e494a9ac..947304ed3b64f77cf31ec3159f6f060f05b3b915 100644 (file)
--- a/hw/misc/avr_power.c
+++ b/hw/misc/avr_power.c
@@ -26,7 +26,7 @@
 #include "hw/misc/avr_power.h"
 #include "qemu/log.h"
 #include "hw/qdev-properties.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "trace.h"
 
 static void avr_mask_reset(DeviceState *dev)

diff --git a/hw/misc/bcm2835_mbox.c b/hw/misc/bcm2835_mbox.c
index 603eaaa710d59e05c8e0a49cfccdf220fb947282..ac37fe99571cb89dfc2c6131ca4e615079508fc2 100644 (file)
--- a/hw/misc/bcm2835_mbox.c
+++ b/hw/misc/bcm2835_mbox.c
@@ -12,7 +12,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/misc/bcm2835_mbox.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"

diff --git a/hw/misc/bcm2835_property.c b/hw/misc/bcm2835_property.c
index a21c6a541c050becff9919d8689370a233df2453..2026294ce1218f2b87c20f1283e104130fe7c5dd 100644 (file)
--- a/hw/misc/bcm2835_property.c
+++ b/hw/misc/bcm2835_property.c
@@ -10,7 +10,7 @@
 #include "hw/misc/bcm2835_property.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/misc/bcm2835_mbox_defs.h"
 #include "hw/arm/raspberrypi-fw-defs.h"
 #include "system/dma.h"

diff --git a/hw/misc/eccmemctl.c b/hw/misc/eccmemctl.c
index 81fc536131cd26f2d65dc9d6df473fd27ede8864..71243ba5bad9009ecb0833bdc228936b55ef5bb7 100644 (file)
--- a/hw/misc/eccmemctl.c
+++ b/hw/misc/eccmemctl.c
@@ -23,7 +23,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"

diff --git a/hw/misc/imx_rngc.c b/hw/misc/imx_rngc.c
index 630f6cb54b5f310453fbd2028eedc928ffc1e05e..9f49bbcc2e73182d34bc9b38dcb847c4c2d71cd7 100644 (file)
--- a/hw/misc/imx_rngc.c
+++ b/hw/misc/imx_rngc.c
@@ -15,7 +15,7 @@
 #include "qemu/main-loop.h"
 #include "qemu/module.h"
 #include "qemu/guest-random.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/misc/imx_rngc.h"
 #include "migration/vmstate.h"
 

diff --git a/hw/misc/iotkit-secctl.c b/hw/misc/iotkit-secctl.c
index afd9ab48df7b2cc903bec55078d3e21773ed375c..f8a2946191db2d683349fd22e7a6400c8ea812a8 100644 (file)
--- a/hw/misc/iotkit-secctl.c
+++ b/hw/misc/iotkit-secctl.c
@@ -17,7 +17,7 @@
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/registerfields.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/misc/iotkit-secctl.h"
 #include "hw/arm/armsse-version.h"
 #include "hw/qdev-properties.h"

diff --git a/hw/misc/ivshmem-flat.c b/hw/misc/ivshmem-flat.c
index 27ee8c921830e895f9988af7dd65b7ff14987fa2..790500d34decf71a5b89775142904cf830358225 100644 (file)
--- a/hw/misc/ivshmem-flat.c
+++ b/hw/misc/ivshmem-flat.c
@@ -13,7 +13,7 @@
 #include "qemu/error-report.h"
 #include "qemu/module.h"
 #include "qapi/error.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/sysbus.h"
 #include "chardev/char-fe.h"

diff --git a/hw/misc/lasi.c b/hw/misc/lasi.c
index 6684f16fd758de534ee9be2c54bdab28025645c9..e8e1578b7513ad86d29085bd2d1369e342b62bc7 100644 (file)
--- a/hw/misc/lasi.c
+++ b/hw/misc/lasi.c
@@ -14,7 +14,7 @@
 #include "qemu/log.h"
 #include "qapi/error.h"
 #include "trace.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "system/system.h"
 #include "system/runstate.h"
 #include "migration/vmstate.h"

diff --git a/hw/misc/mac_via.c b/hw/misc/mac_via.c
index bc37e2a2cb73cf8740d2a5e234f6018574b16580..13ccd3023fb359ab86d57320c510a7fdc33fdf75 100644 (file)
--- a/hw/misc/mac_via.c
+++ b/hw/misc/mac_via.c
@@ -19,7 +19,7 @@
 #include "system/address-spaces.h"
 #include "migration/vmstate.h"
 #include "hw/sysbus.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "qemu/timer.h"
 #include "hw/misc/mac_via.h"
 #include "hw/misc/mos6522.h"

diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c
index bcd00c9bb1bab9f93d29382979032a9bc32e50e5..3b8dd462f5682dae926ec9c4ff780a18911cab28 100644 (file)
--- a/hw/misc/macio/cuda.c
+++ b/hw/misc/macio/cuda.c
@@ -24,7 +24,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "hw/misc/macio/cuda.h"

diff --git a/hw/misc/macio/gpio.c b/hw/misc/macio/gpio.c
index 990551f91f4b3ffbcd4ffe557d0c527e1e942b0a..9fed4265676c2571d3b5219b56560e039a41a31d 100644 (file)
--- a/hw/misc/macio/gpio.c
+++ b/hw/misc/macio/gpio.c
@@ -28,7 +28,7 @@
 #include "migration/vmstate.h"
 #include "hw/misc/macio/macio.h"
 #include "hw/misc/macio/gpio.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/nmi.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/misc/macio/mac_dbdma.c b/hw/misc/macio/mac_dbdma.c
index b2b42dd5622072b1ce02debc11999190abb43703..a55c9c99824fc69496529daebb9f9047bc8376db 100644 (file)
--- a/hw/misc/macio/mac_dbdma.c
+++ b/hw/misc/macio/mac_dbdma.c
@@ -38,7 +38,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/ppc/mac_dbdma.h"
 #include "migration/vmstate.h"
 #include "qemu/main-loop.h"

diff --git a/hw/misc/macio/pmu.c b/hw/misc/macio/pmu.c
index 373491399481b79d9e899614f22ca3a96fb913ff..73e64306b8600d0e68889141a558e3264d00cca8 100644 (file)
--- a/hw/misc/macio/pmu.c
+++ b/hw/misc/macio/pmu.c
@@ -31,7 +31,7 @@
 #include "qemu/osdep.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/misc/macio/pmu.h"
 #include "qemu/timer.h"
 #include "system/runstate.h"

diff --git a/hw/misc/max78000_aes.c b/hw/misc/max78000_aes.c
index d883ddd2b614b9e700d183180b4eebe35323a943..65846757332cc46dfe89fbf351f53a303e493b79 100644 (file)
--- a/hw/misc/max78000_aes.c
+++ b/hw/misc/max78000_aes.c
@@ -9,7 +9,7 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "trace.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "migration/vmstate.h"
 #include "hw/misc/max78000_aes.h"
 #include "crypto/aes.h"

diff --git a/hw/misc/max78000_gcr.c b/hw/misc/max78000_gcr.c
index fbbc92cca32d9d68edf64f048f418e01423945d0..6d2e2bd617692f4506a1997b68449453516a8082 100644 (file)
--- a/hw/misc/max78000_gcr.c
+++ b/hw/misc/max78000_gcr.c
@@ -9,7 +9,7 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "trace.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "system/runstate.h"
 #include "migration/vmstate.h"
 #include "hw/qdev-properties.h"

diff --git a/hw/misc/max78000_icc.c b/hw/misc/max78000_icc.c
index 6f7d2b20bf5f3a6f71cf41d17c038ac3e9a51b33..622baa5719dd1799e5da2ace2ed0d6fe5e2560dc 100644 (file)
--- a/hw/misc/max78000_icc.c
+++ b/hw/misc/max78000_icc.c
@@ -9,7 +9,7 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "trace.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "migration/vmstate.h"
 #include "hw/misc/max78000_icc.h"
 

diff --git a/hw/misc/max78000_trng.c b/hw/misc/max78000_trng.c
index ecdaef53b6c219dadc785e3bb3110d03c29f3d45..1435138344df79787efef2a123fd11545845d22d 100644 (file)
--- a/hw/misc/max78000_trng.c
+++ b/hw/misc/max78000_trng.c
@@ -9,7 +9,7 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "trace.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "migration/vmstate.h"
 #include "hw/misc/max78000_trng.h"
 #include "qemu/guest-random.h"

diff --git a/hw/misc/mchp_pfsoc_ioscb.c b/hw/misc/mchp_pfsoc_ioscb.c
index 10fc7ea2a9509d3d51cc1ac78d090873739824e3..84e957244e53dc007004b6deda5478bfa572f427 100644 (file)
--- a/hw/misc/mchp_pfsoc_ioscb.c
+++ b/hw/misc/mchp_pfsoc_ioscb.c
@@ -24,7 +24,7 @@
 #include "qemu/bitops.h"
 #include "qemu/log.h"
 #include "qapi/error.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sysbus.h"
 #include "hw/misc/mchp_pfsoc_ioscb.h"
 

diff --git a/hw/misc/mchp_pfsoc_sysreg.c b/hw/misc/mchp_pfsoc_sysreg.c
index f47c835f80de9f49e369c7907eb7a3c66164a4a3..2a4151510373272ab19a62142eaee99b569dbb81 100644 (file)
--- a/hw/misc/mchp_pfsoc_sysreg.c
+++ b/hw/misc/mchp_pfsoc_sysreg.c
@@ -24,7 +24,7 @@
 #include "qemu/bitops.h"
 #include "qemu/log.h"
 #include "qapi/error.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sysbus.h"
 #include "hw/misc/mchp_pfsoc_sysreg.h"
 #include "system/runstate.h"

diff --git a/hw/misc/mos6522.c b/hw/misc/mos6522.c
index 8dd6b82ac5f5b55b2505b13d680ae9ba4246237f..728931883d8d15175d9e11d40679995536f0f9c2 100644 (file)
--- a/hw/misc/mos6522.c
+++ b/hw/misc/mos6522.c
@@ -25,7 +25,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/misc/mos6522.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"

diff --git a/hw/misc/mps2-scc.c b/hw/misc/mps2-scc.c
index a9a5d4a535b65ea40cfc5910c28ab52125a31484..ea9cad85dc2295e762953c0999028a179e41421d 100644 (file)
--- a/hw/misc/mps2-scc.c
+++ b/hw/misc/mps2-scc.c
@@ -23,7 +23,7 @@
 #include "qemu/bitops.h"
 #include "trace.h"
 #include "hw/sysbus.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "migration/vmstate.h"
 #include "hw/registerfields.h"
 #include "hw/misc/mps2-scc.h"

diff --git a/hw/misc/npcm7xx_mft.c b/hw/misc/npcm7xx_mft.c
index b35e971fe533f8deededa681492bb07833664012..514d29f2015cb526b634750655b4f93b38450bca 100644 (file)
--- a/hw/misc/npcm7xx_mft.c
+++ b/hw/misc/npcm7xx_mft.c
@@ -15,7 +15,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-clock.h"
 #include "hw/qdev-properties.h"
 #include "hw/misc/npcm7xx_mft.h"

diff --git a/hw/misc/npcm7xx_pwm.c b/hw/misc/npcm7xx_pwm.c
index 2de18d09b822195cec7b844fdcf561dd0c505c9d..2e72d1c7d4fab7784d6fc984f6e9ab606c158de5 100644 (file)
--- a/hw/misc/npcm7xx_pwm.c
+++ b/hw/misc/npcm7xx_pwm.c
@@ -15,7 +15,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-clock.h"
 #include "hw/qdev-properties.h"
 #include "hw/misc/npcm7xx_pwm.h"

diff --git a/hw/misc/nrf51_rng.c b/hw/misc/nrf51_rng.c
index 8cd7ffe3f557ac8eeb6421af5dff59d4a215a7ac..0254fb377a625f9e02d55a806ad49f5231410423 100644 (file)
--- a/hw/misc/nrf51_rng.c
+++ b/hw/misc/nrf51_rng.c
@@ -14,7 +14,7 @@
 #include "qemu/module.h"
 #include "qapi/error.h"
 #include "hw/arm/nrf51.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/misc/nrf51_rng.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"

diff --git a/hw/misc/omap_clk.c b/hw/misc/omap_clk.c
index da95c4ace5805bc43c5d2946e2da47013d4ff2f0..37afef09903610e86586615a7961b7bf44e7571a 100644 (file)
--- a/hw/misc/omap_clk.c
+++ b/hw/misc/omap_clk.c
@@ -21,7 +21,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/hw.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/arm/omap.h"
 
 struct clk {

diff --git a/hw/misc/pc-testdev.c b/hw/misc/pc-testdev.c
index 67c486f347cc33e80821b96d44464b1d7851cb8f..4093cb3c99c62b35d378057ad342314c63aa7af1 100644 (file)
--- a/hw/misc/pc-testdev.c
+++ b/hw/misc/pc-testdev.c
@@ -37,7 +37,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/module.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/isa/isa.h"
 #include "qom/object.h"
 

diff --git a/hw/misc/sifive_e_aon.c b/hw/misc/sifive_e_aon.c
index 6eef38d622a875612ef68ec90ca432a21fadab07..9b1e7baf95ee102986c7aa8e6d0c6f9e922de36e 100644 (file)
--- a/hw/misc/sifive_e_aon.c
+++ b/hw/misc/sifive_e_aon.c
@@ -19,7 +19,7 @@
 #include "qemu/osdep.h"
 #include "qemu/timer.h"
 #include "qemu/log.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/registerfields.h"
 #include "hw/misc/sifive_e_aon.h"
 #include "qapi/visitor.h"

diff --git a/hw/misc/slavio_misc.c b/hw/misc/slavio_misc.c
index a034df3592f97ff5b1cf2fe293551b85bc3663c6..43ce5d0bc9738ee0cce9f594cc4caf4faddaa218 100644 (file)
--- a/hw/misc/slavio_misc.c
+++ b/hw/misc/slavio_misc.c
@@ -23,7 +23,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"

diff --git a/hw/misc/stm32_rcc.c b/hw/misc/stm32_rcc.c
index 5815b3efa5431d7088379f56eb032c9e2e6f73ea..74ea29b1560fce890855b3049ca4829177cf51f2 100644 (file)
--- a/hw/misc/stm32_rcc.c
+++ b/hw/misc/stm32_rcc.c
@@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "trace.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "migration/vmstate.h"
 #include "hw/misc/stm32_rcc.h"
 

diff --git a/hw/misc/stm32f4xx_exti.c b/hw/misc/stm32f4xx_exti.c
index 0688e6e73ecf73d3d5723f7dcd0f60b2aa6b7242..a9d396c5dcf66749be2b2b63c7561f6809b19cf1 100644 (file)
--- a/hw/misc/stm32f4xx_exti.c
+++ b/hw/misc/stm32f4xx_exti.c
@@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "trace.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "migration/vmstate.h"
 #include "hw/misc/stm32f4xx_exti.h"
 

diff --git a/hw/misc/stm32f4xx_syscfg.c b/hw/misc/stm32f4xx_syscfg.c
index addfb031e88465ffdc75472d1b13ee5646ea027e..57e89a13aaa914c6b01ce2c807e07d999255c4d9 100644 (file)
--- a/hw/misc/stm32f4xx_syscfg.c
+++ b/hw/misc/stm32f4xx_syscfg.c
@@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "trace.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "migration/vmstate.h"
 #include "hw/misc/stm32f4xx_syscfg.h"
 

diff --git a/hw/misc/stm32l4x5_exti.c b/hw/misc/stm32l4x5_exti.c
index 9c002164c8225869a89c8bac047fa6ef06ce644e..8de4568de706bf18de2669a99362f5725174e655 100644 (file)
--- a/hw/misc/stm32l4x5_exti.c
+++ b/hw/misc/stm32l4x5_exti.c
@@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "trace.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "migration/vmstate.h"
 #include "hw/misc/stm32l4x5_exti.h"
 

diff --git a/hw/misc/stm32l4x5_rcc.c b/hw/misc/stm32l4x5_rcc.c
index 514159777a02432547400e3007655873680baf7f..d4af2cd69638672535707bea6936cbe72fd4b8e7 100644 (file)
--- a/hw/misc/stm32l4x5_rcc.c
+++ b/hw/misc/stm32l4x5_rcc.c
@@ -24,7 +24,7 @@
 #include "hw/misc/stm32l4x5_rcc.h"
 #include "hw/misc/stm32l4x5_rcc_internals.h"
 #include "hw/core/clock.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-clock.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"

diff --git a/hw/misc/stm32l4x5_syscfg.c b/hw/misc/stm32l4x5_syscfg.c
index 85be226d2f40973b5967b1e2b966550e77119ba5..de488a46780c9c9ae383be02294dfef081320697 100644 (file)
--- a/hw/misc/stm32l4x5_syscfg.c
+++ b/hw/misc/stm32l4x5_syscfg.c
@@ -24,7 +24,7 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "trace.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "migration/vmstate.h"
 #include "hw/core/clock.h"
 #include "hw/qdev-clock.h"

diff --git a/hw/misc/tz-mpc.c b/hw/misc/tz-mpc.c
index a158d4a2944534853e4d086fcd1a25e061c1393f..d922639da1771e30f16feaedc5ce7e685eaf8a49 100644 (file)
--- a/hw/misc/tz-mpc.c
+++ b/hw/misc/tz-mpc.c
@@ -17,7 +17,7 @@
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/registerfields.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/misc/tz-mpc.h"
 #include "hw/qdev-properties.h"
 

diff --git a/hw/misc/tz-msc.c b/hw/misc/tz-msc.c
index af0cc5d471868d73f4fc1962939c945d91645768..74c31f6d7d21c9510fc434e50664e1d21a91c6c1 100644 (file)
--- a/hw/misc/tz-msc.c
+++ b/hw/misc/tz-msc.c
@@ -17,7 +17,7 @@
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/registerfields.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/misc/tz-msc.h"
 #include "hw/qdev-properties.h"
 

diff --git a/hw/misc/tz-ppc.c b/hw/misc/tz-ppc.c
index e4235a846d4088a2f0bb5fbcab6d9e29840f3c06..2ab03fa9730db82c1dcf298ce26fb7b74f030040 100644 (file)
--- a/hw/misc/tz-ppc.c
+++ b/hw/misc/tz-ppc.c
@@ -17,7 +17,7 @@
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/registerfields.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/misc/tz-ppc.h"
 #include "hw/qdev-properties.h"
 

diff --git a/hw/misc/xlnx-versal-cframe-reg.c b/hw/misc/xlnx-versal-cframe-reg.c
index 95e167b9213bcaf5add798623aac0ea8c0cf07e0..616c0ecf837b2252cb0d93ca637bdca8716a8f1f 100644 (file)
--- a/hw/misc/xlnx-versal-cframe-reg.c
+++ b/hw/misc/xlnx-versal-cframe-reg.c
@@ -18,7 +18,7 @@
 #include "qapi/error.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/misc/xlnx-versal-cframe-reg.h"
 
 #ifndef XLNX_VERSAL_CFRAME_REG_ERR_DEBUG

diff --git a/hw/misc/xlnx-versal-cfu.c b/hw/misc/xlnx-versal-cfu.c
index b920fc77c3fca470e4ea818f557e59bfcb39d707..ce58404eb2cbfa1c770b0d5328893867d3671dcb 100644 (file)
--- a/hw/misc/xlnx-versal-cfu.c
+++ b/hw/misc/xlnx-versal-cfu.c
@@ -13,7 +13,7 @@
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "hw/register.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "qemu/bitops.h"
 #include "qemu/log.h"
 #include "qemu/units.h"

diff --git a/hw/misc/xlnx-versal-crl.c b/hw/misc/xlnx-versal-crl.c
index 5987f32c7165ddfa0e1ca0cca7e46ec1ae556f1f..8f9a40d941d5e0a971a95addf52bfeb4f8efba30 100644 (file)
--- a/hw/misc/xlnx-versal-crl.c
+++ b/hw/misc/xlnx-versal-crl.c
@@ -11,7 +11,7 @@
 #include "migration/vmstate.h"
 #include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/register.h"
 #include "hw/resettable.h"
 

diff --git a/hw/misc/xlnx-versal-pmc-iou-slcr.c b/hw/misc/xlnx-versal-pmc-iou-slcr.c
index d76df468d49d3e09d504b98a163266f78b7c23e1..c75800c1b3cca7e8542068b1cc138c33daea67bf 100644 (file)
--- a/hw/misc/xlnx-versal-pmc-iou-slcr.c
+++ b/hw/misc/xlnx-versal-pmc-iou-slcr.c
@@ -26,7 +26,7 @@
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "hw/register.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "qemu/bitops.h"
 #include "qemu/log.h"
 #include "migration/vmstate.h"

diff --git a/hw/misc/xlnx-versal-xramc.c b/hw/misc/xlnx-versal-xramc.c
index d90f3e87c74ca2b507380ec59a28969f458d98ec..af58bc761f319d5f491c8c6349056fcdc6b0be4b 100644 (file)
--- a/hw/misc/xlnx-versal-xramc.c
+++ b/hw/misc/xlnx-versal-xramc.c
@@ -13,7 +13,7 @@
 #include "hw/sysbus.h"
 #include "hw/register.h"
 #include "hw/qdev-properties.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/misc/xlnx-versal-xramc.h"
 
 #ifndef XLNX_XRAM_CTRL_ERR_DEBUG

diff --git a/hw/misc/xlnx-zynqmp-apu-ctrl.c b/hw/misc/xlnx-zynqmp-apu-ctrl.c
index 08777496d562480c9a43f094d467a2dbcd4b7da2..196e2452ae3a3a5b7280dbbc40fa65fb636acbd6 100644 (file)
--- a/hw/misc/xlnx-zynqmp-apu-ctrl.c
+++ b/hw/misc/xlnx-zynqmp-apu-ctrl.c
@@ -14,7 +14,7 @@
 #include "migration/vmstate.h"
 #include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/register.h"
 
 #include "qemu/bitops.h"

diff --git a/hw/misc/xlnx-zynqmp-crf.c b/hw/misc/xlnx-zynqmp-crf.c
index d9c1bd50e4ff1b1f116fd8a5a0636523cbe932fa..841bce2231c21e34bc990efd7d9e4eb16d622055 100644 (file)
--- a/hw/misc/xlnx-zynqmp-crf.c
+++ b/hw/misc/xlnx-zynqmp-crf.c
@@ -12,7 +12,7 @@
 #include "qemu/bitops.h"
 #include "qemu/log.h"
 #include "migration/vmstate.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/misc/xlnx-zynqmp-crf.h"
 #include "target/arm/arm-powerctl.h"
 

diff --git a/hw/net/allwinner-sun8i-emac.c b/hw/net/allwinner-sun8i-emac.c
index 30a81576b4ce788109257d2a2d0e09dd494a78ea..a4824d61bdad3187adb6f0b9fd1a0cd209889531 100644 (file)
--- a/hw/net/allwinner-sun8i-emac.c
+++ b/hw/net/allwinner-sun8i-emac.c
@@ -23,7 +23,7 @@
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "net/net.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "qemu/log.h"
 #include "trace.h"

diff --git a/hw/net/allwinner_emac.c b/hw/net/allwinner_emac.c
index 77d089d9887a763b6a211ee76745df2d7d29c928..9158c77cb4fbbea7103d466fd1727306d2b36b25 100644 (file)
--- a/hw/net/allwinner_emac.c
+++ b/hw/net/allwinner_emac.c
@@ -22,7 +22,7 @@
 #include "migration/vmstate.h"
 #include "net/net.h"
 #include "qemu/fifo8.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/net/allwinner_emac.h"
 #include "hw/qdev-properties.h"
 #include "qemu/log.h"

diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c
index 44896f1801b763cfd8163f2dd0a746d979238401..ef72821f8d7cbdb0dbce2cf4e28f26b4d2c24904 100644 (file)
--- a/hw/net/cadence_gem.c
+++ b/hw/net/cadence_gem.c
@@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 #include <zlib.h> /* for crc32 */
 
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/net/cadence_gem.h"
 #include "hw/qdev-properties.h"
 #include "hw/registerfields.h"

diff --git a/hw/net/can/can_kvaser_pci.c b/hw/net/can/can_kvaser_pci.c
index be16769de29ce3dccc14909dc1dbedbdfdc7b57f..52584c5d6facc05277f1efebac71d33a40ef870c 100644 (file)
--- a/hw/net/can/can_kvaser_pci.c
+++ b/hw/net/can/can_kvaser_pci.c
@@ -32,7 +32,7 @@
 #include "qemu/osdep.h"
 #include "qemu/module.h"
 #include "qapi/error.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/pci/pci_device.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"

diff --git a/hw/net/can/can_mioe3680_pci.c b/hw/net/can/can_mioe3680_pci.c
index 44f3ba370dc2ad11b02666e2fcd84e94aa8d1579..2e9e09741b2a41ac421dd5111bd171f1f1be50a1 100644 (file)
--- a/hw/net/can/can_mioe3680_pci.c
+++ b/hw/net/can/can_mioe3680_pci.c
@@ -28,7 +28,7 @@
 #include "qemu/osdep.h"
 #include "qemu/module.h"
 #include "qapi/error.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/pci/pci_device.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"

diff --git a/hw/net/can/can_pcm3680_pci.c b/hw/net/can/can_pcm3680_pci.c
index 7296d63be7943100353bf1a74b91c21458cafe30..7dd23c905e53bb32c31b657ad19e123342fd1e5b 100644 (file)
--- a/hw/net/can/can_pcm3680_pci.c
+++ b/hw/net/can/can_pcm3680_pci.c
@@ -28,7 +28,7 @@
 #include "qemu/osdep.h"
 #include "qemu/module.h"
 #include "qapi/error.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/pci/pci_device.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"

diff --git a/hw/net/can/can_sja1000.c b/hw/net/can/can_sja1000.c
index 6b08e977a1d79c4295c025fecaf34740842e2667..922431effbcd0da5e407fa1c71b3e97e1c668a40 100644 (file)
--- a/hw/net/can/can_sja1000.c
+++ b/hw/net/can/can_sja1000.c
@@ -28,7 +28,7 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "qemu/bitops.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "migration/vmstate.h"
 #include "net/can_emu.h"
 

diff --git a/hw/net/can/ctucan_core.c b/hw/net/can/ctucan_core.c
index 6bd99c477b231ddb68a4a4c2de4a38079cd421f9..b6ad7cdb40056a0fe59c0afe62289017183f672c 100644 (file)
--- a/hw/net/can/ctucan_core.c
+++ b/hw/net/can/ctucan_core.c
@@ -29,7 +29,7 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "qemu/bitops.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "migration/vmstate.h"
 #include "net/can_emu.h"
 

diff --git a/hw/net/can/ctucan_pci.c b/hw/net/can/ctucan_pci.c
index bed6785433e71cbda3eef51d4e832031558d16ea..ad2b1e60cb46a7bc9000a0f159955da0deb1fc51 100644 (file)
--- a/hw/net/can/ctucan_pci.c
+++ b/hw/net/can/ctucan_pci.c
@@ -29,7 +29,7 @@
 #include "qemu/osdep.h"
 #include "qemu/module.h"
 #include "qapi/error.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/pci/pci_device.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"

diff --git a/hw/net/can/xlnx-versal-canfd.c b/hw/net/can/xlnx-versal-canfd.c
index 5735639b85a68fde5ceb4499c1b065da5544b187..073427955757635a6a9d299f68cb54cdf4362d6a 100644 (file)
--- a/hw/net/can/xlnx-versal-canfd.c
+++ b/hw/net/can/xlnx-versal-canfd.c
@@ -32,7 +32,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/register.h"
 #include "qapi/error.h"
 #include "qemu/log.h"

diff --git a/hw/net/can/xlnx-zynqmp-can.c b/hw/net/can/xlnx-zynqmp-can.c
index ca9edd4a5b8822bf5efcef15a33a1b140bad69e0..a98b208169fe6d68ba506d0586da75de0749070e 100644 (file)
--- a/hw/net/can/xlnx-zynqmp-can.c
+++ b/hw/net/can/xlnx-zynqmp-can.c
@@ -32,7 +32,7 @@
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "hw/register.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "qapi/error.h"
 #include "qemu/bitops.h"
 #include "qemu/log.h"

diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c
index d49032059bb1f3ceb7d2ddfcb95b8d9b1c2584cd..68062481c596197218b0491ebbfdf55471f70016 100644 (file)
--- a/hw/net/dp8393x.c
+++ b/hw/net/dp8393x.c
@@ -18,7 +18,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/net/dp8393x.h"
 #include "hw/sysbus.h"

diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c
index 846f6cbc5d9333f79a45ea457db915e883fef391..6ae8a1e1a3c24d4ca5a8cfef50a13cd667d94d88 100644 (file)
--- a/hw/net/fsl_etsec/etsec.c
+++ b/hw/net/fsl_etsec/etsec.c
@@ -28,7 +28,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/net/mii.h"
 #include "hw/ptimer.h"
 #include "hw/qdev-properties.h"

diff --git a/hw/net/ftgmac100.c b/hw/net/ftgmac100.c
index c41ce889cf16fab10b56f4c3b5bc6d6734447ccb..d5590391b7fc8a1942289f8e97c4bcb0193491a3 100644 (file)
--- a/hw/net/ftgmac100.c
+++ b/hw/net/ftgmac100.c
@@ -12,7 +12,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/net/ftgmac100.h"
 #include "system/dma.h"
 #include "qapi/error.h"

diff --git a/hw/net/i82596.c b/hw/net/i82596.c
index af1abd4996073eae851a2d64281ea0b78dd0c2de..a94cfa2d6df5b4c26f7f59953f3ff6238a290516 100644 (file)
--- a/hw/net/i82596.c
+++ b/hw/net/i82596.c
@@ -40,7 +40,7 @@
 #include "qemu/timer.h"
 #include "net/net.h"
 #include "net/eth.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "system/address-spaces.h"

diff --git a/hw/net/imx_fec.c b/hw/net/imx_fec.c
index e5e34dd1a471a1b62f80a1be65fb248b5338cb10..386d24421cb25827d9bcad8a4ee43b9d4f086e18 100644 (file)
--- a/hw/net/imx_fec.c
+++ b/hw/net/imx_fec.c
@@ -22,7 +22,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/net/imx_fec.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"

diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c
index 3017e129710da44e195cbbf93e48bf72f311f48e..1c9bb4807d235c0f56921f97fe2ea6f6309f0630 100644 (file)
--- a/hw/net/lan9118.c
+++ b/hw/net/lan9118.c
@@ -15,7 +15,7 @@
 #include "migration/vmstate.h"
 #include "net/net.h"
 #include "net/eth.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/net/lan9118_phy.h"
 #include "hw/net/lan9118.h"
 #include "hw/ptimer.h"

diff --git a/hw/net/lan9118_phy.c b/hw/net/lan9118_phy.c
index 4c4e03df115c07701c2d59669332feecfbc15fab..f0f6e55d807875beb2888befdfdabe0d9df058a3 100644 (file)
--- a/hw/net/lan9118_phy.c
+++ b/hw/net/lan9118_phy.c
@@ -15,7 +15,7 @@
 #include "qemu/osdep.h"
 #include "hw/net/lan9118_phy.h"
 #include "hw/net/mii.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/resettable.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"

diff --git a/hw/net/mcf_fec.c b/hw/net/mcf_fec.c
index ae128fa3114589a45658ecef2ef6403c9490e4e5..9cd94369859f358b5616e5bf519d6b671083d656 100644 (file)
--- a/hw/net/mcf_fec.c
+++ b/hw/net/mcf_fec.c
@@ -8,7 +8,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "net/net.h"
 #include "qemu/module.h"
 #include "hw/m68k/mcf.h"

diff --git a/hw/net/msf2-emac.c b/hw/net/msf2-emac.c
index 59045973ab9585181c47df96d03254e91ee74f45..3e279209628497ce35205b1d1fad46f259f41afa 100644 (file)
--- a/hw/net/msf2-emac.c
+++ b/hw/net/msf2-emac.c
@@ -34,7 +34,7 @@
 #include "hw/registerfields.h"
 #include "hw/net/msf2-emac.h"
 #include "hw/net/mii.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 

diff --git a/hw/net/mv88w8618_eth.c b/hw/net/mv88w8618_eth.c
index 6f08846c81cafa6629fb097b3aabdc7513de5bee..68fda83966098bd752a05648290a851404ae59d2 100644 (file)
--- a/hw/net/mv88w8618_eth.c
+++ b/hw/net/mv88w8618_eth.c
@@ -9,7 +9,7 @@
 #include "qapi/error.h"
 #include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/net/mv88w8618_eth.h"
 #include "migration/vmstate.h"
 #include "system/dma.h"

diff --git a/hw/net/ne2000-pci.c b/hw/net/ne2000-pci.c
index ce937e1b618ae894b3fe745198db0766891df0f4..7b215eb1f2e43322ec19851bb4e2cd70f8f38d57 100644 (file)
--- a/hw/net/ne2000-pci.c
+++ b/hw/net/ne2000-pci.c
@@ -23,7 +23,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/pci/pci_device.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"

diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c
index b1923c8c3e1297f4697abc212f7ce0216a3cb275..fea21627f0f74594af47d3af13139304b23a1dd4 100644 (file)
--- a/hw/net/ne2000.c
+++ b/hw/net/ne2000.c
@@ -26,7 +26,7 @@
 #include "net/eth.h"
 #include "qemu/module.h"
 #include "system/memory.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "migration/vmstate.h"
 #include "ne2000.h"
 #include "trace.h"

diff --git a/hw/net/npcm7xx_emc.c b/hw/net/npcm7xx_emc.c
index 9ba35e2c81984f276637880f5038f429b4c698a2..9eb39a6b84696be5d824e86f36e4b9fbee2af29e 100644 (file)
--- a/hw/net/npcm7xx_emc.c
+++ b/hw/net/npcm7xx_emc.c
@@ -31,7 +31,7 @@
 
 #include <zlib.h> /* for crc32 */
 
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-clock.h"
 #include "hw/qdev-properties.h"
 #include "hw/net/npcm7xx_emc.h"

diff --git a/hw/net/opencores_eth.c b/hw/net/opencores_eth.c
index 7e955c01322135f0b529453a306a29f1f8fccb38..85419321d9443c824bc40956dc5f883283bafd4f 100644 (file)
--- a/hw/net/opencores_eth.c
+++ b/hw/net/opencores_eth.c
@@ -32,7 +32,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/net/mii.h"
 #include "hw/qdev-properties.h"
 #include "hw/sysbus.h"

diff --git a/hw/net/pcnet-pci.c b/hw/net/pcnet-pci.c
index 0ca5bc21938d2349a7e13497ad1c0e152403c916..dad5d2ab06db485837f7f2781a63f7e3d296e275 100644 (file)
--- a/hw/net/pcnet-pci.c
+++ b/hw/net/pcnet-pci.c
@@ -28,7 +28,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/pci/pci_device.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"

diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c
index ad675ab29d4d275409bd889ec9990b7c4811d86f..fc2ce5eeb2da73115d12e589243daf8b87099be3 100644 (file)
--- a/hw/net/pcnet.c
+++ b/hw/net/pcnet.c
@@ -37,7 +37,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "net/net.h"

diff --git a/hw/net/pcnet.h b/hw/net/pcnet.h
index a94356ec30b7425cb623d32db450de74fdcdf15a..d12e7cbf9e20ebc31d87185c03a0279ce12f974e 100644 (file)
--- a/hw/net/pcnet.h
+++ b/hw/net/pcnet.h
@@ -8,7 +8,7 @@
 #define PCNET_LOOPTEST_NOCRC    2
 
 #include "system/memory.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 
 /* BUS CONFIGURATION REGISTERS */
 #define BCR_MSRDA    0

diff --git a/hw/net/smc91c111.c b/hw/net/smc91c111.c
index 5cd78e334b667ec17b5e8225aa74bace758c10de..b1c675be6fc39a511d0be4f114106ff43224c854 100644 (file)
--- a/hw/net/smc91c111.c
+++ b/hw/net/smc91c111.c
@@ -11,7 +11,7 @@
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "net/net.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/net/smc91c111.h"
 #include "hw/registerfields.h"
 #include "hw/qdev-properties.h"

diff --git a/hw/net/stellaris_enet.c b/hw/net/stellaris_enet.c
index 2fc51e1e16dd94f832d939b55acd9c357936440b..a05aa8a024c857b8f9e0f087f0677a42b8208ec2 100644 (file)
--- a/hw/net/stellaris_enet.c
+++ b/hw/net/stellaris_enet.c
@@ -8,7 +8,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"

diff --git a/hw/net/tulip.c b/hw/net/tulip.c
index 319af906c8d2acbdd39fa77f7042f3f74fe76fda..5f9df76a74e99e24fa2cd7c7bdb75c91ed060822 100644 (file)
--- a/hw/net/tulip.c
+++ b/hw/net/tulip.c
@@ -8,7 +8,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/pci/pci_device.h"
 #include "hw/qdev-properties.h"
 #include "hw/nvram/eeprom93xx.h"

diff --git a/hw/net/xgmac.c b/hw/net/xgmac.c
index d45f8724673f45cb2661db1410c907eb1906aa76..25768644f58fb1631d96678d00db8fddeb1c87d7 100644 (file)
--- a/hw/net/xgmac.c
+++ b/hw/net/xgmac.c
@@ -25,7 +25,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"

diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c
index 1f5c7480476e2034b2ec0c4bf9938e3d22cff8e5..c7cb257e62de65327a0cfe11ef16724cc17b3218 100644 (file)
--- a/hw/net/xilinx_axienet.c
+++ b/hw/net/xilinx_axienet.c
@@ -31,7 +31,7 @@
 #include "net/net.h"
 #include "net/checksum.h"
 
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/stream.h"
 #include "qom/object.h"

diff --git a/hw/net/xilinx_ethlite.c b/hw/net/xilinx_ethlite.c
index 42b19d07c7644cebe34f36f0a6645bf0ba919afb..0d00e3cc0d99b6e263272791b0ba59a9202ccec0 100644 (file)
--- a/hw/net/xilinx_ethlite.c
+++ b/hw/net/xilinx_ethlite.c
@@ -32,7 +32,7 @@
 #include "qom/object.h"
 #include "qapi/error.h"
 #include "hw/sysbus.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/misc/unimp.h"

diff --git a/hw/nubus/nubus-device.c b/hw/nubus/nubus-device.c
index 0d4d6c0d87543af673f827d5425b36dd9efeb58a..1abd948904492464f48b02afa4af9d752360ccbe 100644 (file)
--- a/hw/nubus/nubus-device.c
+++ b/hw/nubus/nubus-device.c
@@ -11,7 +11,7 @@
 #include "qemu/osdep.h"
 #include "qemu/datadir.h"
 #include "exec/target_page.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/loader.h"
 #include "hw/nubus/nubus.h"
 #include "qapi/error.h"

diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c
index 769107e835e994022bf779025aa3e23cfe3fed60..a42e7b5e271a0f72f0d9afd6b3b6aa8f2b0a8425 100644 (file)
--- a/hw/openrisc/openrisc_sim.c
+++ b/hw/openrisc/openrisc_sim.c
@@ -22,7 +22,7 @@
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "cpu.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/core/boards.h"
 #include "hw/char/serial-mm.h"
 #include "net/net.h"

diff --git a/hw/openrisc/virt.c b/hw/openrisc/virt.c
index 3cfd1c0b5ce2266a76fb688fbc3d8264cc9cfdc4..bc5d27dbdd8d3e897a566ee470aab4d42ec3684b 100644 (file)
--- a/hw/openrisc/virt.c
+++ b/hw/openrisc/virt.c
@@ -12,7 +12,7 @@
 #include "qapi/error.h"
 #include "cpu.h"
 #include "system/address-spaces.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/core/boards.h"
 #include "hw/char/serial-mm.h"
 #include "hw/core/split-irq.h"

diff --git a/hw/pci-host/articia.c b/hw/pci-host/articia.c
index cc65aac2a874a65f01d47d744635f59b6962729d..1881e03d58626dd37d96a02c7f4606accdde1869 100644 (file)
--- a/hw/pci-host/articia.c
+++ b/hw/pci-host/articia.c
@@ -12,7 +12,7 @@
 #include "qapi/error.h"
 #include "hw/pci/pci_device.h"
 #include "hw/pci/pci_host.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/i2c/bitbang_i2c.h"
 #include "hw/intc/i8259.h"
 #include "hw/pci-host/articia.h"

diff --git a/hw/pci-host/aspeed_pcie.c b/hw/pci-host/aspeed_pcie.c
index 1fc2c617727d35c0ea939b677481a00c4a87bbe5..5d837f638c2f64725abfb7af8b6a6d180688c30f 100644 (file)
--- a/hw/pci-host/aspeed_pcie.c
+++ b/hw/pci-host/aspeed_pcie.c
@@ -19,7 +19,7 @@
 #include "qapi/error.h"
 #include "hw/qdev-properties.h"
 #include "hw/registerfields.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/pci/pci_host.h"
 #include "hw/pci/pcie_port.h"
 #include "hw/pci-host/aspeed_pcie.h"

diff --git a/hw/pci-host/astro.c b/hw/pci-host/astro.c
index 1024ede7b68ccd80c59d7113a90a2cae36b3fa07..b54f6ef2d53d1d6b90819d560c776087dfa4da45 100644 (file)
--- a/hw/pci-host/astro.c
+++ b/hw/pci-host/astro.c
@@ -25,7 +25,7 @@
 #include "qemu/module.h"
 #include "qemu/units.h"
 #include "qapi/error.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/pci/pci_device.h"
 #include "hw/pci/pci_bus.h"
 #include "hw/qdev-properties.h"

diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c
index cbda068ef7d41bfc02957362c2a126f0f4601af0..90040045c1f461aefaa0edd69cff770b10c0fefd 100644 (file)
--- a/hw/pci-host/bonito.c
+++ b/hw/pci-host/bonito.c
@@ -43,7 +43,7 @@
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "hw/pci/pci_device.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/mips/mips.h"
 #include "hw/pci-host/bonito.h"
 #include "hw/pci/pci_host.h"

diff --git a/hw/pci-host/designware.c b/hw/pci-host/designware.c
index f6e49ce9b8d2090e42f2d9b4bef633cf027b1515..5a80502abb7cb819729769d26f9b6bb16ea255f8 100644 (file)
--- a/hw/pci-host/designware.c
+++ b/hw/pci-host/designware.c
@@ -28,7 +28,7 @@
 #include "hw/pci/pcie_port.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/pci-host/designware.h"
 
 #define DESIGNWARE_PCIE_PORT_LINK_CONTROL          0x710

diff --git a/hw/pci-host/dino.c b/hw/pci-host/dino.c
index 924053499c164d52f2247fda85bc22188173db24..e6fdb927f5e41cb3581e1fee8620313fe2d31710 100644 (file)
--- a/hw/pci-host/dino.c
+++ b/hw/pci-host/dino.c
@@ -14,7 +14,7 @@
 #include "qemu/module.h"
 #include "qemu/units.h"
 #include "qapi/error.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/pci/pci_device.h"
 #include "hw/pci/pci_bus.h"
 #include "hw/qdev-properties.h"

diff --git a/hw/pci-host/gpex.c b/hw/pci-host/gpex.c
index b806a2286f79c2b2db02a00f44c9ebe2ac77c249..3db4c8c9f05c180dcde2210b2ce1f9139855e962 100644 (file)
--- a/hw/pci-host/gpex.c
+++ b/hw/pci-host/gpex.c
@@ -31,7 +31,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/pci/pci_bus.h"
 #include "hw/pci-host/gpex.h"
 #include "hw/qdev-properties.h"

diff --git a/hw/pci-host/grackle.c b/hw/pci-host/grackle.c
index f9da5a908c19aff0d8a58ff38c29aee5964dbe85..85a4b83228a8570ff417b0c933221003656483cb 100644 (file)
--- a/hw/pci-host/grackle.c
+++ b/hw/pci-host/grackle.c
@@ -26,7 +26,7 @@
 #include "qemu/osdep.h"
 #include "hw/qdev-properties.h"
 #include "hw/pci/pci_device.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "trace.h"

diff --git a/hw/pci-host/gt64120.c b/hw/pci-host/gt64120.c
index b1d96f62fe94039b0b62a1de0d58f1d6e534b156..3e497b5da5b443147643cd88a0b3b0f35a26da8f 100644 (file)
--- a/hw/pci-host/gt64120.c
+++ b/hw/pci-host/gt64120.c
@@ -36,7 +36,7 @@
 #include "hw/misc/empty_slot.h"
 #include "migration/vmstate.h"
 #include "hw/intc/i8259.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "trace.h"
 #include "qom/object.h"
 

diff --git a/hw/pci-host/mv64361.c b/hw/pci-host/mv64361.c
index e05b6770102d070d7e38a6190cf3828b88c208a5..9f080e4825aa07f828c7b82f8cdd98f3d58d44f0 100644 (file)
--- a/hw/pci-host/mv64361.c
+++ b/hw/pci-host/mv64361.c
@@ -14,7 +14,7 @@
 #include "hw/sysbus.h"
 #include "hw/pci/pci_device.h"
 #include "hw/pci/pci_host.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/intc/i8259.h"
 #include "hw/qdev-properties.h"
 #include "system/address-spaces.h"

diff --git a/hw/pci-host/pnv_phb3.c b/hw/pci-host/pnv_phb3.c
index 5d8383fac3041d4e7edc5a35a4ee02b9b1f11148..9808d575509ecf4cfe3becd5145e732796735c24 100644 (file)
--- a/hw/pci-host/pnv_phb3.c
+++ b/hw/pci-host/pnv_phb3.c
@@ -18,7 +18,7 @@
 #include "hw/pci/pcie_port.h"
 #include "hw/ppc/pnv.h"
 #include "hw/ppc/pnv_chip.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "qom/object.h"
 #include "system/system.h"

diff --git a/hw/pci-host/pnv_phb3_msi.c b/hw/pci-host/pnv_phb3_msi.c
index 3a83311faff203fb3be95dae7b8942ecf700a050..f6bf4e323a9c8b54fa286c5c5b94e300d4ae37ae 100644 (file)
--- a/hw/pci-host/pnv_phb3_msi.c
+++ b/hw/pci-host/pnv_phb3_msi.c
@@ -13,7 +13,7 @@
 #include "hw/pci-host/pnv_phb3.h"
 #include "hw/ppc/pnv.h"
 #include "hw/pci/msi.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "system/reset.h"
 

diff --git a/hw/pci-host/pnv_phb4.c b/hw/pci-host/pnv_phb4.c
index 18992054e831c3fbbb8f140722d85584e2b6a1df..9f17fc1bb413e6460c5401f7d04459b419d599dd 100644 (file)
--- a/hw/pci-host/pnv_phb4.c
+++ b/hw/pci-host/pnv_phb4.c
@@ -18,7 +18,7 @@
 #include "hw/pci/pcie_port.h"
 #include "hw/ppc/pnv.h"
 #include "hw/ppc/pnv_xscom.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "qom/object.h"
 #include "trace.h"

diff --git a/hw/pci-host/ppc440_pcix.c b/hw/pci-host/ppc440_pcix.c
index 744b85e49cc4f5d1b09caa0eb53a2fe0fa515d2e..3bd15b8c32b0308d511e1f04e111f0662a3176d9 100644 (file)
--- a/hw/pci-host/ppc440_pcix.c
+++ b/hw/pci-host/ppc440_pcix.c
@@ -24,7 +24,7 @@
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "qemu/units.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/pci-host/ppc4xx.h"
 #include "hw/pci/pci_device.h"
 #include "hw/pci/pci_host.h"

diff --git a/hw/pci-host/ppc4xx_pci.c b/hw/pci-host/ppc4xx_pci.c
index 25478176881bdea80129eaa75117f7980017b468..b9a00f5193050bfca55dba8ca8e15e20f61e75b4 100644 (file)
--- a/hw/pci-host/ppc4xx_pci.c
+++ b/hw/pci-host/ppc4xx_pci.c
@@ -23,7 +23,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/pci-host/ppc4xx.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"

diff --git a/hw/pci-host/ppce500.c b/hw/pci-host/ppce500.c
index 975d191ccb8e467474470ad47e51d271f4799e29..a8e172136eb57ebb2434019e18f2a117a647427c 100644 (file)
--- a/hw/pci-host/ppce500.c
+++ b/hw/pci-host/ppce500.c
@@ -15,7 +15,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "hw/pci/pci_device.h"

diff --git a/hw/pci-host/raven.c b/hw/pci-host/raven.c
index 22ad244eb6e48b0706f9df2a30b79fcec86258b2..3032e0d68540bbb086c5a6d2bb1138f3c0fe7976 100644 (file)
--- a/hw/pci-host/raven.c
+++ b/hw/pci-host/raven.c
@@ -32,7 +32,7 @@
 #include "hw/pci/pci_host.h"
 #include "hw/qdev-properties.h"
 #include "hw/intc/i8259.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/or-irq.h"
 #include "qom/object.h"
 

diff --git a/hw/pci-host/sabre.c b/hw/pci-host/sabre.c
index 538624c5079c219c31116fdae2fc1e9564612394..c2f99b76f8008686df6e7043eb978f752eee1bb0 100644 (file)
--- a/hw/pci-host/sabre.c
+++ b/hw/pci-host/sabre.c
@@ -31,7 +31,7 @@
 #include "hw/qdev-properties.h"
 #include "hw/pci/pci_bridge.h"
 #include "hw/pci/pci_bus.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/pci-bridge/simba.h"
 #include "hw/pci-host/sabre.h"
 #include "qapi/error.h"

diff --git a/hw/pci-host/sh_pci.c b/hw/pci-host/sh_pci.c
index 62fb945075f80920d12b268e440c5b30793e6789..87a71c889e42c16880097603c563690eaf01f62d 100644 (file)
--- a/hw/pci-host/sh_pci.c
+++ b/hw/pci-host/sh_pci.c
@@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "hw/sh4/sh.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/pci/pci_device.h"
 #include "hw/pci/pci_host.h"
 #include "qemu/module.h"

diff --git a/hw/pci-host/uninorth.c b/hw/pci-host/uninorth.c
index 194037d6e75282571a7f798b8a8a543fe1913287..7a25f3f39f584b25464881007f21a091ac0bd1fb 100644 (file)
--- a/hw/pci-host/uninorth.c
+++ b/hw/pci-host/uninorth.c
@@ -23,7 +23,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "qemu/module.h"
 #include "hw/pci/pci_device.h"

diff --git a/hw/pci-host/versatile.c b/hw/pci-host/versatile.c
index 8ea26e3ff0047c7c6984deec5899e6e5fef3aaac..40dce72e674e67ac0796e10fc90e82fbb78ce876 100644 (file)
--- a/hw/pci-host/versatile.c
+++ b/hw/pci-host/versatile.c
@@ -11,7 +11,7 @@
 #include "qemu/units.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/pci/pci_device.h"
 #include "hw/pci/pci_bus.h"
 #include "hw/pci/pci_host.h"

diff --git a/hw/pci-host/xilinx-pcie.c b/hw/pci-host/xilinx-pcie.c
index c71492de9e7f64ef265bd4d988d1aaa15216cc9c..ac6e61c83b086e8b1d1746ff18dcb1ed72e20e58 100644 (file)
--- a/hw/pci-host/xilinx-pcie.c
+++ b/hw/pci-host/xilinx-pcie.c
@@ -23,7 +23,7 @@
 #include "qapi/error.h"
 #include "hw/pci/pci_bridge.h"
 #include "hw/qdev-properties.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/pci-host/xilinx-pcie.h"
 
 enum root_cfg_reg {

diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 02a59f355b6412dc7e31ec2739134fae8351d01b..ffeb3fbf7cf9beef41fa4c31028bf666c72bc1d7 100644 (file)
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 #include "qemu/datadir.h"
 #include "qemu/units.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_bridge.h"
 #include "hw/pci/pci_bus.h"

diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index 8842f7f6b8816880c8a7e10240a877c81987078e..eeca31dabb917e6cbd866421296e3dc27d6957a0 100644 (file)
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -49,7 +49,7 @@
 #include "hw/platform-bus.h"
 #include "hw/net/fsl_etsec/etsec.h"
 #include "hw/i2c/i2c.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sd/sdhci.h"
 #include "hw/misc/unimp.h"
 

diff --git a/hw/ppc/pegasos.c b/hw/ppc/pegasos.c
index e7396a729f3120b322f712d00319e1e121027d72..8b5958e7498cf0a7c2024ef2d63341858e8da231 100644 (file)
--- a/hw/ppc/pegasos.c
+++ b/hw/ppc/pegasos.c
@@ -13,7 +13,7 @@
 #include "hw/ppc/ppc.h"
 #include "hw/sysbus.h"
 #include "hw/pci/pci_host.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/or-irq.h"
 #include "hw/pci-host/articia.h"
 #include "hw/pci-host/mv64361.h"

diff --git a/hw/ppc/pnv_chiptod.c b/hw/ppc/pnv_chiptod.c
index f887a18cde8d17b137b5a360a677b8cc425418da..540d5e365f4c29183c5683b2e8808b0a3805e587 100644 (file)
--- a/hw/ppc/pnv_chiptod.c
+++ b/hw/ppc/pnv_chiptod.c
@@ -28,7 +28,7 @@
 #include "qapi/error.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/ppc/fdt.h"
 #include "hw/ppc/ppc.h"

diff --git a/hw/ppc/pnv_i2c.c b/hw/ppc/pnv_i2c.c
index 60de4794917e21855ec65accea46dc427be394d1..213e58b455cab7fc7c33d18b03bf1a1736416db3 100644 (file)
--- a/hw/ppc/pnv_i2c.c
+++ b/hw/ppc/pnv_i2c.c
@@ -11,7 +11,7 @@
 #include "qemu/log.h"
 #include "system/reset.h"
 
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 
 #include "hw/ppc/pnv.h"

diff --git a/hw/ppc/pnv_lpc.c b/hw/ppc/pnv_lpc.c
index f6beba0917dddc97d4fd5ec4c0972edd4b05fb8d..538681bdb32a52bab836c6b9109869c4b3aa6f26 100644 (file)
--- a/hw/ppc/pnv_lpc.c
+++ b/hw/ppc/pnv_lpc.c
@@ -22,7 +22,7 @@
 #include "qapi/error.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/isa/isa.h"
 #include "hw/qdev-properties.h"
 #include "hw/ppc/pnv.h"

diff --git a/hw/ppc/pnv_occ.c b/hw/ppc/pnv_occ.c
index 24b789c191c43d628dac38ce16df09127cdfd750..7e93e6a6b11c6b2e95dfe0ab39a9dba178d62453 100644 (file)
--- a/hw/ppc/pnv_occ.c
+++ b/hw/ppc/pnv_occ.c
@@ -21,7 +21,7 @@
 #include "qapi/error.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/ppc/pnv.h"
 #include "hw/ppc/pnv_chip.h"

diff --git a/hw/ppc/pnv_psi.c b/hw/ppc/pnv_psi.c
index 5d947d8b5203d4c1207884f56b74aa5c4f39dc20..1cea9375c0e43cfeffe6fe47123b74f0dc2d777f 100644 (file)
--- a/hw/ppc/pnv_psi.c
+++ b/hw/ppc/pnv_psi.c
@@ -19,7 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "system/address-spaces.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "target/ppc/cpu.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/ppc/pnv_sbe.c b/hw/ppc/pnv_sbe.c
index 34dc013d47bb31c80b9cd585507a63d5dca06c23..4798e129983b000cdbdc07e46e419779b409a113 100644 (file)
--- a/hw/ppc/pnv_sbe.c
+++ b/hw/ppc/pnv_sbe.c
@@ -21,7 +21,7 @@
 #include "qapi/error.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/ppc/pnv.h"
 #include "hw/ppc/pnv_xscom.h"

diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c
index 3e436c704139eeb70ccdb21cfaa749b1ac46bd08..a512d4fa647875262e7e3d135b6a8abae5798a11 100644 (file)
--- a/hw/ppc/ppc.c
+++ b/hw/ppc/ppc.c
@@ -23,7 +23,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/ppc/ppc.h"
 #include "hw/ppc/ppc_e500.h"
 #include "qemu/timer.h"

diff --git a/hw/ppc/ppc440_uc.c b/hw/ppc/ppc440_uc.c
index 89e3fae08d7a46c576b32ddbd04879aa11263628..fd9203d7e2a979e51fe29f694b6b42010efe025b 100644 (file)
--- a/hw/ppc/ppc440_uc.c
+++ b/hw/ppc/ppc440_uc.c
@@ -12,7 +12,7 @@
 #include "qemu/units.h"
 #include "qapi/error.h"
 #include "qemu/log.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/ppc/ppc4xx.h"
 #include "hw/pci-host/ppc4xx.h"
 #include "hw/qdev-properties.h"

diff --git a/hw/ppc/ppc4xx_sdram.c b/hw/ppc/ppc4xx_sdram.c
index 592769826bde358c3e04830be13df8d63086c592..6cc2a82ac5c613d1010b3a279bbb78b26e5c10d9 100644 (file)
--- a/hw/ppc/ppc4xx_sdram.c
+++ b/hw/ppc/ppc4xx_sdram.c
@@ -35,7 +35,7 @@
 #include "qemu/log.h"
 #include "qemu/error-report.h"
 #include "system/address-spaces.h" /* get_system_memory() */
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/ppc/ppc4xx.h"
 #include "trace.h"

diff --git a/hw/ppc/prep_systemio.c b/hw/ppc/prep_systemio.c
index 41cd923b94aaecc5ad1fb1ab5dc543709e05c5fe..d0e42e8731a0fa56b2078f2fc9127f55f7b3133a 100644 (file)
--- a/hw/ppc/prep_systemio.c
+++ b/hw/ppc/prep_systemio.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/isa/isa.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"

diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c
index 892ddc7f8f7eb74e2779def0cb431704964a4808..b1774e88f2bc8f2be6f522daf1d30a757f48d20e 100644 (file)
--- a/hw/ppc/spapr_events.c
+++ b/hw/ppc/spapr_events.c
@@ -34,7 +34,7 @@
 #include "hw/ppc/spapr.h"
 #include "hw/ppc/spapr_vio.h"
 #include "hw/pci/pci.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/pci-host/spapr.h"
 #include "hw/ppc/spapr_drc.h"
 #include "qemu/help_option.h"

diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c
index fc45a5d5d613e83fcb56c56e92b7a4e76b6d8154..32a2edbe5cc26d50772a28de5a68f20837497aa7 100644 (file)
--- a/hw/ppc/spapr_irq.c
+++ b/hw/ppc/spapr_irq.c
@@ -11,7 +11,7 @@
 #include "qemu/log.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/ppc/spapr.h"
 #include "hw/ppc/spapr_cpu_core.h"
 #include "hw/ppc/spapr_xive.h"

diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index d596a9e38e3ae47cc0b5f8c4161c48939a375988..523edaa7b6c13847a91cffd208a888f87b7e3a9b 100644 (file)
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -25,7 +25,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/pci/pci.h"

diff --git a/hw/riscv/riscv-iommu-sys.c b/hw/riscv/riscv-iommu-sys.c
index e34d00aef64275901cf7b71ce5a8976fddff136e..7d8c6f1c7c6a5740b2d2b935643a0b2f3a375909 100644 (file)
--- a/hw/riscv/riscv-iommu-sys.c
+++ b/hw/riscv/riscv-iommu-sys.c
@@ -17,7 +17,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/pci/pci_bus.h"
 #include "hw/qdev-properties.h"
 #include "hw/sysbus.h"

diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c
index 6839a2635e829270e1d9671ad60aba2e9aebfd2c..00438d2e59698fb01af1587cd4a7b5309a057b15 100644 (file)
--- a/hw/riscv/sifive_u.c
+++ b/hw/riscv/sifive_u.c
@@ -40,7 +40,7 @@
 #include "qapi/error.h"
 #include "qapi/visitor.h"
 #include "hw/core/boards.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/loader.h"
 #include "hw/sysbus.h"
 #include "hw/cpu/cluster.h"

diff --git a/hw/rtc/exynos4210_rtc.c b/hw/rtc/exynos4210_rtc.c
index 624b4f61a858540c90b6ffb4ab14e58ff2595850..a7e17031ca80d338bf646859ecefda3d77f97a76 100644 (file)
--- a/hw/rtc/exynos4210_rtc.c
+++ b/hw/rtc/exynos4210_rtc.c
@@ -34,7 +34,7 @@
 #include "qemu/bcd.h"
 #include "hw/ptimer.h"
 
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 
 #include "hw/arm/exynos4210.h"
 #include "qom/object.h"

diff --git a/hw/rtc/goldfish_rtc.c b/hw/rtc/goldfish_rtc.c
index 78df031cf29a34641c8e7a3b69c97175a33b65d1..67f9eacb22a731e0be553481a2573c212e3811a1 100644 (file)
--- a/hw/rtc/goldfish_rtc.c
+++ b/hw/rtc/goldfish_rtc.c
@@ -22,7 +22,7 @@
 #include "qemu/osdep.h"
 #include "hw/rtc/goldfish_rtc.h"
 #include "migration/vmstate.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "qemu/bitops.h"

diff --git a/hw/rtc/ls7a_rtc.c b/hw/rtc/ls7a_rtc.c
index 10097b2db75a5ae46cb430d785104dd8818fbd0b..234a7e9769804768c0f00566872f8e14339d2c93 100644 (file)
--- a/hw/rtc/ls7a_rtc.c
+++ b/hw/rtc/ls7a_rtc.c
@@ -7,7 +7,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/register.h"
 #include "qemu/timer.h"
 #include "system/system.h"

diff --git a/hw/rtc/m48t59.c b/hw/rtc/m48t59.c
index 68be2dad6f3c7f0447c85948f9a2b18339c48fee..0be17b3e798f8a0cc4fadb967dcdfccccf099ead 100644 (file)
--- a/hw/rtc/m48t59.c
+++ b/hw/rtc/m48t59.c
@@ -24,7 +24,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/rtc/m48t59.h"
 #include "qemu/timer.h"

diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c
index 8631386b9f092042ad00ff43092dae02bc36aeac..4c4c1c84219e8bb5278e6fc6633b8cefcc611be8 100644 (file)
--- a/hw/rtc/mc146818rtc.c
+++ b/hw/rtc/mc146818rtc.c
@@ -28,7 +28,7 @@
 #include "qemu/bcd.h"
 #include "hw/acpi/acpi_aml_interface.h"
 #include "hw/intc/kvm_irqcount.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "qemu/timer.h"

diff --git a/hw/rtc/pl031.c b/hw/rtc/pl031.c
index e545b9dfd642820552883d4f93edd95ef5875f9e..2ec8ac8add6aa94c5c5de90891cbc56bc38a555e 100644 (file)
--- a/hw/rtc/pl031.c
+++ b/hw/rtc/pl031.c
@@ -14,7 +14,7 @@
 #include "qemu/osdep.h"
 #include "hw/rtc/pl031.h"
 #include "migration/vmstate.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "qemu/timer.h"

diff --git a/hw/rtc/xlnx-zynqmp-rtc.c b/hw/rtc/xlnx-zynqmp-rtc.c
index 500982a8011c21b734403976ed3d02187918e85e..18849340d62ce1f85d702fbe9d6d44de1efbced4 100644 (file)
--- a/hw/rtc/xlnx-zynqmp-rtc.c
+++ b/hw/rtc/xlnx-zynqmp-rtc.c
@@ -30,7 +30,7 @@
 #include "qemu/bitops.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "qemu/cutils.h"
 #include "system/system.h"
 #include "system/rtc.h"

diff --git a/hw/scsi/esp-pci.c b/hw/scsi/esp-pci.c
index 12c86eb7aaa67c44c4239c4a47eefce1842839ac..b31ccdbeccb13fe184faaca5a8a88e73de50c74d 100644 (file)
--- a/hw/scsi/esp-pci.c
+++ b/hw/scsi/esp-pci.c
@@ -25,7 +25,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/pci/pci_device.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/nvram/eeprom93xx.h"
 #include "hw/scsi/esp.h"
 #include "migration/vmstate.h"

diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
index 2809fcdee099c270ff8b18463dcb152a6a132c4c..9da6119be26b1dd78948de82093ac42c677798a9 100644 (file)
--- a/hw/scsi/esp.c
+++ b/hw/scsi/esp.c
@@ -27,7 +27,7 @@
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/scsi/esp.h"
 #include "trace.h"
 #include "qemu/log.h"

diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c
index 9ea4aa0a853a38cb9071d9859b393f7448dac59d..6f43e500b3c618e2d87c2f4ebb4aece5c604a3c7 100644 (file)
--- a/hw/scsi/lsi53c895a.c
+++ b/hw/scsi/lsi53c895a.c
@@ -15,7 +15,7 @@
 
 #include "qemu/osdep.h"
 
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/pci/pci_device.h"
 #include "hw/scsi/scsi.h"
 #include "migration/vmstate.h"

diff --git a/hw/scsi/ncr53c710.c b/hw/scsi/ncr53c710.c
index 47a698349128fa7732b7dcf644e89bfe24b7163f..9931fd4dc7d7fd220afe8aecfcfb8cbb6588d982 100644 (file)
--- a/hw/scsi/ncr53c710.c
+++ b/hw/scsi/ncr53c710.c
@@ -28,7 +28,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/timer.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sysbus.h"
 #include "hw/scsi/scsi.h"
 #include "hw/scsi/ncr53c710.h"

diff --git a/hw/scsi/ncr53c710.h b/hw/scsi/ncr53c710.h
index 6d30f9b6632666b6fa66deeb49780ac58bb6fb60..9ae64a182d5eeb9bf3faad349db767f37de6c519 100644 (file)
--- a/hw/scsi/ncr53c710.h
+++ b/hw/scsi/ncr53c710.h
@@ -21,7 +21,7 @@
 #include "qemu/fifo8.h"
 #include "qom/object.h"
 #include "system/memory.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "qemu/timer.h"
 
 #define TYPE_NCR710_SCSI "ncr710-scsi"

diff --git a/hw/sd/allwinner-sdhost.c b/hw/sd/allwinner-sdhost.c
index 9d61b372e70653cbc6ddb95cfca80cf09c187335..4c039b9520ec8c66843c26b9c5b2f0ad5dacec08 100644 (file)
--- a/hw/sd/allwinner-sdhost.c
+++ b/hw/sd/allwinner-sdhost.c
@@ -25,7 +25,7 @@
 #include "system/blockdev.h"
 #include "system/dma.h"
 #include "hw/qdev-properties.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sd/allwinner-sdhost.h"
 #include "migration/vmstate.h"
 #include "trace.h"

diff --git a/hw/sd/aspeed_sdhci.c b/hw/sd/aspeed_sdhci.c
index f5c0c4956aa1d261c36ddaaebc514f247287f9a3..330e6a19c9afd5789d3cc972324442fed4111066 100644 (file)
--- a/hw/sd/aspeed_sdhci.c
+++ b/hw/sd/aspeed_sdhci.c
@@ -11,7 +11,7 @@
 #include "qemu/error-report.h"
 #include "hw/sd/aspeed_sdhci.h"
 #include "qapi/error.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "migration/vmstate.h"
 #include "hw/qdev-properties.h"
 #include "trace.h"

diff --git a/hw/sd/bcm2835_sdhost.c b/hw/sd/bcm2835_sdhost.c
index f7cef7bb1cdf9d3fe1ac23239d92d4ee6adfe5a0..2736aa14d43b1c600d0ce78140e3e108376d6812 100644 (file)
--- a/hw/sd/bcm2835_sdhost.c
+++ b/hw/sd/bcm2835_sdhost.c
@@ -15,7 +15,7 @@
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "system/blockdev.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sd/bcm2835_sdhost.h"
 #include "migration/vmstate.h"
 #include "trace.h"

diff --git a/hw/sd/omap_mmc.c b/hw/sd/omap_mmc.c
index 5a1d25defaaf59f7ac2d482a761ea6249459f5ff..267b723e3c592c6353c9bc2ecf38c815cea61256 100644 (file)
--- a/hw/sd/omap_mmc.c
+++ b/hw/sd/omap_mmc.c
@@ -22,7 +22,7 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "qapi/error.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sysbus.h"
 #include "hw/arm/omap.h"
 #include "hw/sd/sd.h"

diff --git a/hw/sd/pl181.c b/hw/sd/pl181.c
index 5d56ead4d911e0fc1ef8f3ec96d73b197d808338..761b262d7ba0f9c6fcad278f0206c471d10f299c 100644 (file)
--- a/hw/sd/pl181.c
+++ b/hw/sd/pl181.c
@@ -11,7 +11,7 @@
 #include "system/blockdev.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sd/sd.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 40a75a43ffb8c2a19dcf411c12f58273d407e197..ff45c8e70ca874a0603412fd4f75437779b4bfd3 100644 (file)
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -35,7 +35,7 @@
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 #include "qemu/cutils.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/registerfields.h"
 #include "system/block-backend.h"
 #include "hw/sd/sd.h"

diff --git a/hw/sd/sdhci-pci.c b/hw/sd/sdhci-pci.c
index c18b91fe63c95bbcb6d4fec4b1cbd8d6145e522d..0e38bed49a9d03ad3e9abdfe111fd816a2547e31 100644 (file)
--- a/hw/sd/sdhci-pci.c
+++ b/hw/sd/sdhci-pci.c
@@ -18,7 +18,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/module.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/sd/sdhci.h"
 #include "sdhci-internal.h"

diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index 89b595ce4a5a7a34e15d3c1d1ac8b9d58534b166..39185f0a9873f9de3c0970b95ff3e35b6fae2fb9 100644 (file)
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -28,7 +28,7 @@
 #include "qemu/units.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "system/dma.h"
 #include "qemu/timer.h"

diff --git a/hw/sensor/adm1266.c b/hw/sensor/adm1266.c
index 9017ce6116c618b01e31d30b407bd50317b3a1b9..37d1cffd57a9d1641ed4c2d3bb165045ea4b402b 100644 (file)
--- a/hw/sensor/adm1266.c
+++ b/hw/sensor/adm1266.c
@@ -11,7 +11,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/i2c/pmbus_device.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"

diff --git a/hw/sensor/adm1272.c b/hw/sensor/adm1272.c
index 0c739aa0d857f326cd0883699934b467fe65e39e..0aa2a8655683592987c543bfdc739ff702561b04 100644 (file)
--- a/hw/sensor/adm1272.c
+++ b/hw/sensor/adm1272.c
@@ -9,7 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/i2c/pmbus_device.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"

diff --git a/hw/sensor/max31785.c b/hw/sensor/max31785.c
index c75581455a274d9c5da64e1aa774bd2cfdc98f5e..468858a60e462065e9158e3563cd76b47b6ec88f 100644 (file)
--- a/hw/sensor/max31785.c
+++ b/hw/sensor/max31785.c
@@ -10,7 +10,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/i2c/pmbus_device.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"

diff --git a/hw/sensor/max34451.c b/hw/sensor/max34451.c
index a369d2b5319f27ecbb6eff10fc491cc87c024cae..4d64434f3af4b148c862f6122e043094adb3823d 100644 (file)
--- a/hw/sensor/max34451.c
+++ b/hw/sensor/max34451.c
@@ -8,7 +8,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/i2c/pmbus_device.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"

diff --git a/hw/sensor/tmp105.c b/hw/sensor/tmp105.c
index f5b61109e36736638da3a4898ba4a667a53e7727..4e5c968bcc744ec8c8875391e2b483e493b7fbd2 100644 (file)
--- a/hw/sensor/tmp105.c
+++ b/hw/sensor/tmp105.c
@@ -20,7 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/i2c/i2c.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "migration/vmstate.h"
 #include "hw/sensor/tmp105.h"
 #include "qapi/error.h"

diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
index bccd40f5712de045b30494b1837b80a2797cde2a..5352f23ae82e647aa242da8be45387e71767bc27 100644 (file)
--- a/hw/sh4/r2d.c
+++ b/hw/sh4/r2d.c
@@ -39,7 +39,7 @@
 #include "net/net.h"
 #include "sh7750_regs.h"
 #include "hw/ide/mmio.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/loader.h"
 #include "hw/usb/usb.h"
 #include "hw/block/flash.h"

diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c
index 300eabc595d167908a3ae35a2e9b8e495a97fe01..6cb42e34412d5ef10a4d3e7c878ce65aabe14fec 100644 (file)
--- a/hw/sh4/sh7750.c
+++ b/hw/sh4/sh7750.c
@@ -26,7 +26,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "hw/sysbus.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sh4/sh.h"
 #include "system/system.h"
 #include "target/sh4/cpu.h"

diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c
index 367beecf192c1f80a1cf3e6693668138d7ae8147..500b63bc9b78e71ca5fd341ff969dca7b18b17a3 100644 (file)
--- a/hw/sparc/leon3.c
+++ b/hw/sparc/leon3.c
@@ -30,7 +30,7 @@
 #include "qapi/error.h"
 #include "qemu/datadir.h"
 #include "cpu.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "qemu/timer.h"
 #include "hw/ptimer.h"
 #include "hw/qdev-properties.h"

diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index b0d2d6f8bc8cf7c1932a8dba27c3c64b5def8f9e..fa5592f26cb3949bb29fe61b542f7ed3f1f48c3d 100644 (file)
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -49,7 +49,7 @@
 #include "hw/char/escc.h"
 #include "hw/misc/empty_slot.h"
 #include "hw/misc/unimp.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/or-irq.h"
 #include "hw/loader.h"
 #include "elf.h"

diff --git a/hw/sparc/sun4m_iommu.c b/hw/sparc/sun4m_iommu.c
index a7ff36ee78c1d6295efea6499dffc2a481022167..9ce2e3b7fc805a87aa4750d586fbee25d77614bd 100644 (file)
--- a/hw/sparc/sun4m_iommu.c
+++ b/hw/sparc/sun4m_iommu.c
@@ -23,7 +23,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/sparc/sun4m_iommu.h"
 #include "hw/sysbus.h"

diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
index 62ceb7eef4d7a24f2882020151483e42985404df..5b25ba81cc8100e49ce74d62fe11f9b6d2627fb5 100644 (file)
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -29,7 +29,7 @@
 #include "qemu/datadir.h"
 #include "cpu.h"
 #include "exec/target_page.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_bridge.h"
 #include "hw/pci/pci_host.h"

diff --git a/hw/ssi/allwinner-a10-spi.c b/hw/ssi/allwinner-a10-spi.c
index 6b7cca8d32a1a7c597af9ec48d6c9e5bc4bfcdd1..69920b935afc76f3cd14479e303c37b97a8b41a0 100644 (file)
--- a/hw/ssi/allwinner-a10-spi.c
+++ b/hw/ssi/allwinner-a10-spi.c
@@ -20,7 +20,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/ssi/allwinner-a10-spi.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"

diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c
index e33496f502987781f998927c16e53a7441e5275b..9819904a4ad4667524135d1e3d692a8d1e0d7872 100644 (file)
--- a/hw/ssi/aspeed_smc.c
+++ b/hw/ssi/aspeed_smc.c
@@ -33,7 +33,7 @@
 #include "qemu/units.h"
 #include "trace.h"
 
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/ssi/aspeed_smc.h"
 

diff --git a/hw/ssi/bcm2835_spi.c b/hw/ssi/bcm2835_spi.c
index bf8ba35e04c3d6220529ccee346abde7b72c13da..01763c458c1c03c286e584d9d97812d5102f19c3 100644 (file)
--- a/hw/ssi/bcm2835_spi.c
+++ b/hw/ssi/bcm2835_spi.c
@@ -26,7 +26,7 @@
 #include "qemu/log.h"
 #include "qemu/fifo8.h"
 #include "hw/ssi/bcm2835_spi.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "migration/vmstate.h"
 
 static void bcm2835_spi_update_int(BCM2835SPIState *s)

diff --git a/hw/ssi/ibex_spi_host.c b/hw/ssi/ibex_spi_host.c
index f05be6874837645aafaceab17d788ee176ed69d3..63f4cce51291e707049a4a4c45b67991b29adec8 100644 (file)
--- a/hw/ssi/ibex_spi_host.c
+++ b/hw/ssi/ibex_spi_host.c
@@ -28,7 +28,7 @@
 #include "qemu/module.h"
 #include "hw/registerfields.h"
 #include "hw/ssi/ibex_spi_host.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "migration/vmstate.h"

diff --git a/hw/ssi/imx_spi.c b/hw/ssi/imx_spi.c
index 1312f588d2ed81d44ff2c3314b0e13e49c023ec7..8e014b7a7bbdfabe112e7ce3d1de2444864eaa35 100644 (file)
--- a/hw/ssi/imx_spi.c
+++ b/hw/ssi/imx_spi.c
@@ -9,7 +9,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/ssi/imx_spi.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"

diff --git a/hw/ssi/mss-spi.c b/hw/ssi/mss-spi.c
index fd7ba7eeb041113c69a1358fc4d702aa61bfbdcc..3c118fc0f8ca5384101b3cfe7afa3fdaed3cdefd 100644 (file)
--- a/hw/ssi/mss-spi.c
+++ b/hw/ssi/mss-spi.c
@@ -24,7 +24,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/ssi/mss-spi.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"

diff --git a/hw/ssi/npcm7xx_fiu.c b/hw/ssi/npcm7xx_fiu.c
index 056ce13394f7e12657217069b35c40a1245fa078..bc5e4e20ccd7324846fb5d6e3d6e0de99a56d3dd 100644 (file)
--- a/hw/ssi/npcm7xx_fiu.c
+++ b/hw/ssi/npcm7xx_fiu.c
@@ -16,7 +16,7 @@
 
 #include "qemu/osdep.h"
 
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/ssi/npcm7xx_fiu.h"
 #include "migration/vmstate.h"

diff --git a/hw/ssi/npcm_pspi.c b/hw/ssi/npcm_pspi.c
index a31dcc050e817f4ee4f21daa63c906a3b14b8540..1f11e1f8a46ac0d2fdba706409bc8820306458fe 100644 (file)
--- a/hw/ssi/npcm_pspi.c
+++ b/hw/ssi/npcm_pspi.c
@@ -16,7 +16,7 @@
 
 #include "qemu/osdep.h"
 
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/registerfields.h"
 #include "hw/ssi/npcm_pspi.h"
 #include "migration/vmstate.h"

diff --git a/hw/ssi/pl022.c b/hw/ssi/pl022.c
index 1dc0bcbcc047137d1ade21e3479dc5d2e795644d..1851118d55fc0805fba157cacbd3486b385a34e2 100644 (file)
--- a/hw/ssi/pl022.c
+++ b/hw/ssi/pl022.c
@@ -10,7 +10,7 @@
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/ssi/pl022.h"
 #include "hw/ssi/ssi.h"
 #include "qemu/log.h"

diff --git a/hw/ssi/pnv_spi.c b/hw/ssi/pnv_spi.c
index f40e8836b9ce40073b5ba3e3de490f3c456e2fb3..e59386712b42f1f743cdc28e5f4527c522640f5e 100644 (file)
--- a/hw/ssi/pnv_spi.c
+++ b/hw/ssi/pnv_spi.c
@@ -14,7 +14,7 @@
 #include "hw/ssi/pnv_spi_regs.h"
 #include "hw/ssi/ssi.h"
 #include <libfdt.h>
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "trace.h"
 
 #define PNV_SPI_OPCODE_LO_NIBBLE(x) (x & 0x0F)

diff --git a/hw/ssi/sifive_spi.c b/hw/ssi/sifive_spi.c
index 3e01fef61cdb7c226d0680c96df6c55dad12c1ae..c66fae80a9c69cd728fed2d14d4f9598871b32d5 100644 (file)
--- a/hw/ssi/sifive_spi.c
+++ b/hw/ssi/sifive_spi.c
@@ -20,7 +20,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "hw/ssi/ssi.h"

diff --git a/hw/ssi/xilinx_spi.c b/hw/ssi/xilinx_spi.c
index 4144c8a6270480ebd9801b006fa8caf1ab7193e1..9e8656b5560b4f5da859b5ba307870777994cf54 100644 (file)
--- a/hw/ssi/xilinx_spi.c
+++ b/hw/ssi/xilinx_spi.c
@@ -31,7 +31,7 @@
 #include "qemu/module.h"
 #include "qemu/fifo8.h"
 
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "hw/ssi/ssi.h"

diff --git a/hw/ssi/xilinx_spips.c b/hw/ssi/xilinx_spips.c
index a79f3b8e49406fe2c517e780568eba672a1f7e83..b2f66275182521c01cd667bf24c408e345f53e4e 100644 (file)
--- a/hw/ssi/xilinx_spips.c
+++ b/hw/ssi/xilinx_spips.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/ptimer.h"
 #include "hw/qdev-properties.h"
 #include "qemu/log.h"

diff --git a/hw/ssi/xlnx-versal-ospi.c b/hw/ssi/xlnx-versal-ospi.c
index 56d51ce0e30cb8c302cda6b8cf30972bbd0b8e11..88fafb5a2ed1b635f4f786ed74252561a7e544e2 100644 (file)
--- a/hw/ssi/xlnx-versal-ospi.c
+++ b/hw/ssi/xlnx-versal-ospi.c
@@ -28,7 +28,7 @@
 #include "hw/qdev-properties.h"
 #include "qemu/bitops.h"
 #include "qemu/log.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/ssi/xlnx-versal-ospi.h"
 
 #ifndef XILINX_VERSAL_OSPI_ERR_DEBUG

diff --git a/hw/timer/a9gtimer.c b/hw/timer/a9gtimer.c
index 690140f5a6cfc8a38f11c97521bfe3216e74d9c3..a0b73fb731156e6570573cd06de2363312ecca09 100644 (file)
--- a/hw/timer/a9gtimer.c
+++ b/hw/timer/a9gtimer.c
@@ -22,7 +22,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/hw.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/timer/a9gtimer.h"
 #include "migration/vmstate.h"

diff --git a/hw/timer/allwinner-a10-pit.c b/hw/timer/allwinner-a10-pit.c
index e4c353273a166ad9312a0178eed3db39e2644799..6c0d3b556a218cfcf2aa6e602d4ead98adab0f58 100644 (file)
--- a/hw/timer/allwinner-a10-pit.c
+++ b/hw/timer/allwinner-a10-pit.c
@@ -16,7 +16,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "hw/timer/allwinner-a10-pit.h"

diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c
index 7cc5915e9ec498e2b37dad884e1abcd0e09163a7..ac6313039a80c0063a104c952956a6ba23dd1575 100644 (file)
--- a/hw/timer/arm_mptimer.c
+++ b/hw/timer/arm_mptimer.c
@@ -21,7 +21,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/hw.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/ptimer.h"
 #include "hw/qdev-properties.h"
 #include "hw/timer/arm_mptimer.h"

diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c
index 56638ff5cdc99e5d99307239273c2ee90e212901..e5ef28de6f7e00ac487dbff36b73386247f1db38 100644 (file)
--- a/hw/timer/arm_timer.c
+++ b/hw/timer/arm_timer.c
@@ -11,7 +11,7 @@
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/timer.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/ptimer.h"
 #include "hw/qdev-properties.h"
 #include "qemu/module.h"

diff --git a/hw/timer/armv7m_systick.c b/hw/timer/armv7m_systick.c
index 7e4ddcd4058b919579c37f7e14c1c17d90c7300b..c9e0f4c2e1703f9aba805efc1902831b87d940d9 100644 (file)
--- a/hw/timer/armv7m_systick.c
+++ b/hw/timer/armv7m_systick.c
@@ -12,7 +12,7 @@
 #include "qemu/osdep.h"
 #include "hw/timer/armv7m_systick.h"
 #include "migration/vmstate.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sysbus.h"
 #include "hw/qdev-clock.h"
 #include "qemu/timer.h"

diff --git a/hw/timer/aspeed_timer.c b/hw/timer/aspeed_timer.c
index 57db03512f4700896720c8758ee0a640d925e65a..b08a737bc975cfc3d96769b57959b6832345bc11 100644 (file)
--- a/hw/timer/aspeed_timer.c
+++ b/hw/timer/aspeed_timer.c
@@ -11,7 +11,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sysbus.h"
 #include "hw/timer/aspeed_timer.h"
 #include "migration/vmstate.h"

diff --git a/hw/timer/avr_timer16.c b/hw/timer/avr_timer16.c
index 012d8290018802f3a128dcb2a278e6baed5f32d8..0f1fda4218f61a715d93d63b78942c6da8bbb124 100644 (file)
--- a/hw/timer/avr_timer16.c
+++ b/hw/timer/avr_timer16.c
@@ -34,7 +34,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/log.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/timer/avr_timer16.h"
 #include "trace.h"

diff --git a/hw/timer/cadence_ttc.c b/hw/timer/cadence_ttc.c
index 9c7ba168768f89688fda94ee696e23f0ed5206da..6f02c6a02d999d258fef7790f2d1eba54f8f2f1f 100644 (file)
--- a/hw/timer/cadence_ttc.c
+++ b/hw/timer/cadence_ttc.c
@@ -17,7 +17,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"

diff --git a/hw/timer/cmsdk-apb-dualtimer.c b/hw/timer/cmsdk-apb-dualtimer.c
index 34c550a3f9843996662cf2a02c2b35cb352a9efc..57fea11a8552dd26f35ea858828c38a73c55c1e0 100644 (file)
--- a/hw/timer/cmsdk-apb-dualtimer.c
+++ b/hw/timer/cmsdk-apb-dualtimer.c
@@ -22,7 +22,7 @@
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "hw/sysbus.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/registerfields.h"
 #include "hw/qdev-clock.h"

diff --git a/hw/timer/cmsdk-apb-timer.c b/hw/timer/cmsdk-apb-timer.c
index 4095267b4aaaf4bdf76c05e54e27783f986b7d04..8b7595731cc388c77ad8903ed96cf3f772af8909 100644 (file)
--- a/hw/timer/cmsdk-apb-timer.c
+++ b/hw/timer/cmsdk-apb-timer.c
@@ -33,7 +33,7 @@
 #include "qapi/error.h"
 #include "trace.h"
 #include "hw/sysbus.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/registerfields.h"
 #include "hw/qdev-clock.h"
 #include "hw/timer/cmsdk-apb-timer.h"

diff --git a/hw/timer/exynos4210_mct.c b/hw/timer/exynos4210_mct.c
index bb0f9c8b9a60194895585c8863f3f83cc1d18de3..06524efca272a5e85634dcfe1013f26449635785 100644 (file)
--- a/hw/timer/exynos4210_mct.c
+++ b/hw/timer/exynos4210_mct.c
@@ -61,7 +61,7 @@
 #include "hw/ptimer.h"
 
 #include "hw/arm/exynos4210.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "qom/object.h"
 
 //#define DEBUG_MCT

diff --git a/hw/timer/exynos4210_pwm.c b/hw/timer/exynos4210_pwm.c
index 69f737a8e6f73486a55cde90fca4eb2ac7d28700..dc76932fdfbb3e190fc6dbe620b499063f607ded 100644 (file)
--- a/hw/timer/exynos4210_pwm.c
+++ b/hw/timer/exynos4210_pwm.c
@@ -29,7 +29,7 @@
 #include "hw/ptimer.h"
 
 #include "hw/arm/exynos4210.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "qom/object.h"
 
 //#define DEBUG_PWM

diff --git a/hw/timer/grlib_gptimer.c b/hw/timer/grlib_gptimer.c
index 0e06fa09e995a6581668f71d0379ab7b5ea2efb6..6218c255d2c6d9041188d08a56e678882f312f08 100644 (file)
--- a/hw/timer/grlib_gptimer.c
+++ b/hw/timer/grlib_gptimer.c
@@ -28,7 +28,7 @@
 #include "hw/timer/grlib_gptimer.h"
 #include "hw/sysbus.h"
 #include "qemu/timer.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/ptimer.h"
 #include "hw/qdev-properties.h"
 #include "qemu/module.h"

diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c
index 1acba4fa9db08e638535fb11a77362018b315472..1387c417ae1ebd4f367d64d863ef84efad14e0d1 100644 (file)
--- a/hw/timer/hpet.c
+++ b/hw/timer/hpet.c
@@ -25,7 +25,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "qemu/timer.h"

diff --git a/hw/timer/i8254.c b/hw/timer/i8254.c
index 7033ebf50da405d0429ca30ef1663670eb91c881..1a8b6bf9abe54632011ba7fd37fc6d2400bfbbe8 100644 (file)
--- a/hw/timer/i8254.c
+++ b/hw/timer/i8254.c
@@ -23,7 +23,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "qemu/module.h"
 #include "qemu/timer.h"
 #include "hw/timer/i8254.h"

diff --git a/hw/timer/ibex_timer.c b/hw/timer/ibex_timer.c
index c7320ef30fabea5967043773a99e82c22523b987..d2c4f86e038c3d98deced87fcd33ae3386b98b31 100644 (file)
--- a/hw/timer/ibex_timer.c
+++ b/hw/timer/ibex_timer.c
@@ -29,7 +29,7 @@
 #include "qemu/log.h"
 #include "qemu/timer.h"
 #include "hw/timer/ibex_timer.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "target/riscv/cpu.h"
 #include "migration/vmstate.h"

diff --git a/hw/timer/imx_epit.c b/hw/timer/imx_epit.c
index 6123321c352122e14002d1210bb9450422c6a89b..c67a39f10cc8e263f5537285e079a4b7d69a52a0 100644 (file)
--- a/hw/timer/imx_epit.c
+++ b/hw/timer/imx_epit.c
@@ -16,7 +16,7 @@
 #include "qemu/osdep.h"
 #include "hw/timer/imx_epit.h"
 #include "migration/vmstate.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/misc/imx_ccm.h"
 #include "qemu/module.h"
 #include "qemu/log.h"

diff --git a/hw/timer/imx_gpt.c b/hw/timer/imx_gpt.c
index 8c7cbfdeac33b57e8588542e19452ff40ada4e29..168cadcb3f9a5a9106ab3cf2cd87bf018ccd69c7 100644 (file)
--- a/hw/timer/imx_gpt.c
+++ b/hw/timer/imx_gpt.c
@@ -13,7 +13,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/timer/imx_gpt.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"

diff --git a/hw/timer/mss-timer.c b/hw/timer/mss-timer.c
index 2ce821178b627baf85a1300da5fa54fa3fe47bca..946e87c99a63fbe63857f535e14fdb1d3165b2e8 100644 (file)
--- a/hw/timer/mss-timer.c
+++ b/hw/timer/mss-timer.c
@@ -26,7 +26,7 @@
 #include "qemu/osdep.h"
 #include "qemu/module.h"
 #include "qemu/log.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/timer/mss-timer.h"
 #include "migration/vmstate.h"

diff --git a/hw/timer/npcm7xx_timer.c b/hw/timer/npcm7xx_timer.c
index 6a116ad54b732e5b0ef026aa3ad1853402ae4091..e09e4ee03ad6e50f7c447d0f37112dc9f2ae45fd 100644 (file)
--- a/hw/timer/npcm7xx_timer.c
+++ b/hw/timer/npcm7xx_timer.c
@@ -16,7 +16,7 @@
 
 #include "qemu/osdep.h"
 
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-clock.h"
 #include "hw/qdev-properties.h"
 #include "hw/timer/npcm7xx_timer.h"

diff --git a/hw/timer/nrf51_timer.c b/hw/timer/nrf51_timer.c
index e228fdebc344fd815c3fbd3ab9f9682f511d0571..0688f49eefb9ff760e255d163f1f952bd950f3c1 100644 (file)
--- a/hw/timer/nrf51_timer.c
+++ b/hw/timer/nrf51_timer.c
@@ -15,7 +15,7 @@
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "hw/arm/nrf51.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/timer/nrf51_timer.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"

diff --git a/hw/timer/pxa2xx_timer.c b/hw/timer/pxa2xx_timer.c
index 6d4ac31574e594536c6489229e37b0555ef8ed96..d18d98b23374e37e384ab9f51fe30f0368c700ae 100644 (file)
--- a/hw/timer/pxa2xx_timer.c
+++ b/hw/timer/pxa2xx_timer.c
@@ -8,7 +8,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "qemu/timer.h"
 #include "system/runstate.h"

diff --git a/hw/timer/renesas_cmt.c b/hw/timer/renesas_cmt.c
index cdff7f47f16c98acc92c9652c83a066272a44d2e..c62dad690ff5f51b61a207357aec61ff4e626b42 100644 (file)
--- a/hw/timer/renesas_cmt.c
+++ b/hw/timer/renesas_cmt.c
@@ -23,7 +23,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/registerfields.h"
 #include "hw/qdev-properties.h"
 #include "hw/timer/renesas_cmt.h"

diff --git a/hw/timer/renesas_tmr.c b/hw/timer/renesas_tmr.c
index 95707f2b8c517de1046f628f62d1df8a9ec490ae..1fc539e9497ba6a686d593fa35ac4446271d65df 100644 (file)
--- a/hw/timer/renesas_tmr.c
+++ b/hw/timer/renesas_tmr.c
@@ -23,7 +23,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/registerfields.h"
 #include "hw/qdev-properties.h"
 #include "hw/timer/renesas_tmr.h"

diff --git a/hw/timer/sh_timer.c b/hw/timer/sh_timer.c
index d4fa32c9d655ef76d3ad535a611d6a14ac335b5c..adc05715528964481252f9110c4810783f2c9e03 100644 (file)
--- a/hw/timer/sh_timer.c
+++ b/hw/timer/sh_timer.c
@@ -11,7 +11,7 @@
 #include "qemu/osdep.h"
 #include "system/memory.h"
 #include "qemu/log.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sh4/sh.h"
 #include "hw/timer/tmu012.h"
 #include "hw/ptimer.h"

diff --git a/hw/timer/sifive_pwm.c b/hw/timer/sifive_pwm.c
index e85e389f7a58aff2f20c55729c24c9ed8677e0e7..f1882ae6bc111ca5d0c068e4be70331f4837939f 100644 (file)
--- a/hw/timer/sifive_pwm.c
+++ b/hw/timer/sifive_pwm.c
@@ -26,7 +26,7 @@
 
 #include "qemu/osdep.h"
 #include "trace.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/timer/sifive_pwm.h"
 #include "hw/qdev-properties.h"
 #include "hw/registerfields.h"

diff --git a/hw/timer/slavio_timer.c b/hw/timer/slavio_timer.c
index 3e071fbdb4c320f8353e5f7a0ed4b7c2e9dc708f..5bf94157ca4888f66deff42a0907870a852fff0b 100644 (file)
--- a/hw/timer/slavio_timer.c
+++ b/hw/timer/slavio_timer.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/timer.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/ptimer.h"
 #include "hw/qdev-properties.h"
 #include "hw/sysbus.h"

diff --git a/hw/timer/sse-timer.c b/hw/timer/sse-timer.c
index c5fd038162b74bec13ec0760d3a48706fc1b34da..fc48179d25d9870bf27de23cfa2f5021707b2689 100644 (file)
--- a/hw/timer/sse-timer.c
+++ b/hw/timer/sse-timer.c
@@ -41,7 +41,7 @@
 #include "hw/timer/sse-timer.h"
 #include "hw/timer/sse-counter.h"
 #include "hw/sysbus.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/registerfields.h"
 #include "hw/core/clock.h"
 #include "hw/qdev-clock.h"

diff --git a/hw/timer/stm32f2xx_timer.c b/hw/timer/stm32f2xx_timer.c
index be844e7f5a35ec50e5ac5e000738fa21187eff31..979b6ad5bae7d69eaee4f564965970b305b42273 100644 (file)
--- a/hw/timer/stm32f2xx_timer.c
+++ b/hw/timer/stm32f2xx_timer.c
@@ -23,7 +23,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/timer/stm32f2xx_timer.h"
 #include "migration/vmstate.h"

diff --git a/hw/timer/xilinx_timer.c b/hw/timer/xilinx_timer.c
index ff4a224d08f3be93af07049572c9021f3607fa1d..c1b6d2bdf2de22fa833937bba118d7a397ebec5e 100644 (file)
--- a/hw/timer/xilinx_timer.c
+++ b/hw/timer/xilinx_timer.c
@@ -28,7 +28,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "hw/sysbus.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/ptimer.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"

diff --git a/hw/tpm/tpm_tis_common.c b/hw/tpm/tpm_tis_common.c
index cdd0df11374e22173ec77b6bc933ddae85a570d8..1615be29339f43ecce240ae72f1b3cdbfd3e9646 100644 (file)
--- a/hw/tpm/tpm_tis_common.c
+++ b/hw/tpm/tpm_tis_common.c
@@ -23,7 +23,7 @@
  * TPM Profile (PTP) Specification, Family 2.0, Revision 00.43
  */
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/isa/isa.h"
 #include "qapi/error.h"
 #include "qemu/bswap.h"

diff --git a/hw/ufs/ufs.c b/hw/ufs/ufs.c
index 0577747f469ee49fc4f86bd4a9b59c015df36830..cab42ae7b65aeae6a8102bcb4c778ec90d74775c 100644 (file)
--- a/hw/ufs/ufs.c
+++ b/hw/ufs/ufs.c
@@ -25,7 +25,7 @@
 #include "qapi/error.h"
 #include "migration/vmstate.h"
 #include "scsi/constants.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "trace.h"
 #include "ufs.h"
 

diff --git a/hw/usb/hcd-dwc2.h b/hw/usb/hcd-dwc2.h
index 0c02392ade093aa1153f3189c2db2a612769b117..a99409a654b1899a8d3e643a3a648dfb64589f2a 100644 (file)
--- a/hw/usb/hcd-dwc2.h
+++ b/hw/usb/hcd-dwc2.h
@@ -20,7 +20,7 @@
 #define HW_USB_HCD_DWC2_H
 
 #include "qemu/timer.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sysbus.h"
 #include "hw/usb/usb.h"
 #include "system/dma.h"

diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c
index b090f253656ba17c7c6b3b805235a9360334baf5..57f930b09988c06c065f2117e25f08e239b117de 100644 (file)
--- a/hw/usb/hcd-ehci.c
+++ b/hw/usb/hcd-ehci.c
@@ -28,7 +28,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/usb/ehci-regs.h"
 #include "hw/usb/hcd-ehci.h"
 #include "migration/vmstate.h"

diff --git a/hw/usb/hcd-ohci-sysbus.c b/hw/usb/hcd-ohci-sysbus.c
index 2d3c770b1178946876956e8216dfd917926003d8..5c3434153dbe89f78ec89f27fce5b68151cc1ce9 100644 (file)
--- a/hw/usb/hcd-ohci-sysbus.c
+++ b/hw/usb/hcd-ohci-sysbus.c
@@ -19,7 +19,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "qemu/timer.h"

diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c
index c48f07f7e3987c66887c57f26dcdec2dfe32f275..ea3d5d2bd14689bab1215cd8c8067d3136e76275 100644 (file)
--- a/hw/usb/hcd-ohci.c
+++ b/hw/usb/hcd-ohci.c
@@ -26,7 +26,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "qemu/timer.h"

diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c
index 124ac4faec01e43226248dcc02b427ac5250e476..c243a4f42cc12c0b2f2d9c2ebad81f133f52a167 100644 (file)
--- a/hw/usb/hcd-uhci.c
+++ b/hw/usb/hcd-uhci.c
@@ -31,7 +31,7 @@
 #include "hw/usb/uhci-regs.h"
 #include "migration/vmstate.h"
 #include "hw/pci/pci.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "qapi/error.h"
 #include "qemu/timer.h"

diff --git a/hw/usb/hcd-xhci-sysbus.c b/hw/usb/hcd-xhci-sysbus.c
index 244698e5f2b97e3a0fd723edb69ca7d501900b61..862673054a09f3c43c9a1fcab6a6bc4f535e64ca 100644 (file)
--- a/hw/usb/hcd-xhci-sysbus.c
+++ b/hw/usb/hcd-xhci-sysbus.c
@@ -14,7 +14,7 @@
 #include "qapi/error.h"
 #include "hcd-xhci-sysbus.h"
 #include "hw/acpi/aml-build.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 
 static bool xhci_sysbus_intr_raise(XHCIState *xhci, int n, bool level)
 {

diff --git a/hw/usb/vt82c686-uhci-pci.c b/hw/usb/vt82c686-uhci-pci.c
index 6162806172279ccbed66fb5e704732fbe560f1bf..97c09a51cfc6ba2f482192283ef4b858faa121f8 100644 (file)
--- a/hw/usb/vt82c686-uhci-pci.c
+++ b/hw/usb/vt82c686-uhci-pci.c
@@ -1,5 +1,5 @@
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/isa/vt82c686.h"
 #include "hcd-uhci.h"
 

diff --git a/hw/usb/xlnx-versal-usb2-ctrl-regs.c b/hw/usb/xlnx-versal-usb2-ctrl-regs.c
index 4114672d4f48b24ec4283d97d78a3df1f3986fff..eb946b5dbd9918086e12087822df5b72d0d5bccf 100644 (file)
--- a/hw/usb/xlnx-versal-usb2-ctrl-regs.c
+++ b/hw/usb/xlnx-versal-usb2-ctrl-regs.c
@@ -29,7 +29,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/register.h"
 #include "qemu/bitops.h"
 #include "qom/object.h"

diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c
index c05c00bcd4a7309ee42f58790d8dec70089c2849..d54d70b4fb802b84496a0c62a2247364dd009d78 100644 (file)
--- a/hw/virtio/virtio-mmio.c
+++ b/hw/virtio/virtio-mmio.c
@@ -21,7 +21,7 @@
 
 #include "qemu/osdep.h"
 #include "standard-headers/linux/virtio_mmio.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
 #include "hw/virtio/virtio.h"

diff --git a/hw/vmapple/aes.c b/hw/vmapple/aes.c
index a4853a98f8cd305b4c440a8c5ccec0e1080176f8..a6e94610b85f027cfa2fc1daba248c270fe694eb 100644 (file)
--- a/hw/vmapple/aes.c
+++ b/hw/vmapple/aes.c
@@ -14,7 +14,7 @@
 #include "crypto/hash.h"
 #include "crypto/aes.h"
 #include "crypto/cipher.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sysbus.h"
 #include "hw/vmapple/vmapple.h"
 #include "migration/vmstate.h"

diff --git a/hw/vmapple/vmapple.c b/hw/vmapple/vmapple.c
index 5da28cf72b28103bd0e41dc9f98d856f8c2119c3..9154a4c25761fa556d851242e160f27e3963d75f 100644 (file)
--- a/hw/vmapple/vmapple.c
+++ b/hw/vmapple/vmapple.c
@@ -26,7 +26,7 @@
 #include "qemu/units.h"
 #include "monitor/qdev.h"
 #include "hw/core/boards.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/loader.h"
 #include "hw/qdev-properties.h"
 #include "hw/sysbus.h"

diff --git a/hw/watchdog/cmsdk-apb-watchdog.c b/hw/watchdog/cmsdk-apb-watchdog.c
index 6a8d07ca5695708ce11a920350e222abb322b61d..e1a2a33d73ec0a2d92651240bd6f7161b2a9007a 100644 (file)
--- a/hw/watchdog/cmsdk-apb-watchdog.c
+++ b/hw/watchdog/cmsdk-apb-watchdog.c
@@ -27,7 +27,7 @@
 #include "qemu/module.h"
 #include "system/watchdog.h"
 #include "hw/sysbus.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/qdev-properties.h"
 #include "hw/registerfields.h"
 #include "hw/qdev-clock.h"

diff --git a/hw/xen/xen-pvh-common.c b/hw/xen/xen-pvh-common.c
index c3fc501fe6e3b82257b50406aabe6d700e010dbb..f365222019acbec2a20280931a9fcfe447abfffc 100644 (file)
--- a/hw/xen/xen-pvh-common.c
+++ b/hw/xen/xen-pvh-common.c
@@ -11,7 +11,7 @@
 #include "qemu/units.h"
 #include "qapi/visitor.h"
 #include "hw/core/boards.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "system/tpm.h"
 #include "system/tpm_backend.h"
 #include "system/runstate.h"

diff --git a/hw/xtensa/mx_pic.c b/hw/xtensa/mx_pic.c
index 8211c993eb743bd06d2ddfd1b49575f4fe3c8bd9..07c3731aef07ca2d1fbed286e9e0f897862443ce 100644 (file)
--- a/hw/xtensa/mx_pic.c
+++ b/hw/xtensa/mx_pic.c
@@ -26,7 +26,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/xtensa/mx_pic.h"
 #include "qemu/log.h"
 

diff --git a/hw/xtensa/pic_cpu.c b/hw/xtensa/pic_cpu.c
index e3885316106d23667a869aa2a34da8c309029c0a..c00167859a289e92d22461a46c1511fe39194e21 100644 (file)
--- a/hw/xtensa/pic_cpu.c
+++ b/hw/xtensa/pic_cpu.c
@@ -28,7 +28,7 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/cpu-interrupt.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "qemu/log.h"
 #include "qemu/timer.h"
 #include "qemu/atomic.h"

diff --git a/include/hw/adc/npcm7xx_adc.h b/include/hw/adc/npcm7xx_adc.h
index a0c56d42365ee5b177a56422593e3dbf39f9cb26..02dc1902fceb8b981c75085a9e6775c35353423d 100644 (file)
--- a/include/hw/adc/npcm7xx_adc.h
+++ b/include/hw/adc/npcm7xx_adc.h
@@ -17,7 +17,7 @@
 #define NPCM7XX_ADC_H
 
 #include "hw/core/clock.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sysbus.h"
 #include "qemu/timer.h"
 

diff --git a/include/hw/char/parallel.h b/include/hw/char/parallel.h
index 3f8d9b59a7629c440125661957e84960e81a1d27..f2c92eb5bc00a63529fb939300aecc6f2b2b7250 100644 (file)
--- a/include/hw/char/parallel.h
+++ b/include/hw/char/parallel.h
@@ -3,7 +3,7 @@
 
 #include "system/memory.h"
 #include "hw/isa/isa.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "chardev/char-fe.h"
 #include "chardev/char.h"
 

diff --git a/include/hw/irq.h b/include/hw/core/irq.h
similarity index 100%
rename from include/hw/irq.h
rename to include/hw/core/irq.h

diff --git a/include/hw/display/macfb.h b/include/hw/display/macfb.h
index 0fae1f33a65ed4a758d90fb77ccf4713819ccf97..356a03ce31ac37b569a39dd37fd380413300aa61 100644 (file)
--- a/include/hw/display/macfb.h
+++ b/include/hw/display/macfb.h
@@ -14,7 +14,7 @@
 #define MACFB_H
 
 #include "system/memory.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/nubus/nubus.h"
 #include "hw/sysbus.h"
 #include "ui/console.h"

diff --git a/include/hw/i2c/npcm7xx_smbus.h b/include/hw/i2c/npcm7xx_smbus.h
index 9c544c561b758d8cd5a05f270b3cb8e557b1176c..f5adb69c672f3a55fbd3a3bde626d48d3c60c7e3 100644 (file)
--- a/include/hw/i2c/npcm7xx_smbus.h
+++ b/include/hw/i2c/npcm7xx_smbus.h
@@ -18,7 +18,7 @@
 
 #include "system/memory.h"
 #include "hw/i2c/i2c.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sysbus.h"
 
 /*

diff --git a/include/hw/ide/ahci-pci.h b/include/hw/ide/ahci-pci.h
index face1a9a4a47e6ea457d90a252f056d4db8491c7..85cd899abe5034eb5addfc546c27167e49bac270 100644 (file)
--- a/include/hw/ide/ahci-pci.h
+++ b/include/hw/ide/ahci-pci.h
@@ -9,7 +9,7 @@
 #include "qom/object.h"
 #include "hw/ide/ahci.h"
 #include "hw/pci/pci_device.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 
 #define TYPE_ICH9_AHCI "ich9-ahci"
 OBJECT_DECLARE_SIMPLE_TYPE(AHCIPCIState, ICH9_AHCI)

diff --git a/include/hw/input/pl050.h b/include/hw/input/pl050.h
index 4cb8985f31a0d5732a6de341b1432e4cf1d69125..db662654c58165e6dfa028ceb7011706076e04e7 100644 (file)
--- a/include/hw/input/pl050.h
+++ b/include/hw/input/pl050.h
@@ -13,7 +13,7 @@
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
 #include "hw/input/ps2.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 
 struct PL050DeviceClass {
     SysBusDeviceClass parent_class;

diff --git a/include/hw/ipack/ipack.h b/include/hw/ipack/ipack.h
index 00f397fd020d61412e25f7da8ac92644ab8931af..d86ef84233c2f9eca89449bfd85636c12aacc1ff 100644 (file)
--- a/include/hw/ipack/ipack.h
+++ b/include/hw/ipack/ipack.h
@@ -12,7 +12,7 @@
 #define QEMU_IPACK_H
 
 #include "hw/qdev-core.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "qom/object.h"
 
 

diff --git a/include/hw/misc/bcm2835_mphi.h b/include/hw/misc/bcm2835_mphi.h
index 3f1997e5f247e2d365cb9638d3c384ece7d9b8cb..1a451685e8edcdf54f875a2e35aba6c0890075e5 100644 (file)
--- a/include/hw/misc/bcm2835_mphi.h
+++ b/include/hw/misc/bcm2835_mphi.h
@@ -17,7 +17,7 @@
 #ifndef HW_MISC_BCM2835_MPHI_H
 #define HW_MISC_BCM2835_MPHI_H
 
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sysbus.h"
 #include "qom/object.h"
 

diff --git a/include/hw/misc/npcm7xx_mft.h b/include/hw/misc/npcm7xx_mft.h
index 54a2c2a82e64f95f8680f08ad5ddeff3bec87997..79855b6f25d7cdb24407d33de570468f0c2bee8a 100644 (file)
--- a/include/hw/misc/npcm7xx_mft.h
+++ b/include/hw/misc/npcm7xx_mft.h
@@ -18,7 +18,7 @@
 
 #include "system/memory.h"
 #include "hw/core/clock.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sysbus.h"
 #include "qom/object.h"
 

diff --git a/include/hw/misc/npcm7xx_pwm.h b/include/hw/misc/npcm7xx_pwm.h
index f697a77cdcab3f70e3ec24204573fb91de617934..6a54b40005d719eff8575ed5c7b8ed46e6cedf78 100644 (file)
--- a/include/hw/misc/npcm7xx_pwm.h
+++ b/include/hw/misc/npcm7xx_pwm.h
@@ -18,7 +18,7 @@
 
 #include "hw/core/clock.h"
 #include "hw/sysbus.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 
 /* Each PWM module holds 4 PWM channels. */
 #define NPCM7XX_PWM_PER_MODULE 4

diff --git a/include/hw/misc/xlnx-versal-trng.h b/include/hw/misc/xlnx-versal-trng.h
index d96f8f9eff3b3bb27ade34c65d8f97c791de1c73..4e516216dbe272e475cfb70d84eb948d8308b37c 100644 (file)
--- a/include/hw/misc/xlnx-versal-trng.h
+++ b/include/hw/misc/xlnx-versal-trng.h
@@ -26,7 +26,7 @@
 #ifndef XLNX_VERSAL_TRNG_H
 #define XLNX_VERSAL_TRNG_H
 
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sysbus.h"
 #include "hw/register.h"
 

diff --git a/include/hw/net/imx_fec.h b/include/hw/net/imx_fec.h
index 83b21637eeb9f881cbb276321df856fa1b724182..99fc285402cf39c90872084a69cd810c4cba9cc7 100644 (file)
--- a/include/hw/net/imx_fec.h
+++ b/include/hw/net/imx_fec.h
@@ -32,7 +32,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(IMXFECState, IMX_FEC)
 
 #include "hw/sysbus.h"
 #include "hw/net/lan9118_phy.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "net/net.h"
 
 #define ENET_EIR               1

diff --git a/include/hw/net/npcm7xx_emc.h b/include/hw/net/npcm7xx_emc.h
index b789007160acb61a9b70fd5d62d0e6f33e0f06d9..03c9941d82d46fac63ba895ca8f563d40b3f99e1 100644 (file)
--- a/include/hw/net/npcm7xx_emc.h
+++ b/include/hw/net/npcm7xx_emc.h
@@ -17,7 +17,7 @@
 #ifndef NPCM7XX_EMC_H
 #define NPCM7XX_EMC_H
 
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sysbus.h"
 #include "net/net.h"
 

diff --git a/include/hw/net/npcm_gmac.h b/include/hw/net/npcm_gmac.h
index 6340ffe92cad3c99ab062518be31681c9c056dbf..44ee7b1bcbadb127606d939bbc341b2e51f84e76 100644 (file)
--- a/include/hw/net/npcm_gmac.h
+++ b/include/hw/net/npcm_gmac.h
@@ -20,7 +20,7 @@
 #ifndef NPCM_GMAC_H
 #define NPCM_GMAC_H
 
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sysbus.h"
 #include "net/net.h"
 

diff --git a/include/hw/nvram/xlnx-bbram.h b/include/hw/nvram/xlnx-bbram.h
index af90900bfc64db2c8745293c0e066c077938264c..ad2e4a250f5e60cac558df3d7346997cc0b4dc86 100644 (file)
--- a/include/hw/nvram/xlnx-bbram.h
+++ b/include/hw/nvram/xlnx-bbram.h
@@ -28,7 +28,7 @@
 
 #include "system/block-backend.h"
 #include "hw/qdev-core.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sysbus.h"
 #include "hw/register.h"
 

diff --git a/include/hw/nvram/xlnx-versal-efuse.h b/include/hw/nvram/xlnx-versal-efuse.h
index afa4f4f99604d6864dc5ab98177ccc7509c22ce6..37d09da4809ef9f87ee700e816c36601dd30dffa 100644 (file)
--- a/include/hw/nvram/xlnx-versal-efuse.h
+++ b/include/hw/nvram/xlnx-versal-efuse.h
@@ -22,7 +22,7 @@
 #ifndef XLNX_VERSAL_EFUSE_H
 #define XLNX_VERSAL_EFUSE_H
 
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sysbus.h"
 #include "hw/register.h"
 #include "hw/nvram/xlnx-efuse.h"

diff --git a/include/hw/nvram/xlnx-zynqmp-efuse.h b/include/hw/nvram/xlnx-zynqmp-efuse.h
index 7fb12df3fbbf30adcb90d66dcc6768bd4f189a04..6eb3fea8fa278c70af849716f61e22a0eadbcb43 100644 (file)
--- a/include/hw/nvram/xlnx-zynqmp-efuse.h
+++ b/include/hw/nvram/xlnx-zynqmp-efuse.h
@@ -22,7 +22,7 @@
 #ifndef XLNX_ZYNQMP_EFUSE_H
 #define XLNX_ZYNQMP_EFUSE_H
 
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/sysbus.h"
 #include "hw/register.h"
 #include "hw/nvram/xlnx-efuse.h"

diff --git a/include/hw/ppc/spapr_vio.h b/include/hw/ppc/spapr_vio.h
index b8de4b06fb1af647be9ac92bd3b0c1f5f081c8e7..0ea0dbae8b1d5ec1a71c674f45a6d74720bfd752 100644 (file)
--- a/include/hw/ppc/spapr_vio.h
+++ b/include/hw/ppc/spapr_vio.h
@@ -24,7 +24,7 @@
 
 #include "hw/ppc/spapr.h"
 #include "system/dma.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "qom/object.h"
 
 #define TYPE_VIO_SPAPR_DEVICE "vio-spapr-device"

diff --git a/include/hw/timer/bcm2835_systmr.h b/include/hw/timer/bcm2835_systmr.h
index a8f605beeb67d0216e57404159506403b2d282ea..93cb3415a68fb13bf20fe23eb86451a3eb476275 100644 (file)
--- a/include/hw/timer/bcm2835_systmr.h
+++ b/include/hw/timer/bcm2835_systmr.h
@@ -10,7 +10,7 @@
 #define BCM2835_SYSTMR_H
 
 #include "hw/sysbus.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "qemu/timer.h"
 #include "qom/object.h"
 

diff --git a/include/hw/timer/stellaris-gptm.h b/include/hw/timer/stellaris-gptm.h
index c705508b8295d9e2aebd9a0758d552018f953a76..9d663b58dfa35931148778af62866cc598d83460 100644 (file)
--- a/include/hw/timer/stellaris-gptm.h
+++ b/include/hw/timer/stellaris-gptm.h
@@ -12,7 +12,7 @@
 
 #include "qom/object.h"
 #include "hw/sysbus.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/core/clock.h"
 
 #define TYPE_STELLARIS_GPTM "stellaris-gptm"

diff --git a/include/hw/watchdog/sbsa_gwdt.h b/include/hw/watchdog/sbsa_gwdt.h
index 4bdc6c6fdb6970f09e4ca21196438265241c9e4f..ace8fe04c8731633a02206dc45e5e38330b992ac 100644 (file)
--- a/include/hw/watchdog/sbsa_gwdt.h
+++ b/include/hw/watchdog/sbsa_gwdt.h
@@ -14,7 +14,7 @@
 
 #include "qemu/bitops.h"
 #include "hw/sysbus.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 
 #define TYPE_WDT_SBSA "sbsa_gwdt"
 #define SBSA_GWDT(obj) \

diff --git a/include/hw/watchdog/wdt_imx2.h b/include/hw/watchdog/wdt_imx2.h
index 600a552d2e22207946a8111d92177bacad8d7519..ddc49aaea4fd9c33f3d51ea41c466d1b4d2f6dcc 100644 (file)
--- a/include/hw/watchdog/wdt_imx2.h
+++ b/include/hw/watchdog/wdt_imx2.h
@@ -14,7 +14,7 @@
 
 #include "qemu/bitops.h"
 #include "hw/sysbus.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/ptimer.h"
 #include "qom/object.h"
 

diff --git a/rust/hw/core/wrapper.h b/rust/hw/core/wrapper.h
index 77b541f83f9df54833b207c90c5d3a7aaee0ccc9..e5c7e0518a5a30ffe226a5fd6e9f1ec0c2de1327 100644 (file)
--- a/rust/hw/core/wrapper.h
+++ b/rust/hw/core/wrapper.h
@@ -29,4 +29,4 @@ typedef enum memory_order {
 #include "hw/qdev-clock.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"

diff --git a/system/qtest.c b/system/qtest.c
index 67e2385f4b06f214a8efb33e18d1e45817736043..b0bb9bf9d440602f562fbbda6bd450bcb210beaf 100644 (file)
--- a/system/qtest.c
+++ b/system/qtest.c
@@ -20,7 +20,7 @@
 #include "system/memory.h"
 #include "exec/tswap.h"
 #include "hw/qdev-core.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/core/cpu.h"
 #include "qemu/accel.h"
 #include "system/cpu-timers.h"

diff --git a/target/arm/cpregs-gcs.c b/target/arm/cpregs-gcs.c
index 1ed52a211a66bd70645cf578f56a18a5119ac2de..e31827342d9b672bcb8989386416312ce10321b4 100644 (file)
--- a/target/arm/cpregs-gcs.c
+++ b/target/arm/cpregs-gcs.c
@@ -6,7 +6,7 @@
 #include "qemu/osdep.h"
 #include "qemu/timer.h"
 #include "exec/icount.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "cpu.h"
 #include "cpu-features.h"
 #include "cpregs.h"

diff --git a/target/arm/cpregs-pmu.c b/target/arm/cpregs-pmu.c
index 31c01eddc876840c701913e4d1c32622f87b8563..47e1e4652b1e694c51e7463363bf32c329b67c31 100644 (file)
--- a/target/arm/cpregs-pmu.c
+++ b/target/arm/cpregs-pmu.c
@@ -6,7 +6,7 @@
 #include "qemu/osdep.h"
 #include "qemu/timer.h"
 #include "exec/icount.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "cpu.h"
 #include "cpu-features.h"
 #include "cpregs.h"

diff --git a/target/arm/helper.c b/target/arm/helper.c
index 27ebc6f29b82fb9713bd98e0aa2396a64b09cd3e..263ca29d92b441afc30ff4658103008f4becf45a 100644 (file)
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -20,7 +20,7 @@
 #include "qemu/qemu-print.h"
 #include "exec/cputlb.h"
 #include "exec/translation-block.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "system/cpu-timers.h"
 #include "exec/icount.h"
 #include "system/kvm.h"

diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c
index 7c48f21543fe00443966ecafcb55d92ffbb8aed6..fa26f63a61ad8fc2ffb675bd6d3c7fd21f1a9dae 100644 (file)
--- a/target/arm/hvf/hvf.c
+++ b/target/arm/hvf/hvf.c
@@ -26,7 +26,7 @@
 #include "system/address-spaces.h"
 #include "system/memory.h"
 #include "hw/core/boards.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "qemu/main-loop.h"
 #include "system/cpus.h"
 #include "arm-powerctl.h"

diff --git a/target/arm/kvm.c b/target/arm/kvm.c
index c7ea6fc2f6265bf2052e50c562f8feff315b82c7..12a63602b114a7adb4d65ef9452d2a57574d0f06 100644 (file)
--- a/target/arm/kvm.c
+++ b/target/arm/kvm.c
@@ -34,7 +34,7 @@
 #include "system/address-spaces.h"
 #include "gdbstub/enums.h"
 #include "hw/core/boards.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "qapi/visitor.h"
 #include "qemu/log.h"
 #include "hw/acpi/acpi.h"

diff --git a/target/i386/tcg/system/fpu_helper.c b/target/i386/tcg/system/fpu_helper.c
index 0b4fa187dfbddb8cce319ebc5d719046bbdcaff1..26b24d4035638aa4578bd9283a36f53febcd3092 100644 (file)
--- a/target/i386/tcg/system/fpu_helper.c
+++ b/target/i386/tcg/system/fpu_helper.c
@@ -20,7 +20,7 @@
 #include "qemu/osdep.h"
 #include "qemu/main-loop.h"
 #include "cpu.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 
 static qemu_irq ferr_irq;
 

diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c
index 6412584e1bdd9d54196c825100c14977ae9db88f..8ed62acf84d78f946177d7086580e5a278d55f35 100644 (file)
--- a/target/loongarch/kvm/kvm.c
+++ b/target/loongarch/kvm/kvm.c
@@ -20,7 +20,7 @@
 #include "exec/memattrs.h"
 #include "system/address-spaces.h"
 #include "hw/core/boards.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/loongarch/virt.h"
 #include "qemu/log.h"
 #include "hw/loader.h"

diff --git a/target/loongarch/tcg/csr_helper.c b/target/loongarch/tcg/csr_helper.c
index c1a8ba3089cbb17af68d3c91fb2ced77107d3f87..cd35ca93c7ae47bcc0576c607ff6117d3174b15b 100644 (file)
--- a/target/loongarch/tcg/csr_helper.c
+++ b/target/loongarch/tcg/csr_helper.c
@@ -14,7 +14,7 @@
 #include "exec/helper-proto.h"
 #include "exec/cputlb.h"
 #include "accel/tcg/cpu-ldst.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "cpu-csr.h"
 #include "cpu-mmu.h"
 

diff --git a/target/mips/system/cp0_timer.c b/target/mips/system/cp0_timer.c
index ca16945cee10b8311602644e63f0c0ff8befaf8d..afa163c3196bbe03327e27ac3b698b4a93e84902 100644 (file)
--- a/target/mips/system/cp0_timer.c
+++ b/target/mips/system/cp0_timer.c
@@ -21,7 +21,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "qemu/timer.h"
 #include "system/kvm.h"
 #include "internal.h"

diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c
index 301d8de67fd34dd1ebb7909362e3b226d522a2ac..1d99e5f4908dee779b317fd59ef6dd75ae23f17d 100644 (file)
--- a/target/riscv/kvm/kvm-cpu.c
+++ b/target/riscv/kvm/kvm-cpu.c
@@ -38,7 +38,7 @@
 #include "system/address-spaces.h"
 #include "system/memory.h"
 #include "hw/core/boards.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "hw/intc/riscv_imsic.h"
 #include "qemu/log.h"
 #include "hw/loader.h"

diff --git a/target/rx/helper.c b/target/rx/helper.c
index e9a7aaf610d4e57f6fc900a6f86f129c74e4c79f..9a78f1457f5cd18378947af06816c54d9168df84 100644 (file)
--- a/target/rx/helper.c
+++ b/target/rx/helper.c
@@ -21,7 +21,7 @@
 #include "cpu.h"
 #include "exec/log.h"
 #include "accel/tcg/cpu-ldst.h"
-#include "hw/irq.h"
+#include "hw/core/irq.h"
 #include "qemu/plugin.h"
 
 void rx_cpu_unpack_psw(CPURXState *env, uint32_t psw, int rte)