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

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

diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c
index a0d917f9a9eca091ce4e1339301e4605e4c8a346..c262a9c6795d911b2ecf9875708cf78cea8b606e 100644 (file)
--- a/hw/arm/mps2-tz.c
+++ b/hw/arm/mps2-tz.c
@@ -53,7 +53,7 @@
 #include "hw/arm/boot.h"
 #include "hw/arm/armv7m.h"
 #include "hw/arm/machines-qom.h"
-#include "hw/or-irq.h"
+#include "hw/core/or-irq.h"
 #include "hw/core/boards.h"
 #include "system/address-spaces.h"
 #include "system/system.h"

diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c
index bf5e07019ff395843d2dadb19a1d8903514c3386..af3b0124891560c3454d9384b59543b5e6eba32a 100644 (file)
--- a/hw/arm/mps2.c
+++ b/hw/arm/mps2.c
@@ -32,7 +32,7 @@
 #include "hw/arm/boot.h"
 #include "hw/arm/armv7m.h"
 #include "hw/arm/machines-qom.h"
-#include "hw/or-irq.h"
+#include "hw/core/or-irq.h"
 #include "hw/core/boards.h"
 #include "system/address-spaces.h"
 #include "system/system.h"

diff --git a/hw/arm/mps3r.c b/hw/arm/mps3r.c
index b63002f48355a30020aa0e27e22c9a0a1c6163ad..c64e103f599b91437c603d725e80738f5486522b 100644 (file)
--- a/hw/arm/mps3r.c
+++ b/hw/arm/mps3r.c
@@ -32,7 +32,7 @@
 #include "cpu.h"
 #include "system/system.h"
 #include "hw/core/boards.h"
-#include "hw/or-irq.h"
+#include "hw/core/or-irq.h"
 #include "hw/qdev-clock.h"
 #include "hw/qdev-properties.h"
 #include "hw/arm/boot.h"

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

diff --git a/hw/arm/stm32l4x5_soc.c b/hw/arm/stm32l4x5_soc.c
index 64da5559c07bcf9c200dbbf521d4185ffc43ecc7..c28ce15e6bb32b6de747026a5fbfb93665276429 100644 (file)
--- a/hw/arm/stm32l4x5_soc.c
+++ b/hw/arm/stm32l4x5_soc.c
@@ -26,7 +26,7 @@
 #include "qapi/error.h"
 #include "system/address-spaces.h"
 #include "system/system.h"
-#include "hw/or-irq.h"
+#include "hw/core/or-irq.h"
 #include "hw/arm/stm32l4x5_soc.h"
 #include "hw/char/stm32l4x5_usart.h"
 #include "hw/gpio/stm32l4x5_gpio.h"

diff --git a/hw/arm/xlnx-versal.c b/hw/arm/xlnx-versal.c
index 81cb6294cfa640ecf31b3e9e76a5425d9036054b..a0b2f18b55183526dea57af331189e167955b136 100644 (file)
--- a/hw/arm/xlnx-versal.c
+++ b/hw/arm/xlnx-versal.c
@@ -40,7 +40,7 @@
 #include "hw/rtc/xlnx-zynqmp-rtc.h"
 #include "hw/misc/xlnx-versal-cfu.h"
 #include "hw/misc/xlnx-versal-cframe-reg.h"
-#include "hw/or-irq.h"
+#include "hw/core/or-irq.h"
 #include "hw/misc/xlnx-versal-crl.h"
 #include "hw/intc/arm_gicv3_common.h"
 #include "hw/intc/arm_gicv3_its_common.h"

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

diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index 4c03455d6bd3d4073958267fbaefce39fd9e0a41..6fe030e8c5d306036bce57444fddffcd2903d5c9 100644 (file)
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -28,7 +28,7 @@
 #include "system/system.h"
 #include "cpu.h"
 #include "hw/core/boards.h"
-#include "hw/or-irq.h"
+#include "hw/core/or-irq.h"
 #include "elf.h"
 #include "hw/core/loader.h"
 #include "ui/console.h"

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

diff --git a/hw/ppc/pegasos.c b/hw/ppc/pegasos.c
index 11bf406ef772e7c8ad7ce287772572c65bb93f5d..2de80a5fae94a0abf5115f4e72c9f0337bae0557 100644 (file)
--- a/hw/ppc/pegasos.c
+++ b/hw/ppc/pegasos.c
@@ -14,7 +14,7 @@
 #include "hw/sysbus.h"
 #include "hw/pci/pci_host.h"
 #include "hw/core/irq.h"
-#include "hw/or-irq.h"
+#include "hw/core/or-irq.h"
 #include "hw/pci-host/articia.h"
 #include "hw/pci-host/mv64361.h"
 #include "hw/isa/vt82c686.h"

diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index b62568645820e350065f28a8c7d132df4ff40d47..fa524513036d6260cd5cdd958d941aa6025f8ac5 100644 (file)
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -50,7 +50,7 @@
 #include "hw/misc/empty_slot.h"
 #include "hw/misc/unimp.h"
 #include "hw/core/irq.h"
-#include "hw/or-irq.h"
+#include "hw/core/or-irq.h"
 #include "hw/core/loader.h"
 #include "elf.h"
 #include "trace.h"

diff --git a/include/hw/arm/armsse.h b/include/hw/arm/armsse.h
index 04755ed1ec3725b80003ac62ed12e455475da20e..414e553600d5d71e34400e6e85c5852243bc6045 100644 (file)
--- a/include/hw/arm/armsse.h
+++ b/include/hw/arm/armsse.h
@@ -109,7 +109,7 @@
 #include "hw/misc/armsse-mhu.h"
 #include "hw/misc/armsse-cpu-pwrctrl.h"
 #include "hw/misc/unimp.h"
-#include "hw/or-irq.h"
+#include "hw/core/or-irq.h"
 #include "hw/core/clock.h"
 #include "hw/core/split-irq.h"
 #include "hw/cpu/cluster.h"

diff --git a/include/hw/arm/bcm2835_peripherals.h b/include/hw/arm/bcm2835_peripherals.h
index 1eeaeec9e0ec5105e50584a7194f20b0f7e90413..d46d892956d7c41c342e7236a932a602791aa86b 100644 (file)
--- a/include/hw/arm/bcm2835_peripherals.h
+++ b/include/hw/arm/bcm2835_peripherals.h
@@ -17,7 +17,7 @@
 #include "hw/char/bcm2835_aux.h"
 #include "hw/display/bcm2835_fb.h"
 #include "hw/dma/bcm2835_dma.h"
-#include "hw/or-irq.h"
+#include "hw/core/or-irq.h"
 #include "hw/intc/bcm2835_ic.h"
 #include "hw/misc/bcm2835_property.h"
 #include "hw/misc/bcm2835_rng.h"

diff --git a/include/hw/arm/exynos4210.h b/include/hw/arm/exynos4210.h
index d33fe385865152ca6126aa7ef9a645752749ce80..fbe4370219d20b98340b0b1b84f6554b890e2175 100644 (file)
--- a/include/hw/arm/exynos4210.h
+++ b/include/hw/arm/exynos4210.h
@@ -24,7 +24,7 @@
 #ifndef EXYNOS4210_H
 #define EXYNOS4210_H
 
-#include "hw/or-irq.h"
+#include "hw/core/or-irq.h"
 #include "hw/sysbus.h"
 #include "hw/cpu/a9mpcore.h"
 #include "hw/intc/exynos4210_gic.h"

diff --git a/include/hw/arm/fsl-imx6.h b/include/hw/arm/fsl-imx6.h
index 124bbd478fd241da2f58268c391f0e89ff1fd23b..5520473ba0b90511f873e57edbfd4787dccae8ab 100644 (file)
--- a/include/hw/arm/fsl-imx6.h
+++ b/include/hw/arm/fsl-imx6.h
@@ -33,7 +33,7 @@
 #include "hw/usb/chipidea.h"
 #include "hw/usb/imx-usb-phy.h"
 #include "hw/pci-host/designware.h"
-#include "hw/or-irq.h"
+#include "hw/core/or-irq.h"
 #include "system/memory.h"
 #include "cpu.h"
 #include "qom/object.h"

diff --git a/include/hw/arm/fsl-imx7.h b/include/hw/arm/fsl-imx7.h
index aa7818c4999cbccce6aa3c394b1f96c36cbde994..710831c8bf5e9307818ed7a4e0622fc83243dce2 100644 (file)
--- a/include/hw/arm/fsl-imx7.h
+++ b/include/hw/arm/fsl-imx7.h
@@ -36,7 +36,7 @@
 #include "hw/net/imx_fec.h"
 #include "hw/pci-host/designware.h"
 #include "hw/usb/chipidea.h"
-#include "hw/or-irq.h"
+#include "hw/core/or-irq.h"
 #include "cpu.h"
 #include "qom/object.h"
 #include "qemu/units.h"

diff --git a/include/hw/arm/fsl-imx8mp.h b/include/hw/arm/fsl-imx8mp.h
index d016f7d33710779b2b64e8605e3e9416f8168bde..1275df22f1964dc171a079bbad7c4bde582a5cb1 100644 (file)
--- a/include/hw/arm/fsl-imx8mp.h
+++ b/include/hw/arm/fsl-imx8mp.h
@@ -18,7 +18,7 @@
 #include "hw/misc/imx8mp_analog.h"
 #include "hw/misc/imx8mp_ccm.h"
 #include "hw/net/imx_fec.h"
-#include "hw/or-irq.h"
+#include "hw/core/or-irq.h"
 #include "hw/pci-host/designware.h"
 #include "hw/pci-host/fsl_imx8m_phy.h"
 #include "hw/sd/sdhci.h"

diff --git a/include/hw/arm/max78000_soc.h b/include/hw/arm/max78000_soc.h
index a203079ee9a6aae39bb780e59881d8ed998bcad2..1a6cdb394954be1b4344e8fb112ecc6af1bcb66a 100644 (file)
--- a/include/hw/arm/max78000_soc.h
+++ b/include/hw/arm/max78000_soc.h
@@ -9,7 +9,7 @@
 #ifndef HW_ARM_MAX78000_SOC_H
 #define HW_ARM_MAX78000_SOC_H
 
-#include "hw/or-irq.h"
+#include "hw/core/or-irq.h"
 #include "hw/arm/armv7m.h"
 #include "hw/misc/max78000_aes.h"
 #include "hw/misc/max78000_gcr.h"

diff --git a/include/hw/arm/stm32f205_soc.h b/include/hw/arm/stm32f205_soc.h
index d3de6b94dab501791f1d1baa8a27d55199fb9197..745433b56c23eaa273dd1e6bee603eeeaab39fdb 100644 (file)
--- a/include/hw/arm/stm32f205_soc.h
+++ b/include/hw/arm/stm32f205_soc.h
@@ -29,7 +29,7 @@
 #include "hw/timer/stm32f2xx_timer.h"
 #include "hw/char/stm32f2xx_usart.h"
 #include "hw/adc/stm32f2xx_adc.h"
-#include "hw/or-irq.h"
+#include "hw/core/or-irq.h"
 #include "hw/ssi/stm32f2xx_spi.h"
 #include "hw/arm/armv7m.h"
 #include "hw/core/clock.h"

diff --git a/include/hw/arm/stm32f405_soc.h b/include/hw/arm/stm32f405_soc.h
index 2eeada64ded879ca139724a85af40ccf9a531ff5..9fe40da96805765c166209f41f2f799f209facb0 100644 (file)
--- a/include/hw/arm/stm32f405_soc.h
+++ b/include/hw/arm/stm32f405_soc.h
@@ -31,7 +31,7 @@
 #include "hw/char/stm32f2xx_usart.h"
 #include "hw/adc/stm32f2xx_adc.h"
 #include "hw/misc/stm32f4xx_exti.h"
-#include "hw/or-irq.h"
+#include "hw/core/or-irq.h"
 #include "hw/ssi/stm32f2xx_spi.h"
 #include "hw/arm/armv7m.h"
 #include "qom/object.h"

diff --git a/include/hw/arm/stm32l4x5_soc.h b/include/hw/arm/stm32l4x5_soc.h
index c2fae6e23fe46674b235348168d66cfd3fb9ef56..9c3d662bca900afa0aeffa86166a25f3e281f484 100644 (file)
--- a/include/hw/arm/stm32l4x5_soc.h
+++ b/include/hw/arm/stm32l4x5_soc.h
@@ -26,7 +26,7 @@
 
 #include "system/memory.h"
 #include "hw/arm/armv7m.h"
-#include "hw/or-irq.h"
+#include "hw/core/or-irq.h"
 #include "hw/misc/stm32l4x5_syscfg.h"
 #include "hw/misc/stm32l4x5_exti.h"
 #include "hw/misc/stm32l4x5_rcc.h"

diff --git a/include/hw/arm/xlnx-zynqmp.h b/include/hw/arm/xlnx-zynqmp.h
index a3117bd6c50b327bfd8ae9a52d1855bb5e01edac..620b20d0e2a2627386153c854634edec01b1718b 100644 (file)
--- a/include/hw/arm/xlnx-zynqmp.h
+++ b/include/hw/arm/xlnx-zynqmp.h
@@ -37,7 +37,7 @@
 #include "hw/dma/xlnx_csu_dma.h"
 #include "hw/nvram/xlnx-bbram.h"
 #include "hw/nvram/xlnx-zynqmp-efuse.h"
-#include "hw/or-irq.h"
+#include "hw/core/or-irq.h"
 #include "hw/misc/xlnx-zynqmp-apu-ctrl.h"
 #include "hw/misc/xlnx-zynqmp-crf.h"
 #include "hw/timer/cadence_ttc.h"

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

diff --git a/include/hw/intc/aspeed_intc.h b/include/hw/intc/aspeed_intc.h
index 51288384a56932a24e6c828d7024e2aebc6a26de..6dd8effcd89e4c5425d3cbcab8a948c20421161e 100644 (file)
--- a/include/hw/intc/aspeed_intc.h
+++ b/include/hw/intc/aspeed_intc.h
@@ -10,7 +10,7 @@
 
 #include "hw/sysbus.h"
 #include "qom/object.h"
-#include "hw/or-irq.h"
+#include "hw/core/or-irq.h"
 
 #define TYPE_ASPEED_INTC "aspeed.intc"
 #define TYPE_ASPEED_2700_INTC TYPE_ASPEED_INTC "-ast2700"

diff --git a/include/hw/m68k/q800.h b/include/hw/m68k/q800.h
index c92da2e2ac74f935520915a502a82c9f35615054..77551b9592e0ff5fde7b3ff3cadb808edff736ad 100644 (file)
--- a/include/hw/m68k/q800.h
+++ b/include/hw/m68k/q800.h
@@ -31,7 +31,7 @@
 #include "hw/misc/mac_via.h"
 #include "hw/net/dp8393x.h"
 #include "hw/char/escc.h"
-#include "hw/or-irq.h"
+#include "hw/core/or-irq.h"
 #include "hw/scsi/esp.h"
 #include "hw/block/swim.h"
 #include "hw/nubus/mac-nubus-bridge.h"