diff options
Diffstat (limited to 'hw/intc')
50 files changed, 94 insertions, 22 deletions
diff --git a/hw/intc/allwinner-a10-pic.c b/hw/intc/allwinner-a10-pic.c index 080bdd791f..8cca124807 100644 --- a/hw/intc/allwinner-a10-pic.c +++ b/hw/intc/allwinner-a10-pic.c @@ -17,8 +17,9 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" -#include "sysemu/sysemu.h" +#include "migration/vmstate.h" #include "hw/intc/allwinner-a10-pic.h" +#include "hw/irq.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c index e764a2bb03..aafd8e0e33 100644 --- a/hw/intc/apic_common.c +++ b/hw/intc/apic_common.c @@ -29,8 +29,10 @@ #include "trace.h" #include "sysemu/hax.h" #include "sysemu/kvm.h" -#include "hw/qdev.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" +#include "migration/qemu-file-types.h" +#include "migration/vmstate.h" static int apic_irq_delivered; bool apic_report_tpr_access; diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c index 77427a4188..7af591daac 100644 --- a/hw/intc/arm_gic.c +++ b/hw/intc/arm_gic.c @@ -19,6 +19,7 @@ */ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "gic_internal.h" #include "qapi/error.h" diff --git a/hw/intc/arm_gic_common.c b/hw/intc/arm_gic_common.c index ccc50d00b6..f0d0d7c467 100644 --- a/hw/intc/arm_gic_common.c +++ b/hw/intc/arm_gic_common.c @@ -23,6 +23,8 @@ #include "qemu/module.h" #include "gic_internal.h" #include "hw/arm/linux-boot-if.h" +#include "hw/qdev-properties.h" +#include "migration/vmstate.h" static int gic_pre_save(void *opaque) { diff --git a/hw/intc/arm_gicv2m.c b/hw/intc/arm_gicv2m.c index 05f299fc7f..6e45f4ff39 100644 --- a/hw/intc/arm_gicv2m.c +++ b/hw/intc/arm_gicv2m.c @@ -28,7 +28,9 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/sysbus.h" +#include "hw/irq.h" #include "hw/pci/msi.h" +#include "hw/qdev-properties.h" #include "sysemu/kvm.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/intc/arm_gicv3_common.c b/hw/intc/arm_gicv3_common.c index 5edabb928f..8f5f4c8e94 100644 --- a/hw/intc/arm_gicv3_common.c +++ b/hw/intc/arm_gicv3_common.c @@ -26,6 +26,8 @@ #include "qemu/module.h" #include "qom/cpu.h" #include "hw/intc/arm_gicv3_common.h" +#include "hw/qdev-properties.h" +#include "migration/vmstate.h" #include "gicv3_internal.h" #include "hw/arm/linux-boot-if.h" #include "sysemu/kvm.h" diff --git a/hw/intc/arm_gicv3_cpuif.c b/hw/intc/arm_gicv3_cpuif.c index 3b212d91c8..a254b0ce87 100644 --- a/hw/intc/arm_gicv3_cpuif.c +++ b/hw/intc/arm_gicv3_cpuif.c @@ -17,6 +17,7 @@ #include "qemu/main-loop.h" #include "trace.h" #include "gicv3_internal.h" +#include "hw/irq.h" #include "cpu.h" void gicv3_set_gicv3state(CPUState *cpu, GICv3CPUState *s) diff --git a/hw/intc/arm_gicv3_its_common.c b/hw/intc/arm_gicv3_its_common.c index efb3d51fb5..66c4c6a188 100644 --- a/hw/intc/arm_gicv3_its_common.c +++ b/hw/intc/arm_gicv3_its_common.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "hw/pci/msi.h" +#include "migration/vmstate.h" #include "hw/intc/arm_gicv3_its_common.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/intc/arm_gicv3_its_kvm.c b/hw/intc/arm_gicv3_its_kvm.c index 52ac01aba3..d66f2431ee 100644 --- a/hw/intc/arm_gicv3_its_kvm.c +++ b/hw/intc/arm_gicv3_its_kvm.c @@ -22,7 +22,8 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/intc/arm_gicv3_its_common.h" -#include "sysemu/sysemu.h" +#include "hw/qdev-properties.h" +#include "sysemu/runstate.h" #include "sysemu/kvm.h" #include "kvm_arm.h" #include "migration/blocker.h" diff --git a/hw/intc/arm_gicv3_kvm.c b/hw/intc/arm_gicv3_kvm.c index d9c72f85be..9c7f4ab871 100644 --- a/hw/intc/arm_gicv3_kvm.c +++ b/hw/intc/arm_gicv3_kvm.c @@ -26,7 +26,7 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "sysemu/kvm.h" -#include "sysemu/sysemu.h" +#include "sysemu/runstate.h" #include "kvm_arm.h" #include "gicv3_internal.h" #include "vgic_common.h" diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c index 9f8f0d3ff5..62ab8b7273 100644 --- a/hw/intc/armv7m_nvic.c +++ b/hw/intc/armv7m_nvic.c @@ -14,8 +14,11 @@ #include "qapi/error.h" #include "cpu.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "qemu/timer.h" #include "hw/intc/armv7m_nvic.h" +#include "hw/irq.h" +#include "hw/qdev-properties.h" #include "target/arm/cpu.h" #include "exec/exec-all.h" #include "qemu/log.h" diff --git a/hw/intc/aspeed_vic.c b/hw/intc/aspeed_vic.c index 266a309f3b..5ba06c5262 100644 --- a/hw/intc/aspeed_vic.c +++ b/hw/intc/aspeed_vic.c @@ -29,6 +29,8 @@ #include "qemu/osdep.h" #include "hw/intc/aspeed_vic.h" +#include "hw/irq.h" +#include "migration/vmstate.h" #include "qemu/bitops.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/intc/bcm2835_ic.c b/hw/intc/bcm2835_ic.c index 61d37643a1..05bd28e4f9 100644 --- a/hw/intc/bcm2835_ic.c +++ b/hw/intc/bcm2835_ic.c @@ -14,6 +14,8 @@ #include "qemu/osdep.h" #include "hw/intc/bcm2835_ic.h" +#include "hw/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 66417c85e4..04229b8a17 100644 --- a/hw/intc/bcm2836_control.c +++ b/hw/intc/bcm2836_control.c @@ -17,6 +17,8 @@ #include "qemu/osdep.h" #include "hw/intc/bcm2836_control.h" +#include "hw/irq.h" +#include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/intc/etraxfs_pic.c b/hw/intc/etraxfs_pic.c index 20e1391d64..77f652acec 100644 --- a/hw/intc/etraxfs_pic.c +++ b/hw/intc/etraxfs_pic.c @@ -25,7 +25,8 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "qemu/module.h" -#include "hw/hw.h" +#include "hw/irq.h" +#include "hw/qdev-properties.h" //#include "pc.h" //#include "etraxfs.h" diff --git a/hw/intc/exynos4210_combiner.c b/hw/intc/exynos4210_combiner.c index 6fed0e8d16..5b33ca6628 100644 --- a/hw/intc/exynos4210_combiner.c +++ b/hw/intc/exynos4210_combiner.c @@ -29,9 +29,13 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "hw/arm/exynos4210.h" +#include "hw/hw.h" +#include "hw/irq.h" +#include "hw/qdev-properties.h" //#define DEBUG_COMBINER diff --git a/hw/intc/exynos4210_gic.c b/hw/intc/exynos4210_gic.c index e37d457fcf..a1b699b6ba 100644 --- a/hw/intc/exynos4210_gic.c +++ b/hw/intc/exynos4210_gic.c @@ -22,8 +22,10 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/arm/exynos4210.h" enum ExtGicId { diff --git a/hw/intc/grlib_irqmp.c b/hw/intc/grlib_irqmp.c index 21c77a5ec1..bc78e1a14f 100644 --- a/hw/intc/grlib_irqmp.c +++ b/hw/intc/grlib_irqmp.c @@ -28,6 +28,7 @@ #include "hw/sysbus.h" #include "cpu.h" +#include "hw/qdev-properties.h" #include "hw/sparc/grlib.h" #include "trace.h" diff --git a/hw/intc/heathrow_pic.c b/hw/intc/heathrow_pic.c index c282ac4006..cb97c315da 100644 --- a/hw/intc/heathrow_pic.c +++ b/hw/intc/heathrow_pic.c @@ -24,10 +24,11 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/ppc/mac.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "hw/intc/heathrow_pic.h" +#include "hw/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 76f3d873b8..211a98962e 100644 --- a/hw/intc/i8259.c +++ b/hw/intc/i8259.c @@ -21,9 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/i386/pc.h" +#include "hw/irq.h" #include "hw/isa/isa.h" #include "qemu/timer.h" #include "qemu/log.h" diff --git a/hw/intc/i8259_common.c b/hw/intc/i8259_common.c index c75c880157..bd37bb5e68 100644 --- a/hw/intc/i8259_common.c +++ b/hw/intc/i8259_common.c @@ -22,9 +22,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "hw/i386/pc.h" #include "hw/isa/i8259_internal.h" +#include "hw/qdev-properties.h" +#include "migration/vmstate.h" #include "monitor/monitor.h" static int irq_level[16]; diff --git a/hw/intc/imx_avic.c b/hw/intc/imx_avic.c index 83a4101528..63fc602a1a 100644 --- a/hw/intc/imx_avic.c +++ b/hw/intc/imx_avic.c @@ -17,6 +17,8 @@ #include "qemu/osdep.h" #include "hw/intc/imx_avic.h" +#include "hw/irq.h" +#include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/intc/imx_gpcv2.c b/hw/intc/imx_gpcv2.c index a83333bdea..17007a4078 100644 --- a/hw/intc/imx_gpcv2.c +++ b/hw/intc/imx_gpcv2.c @@ -11,6 +11,7 @@ #include "qemu/osdep.h" #include "hw/intc/imx_gpcv2.h" +#include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/intc/ioapic.c b/hw/intc/ioapic.c index e99c37cceb..1ede055387 100644 --- a/hw/intc/ioapic.c +++ b/hw/intc/ioapic.c @@ -23,13 +23,14 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "monitor/monitor.h" -#include "hw/hw.h" #include "hw/i386/pc.h" #include "hw/i386/apic.h" #include "hw/i386/ioapic.h" #include "hw/i386/ioapic_internal.h" #include "hw/pci/msi.h" +#include "hw/qdev-properties.h" #include "sysemu/kvm.h" +#include "sysemu/sysemu.h" #include "hw/i386/apic-msidef.h" #include "hw/i386/x86-iommu.h" #include "trace.h" diff --git a/hw/intc/ioapic_common.c b/hw/intc/ioapic_common.c index fa50382d43..5538b5b86e 100644 --- a/hw/intc/ioapic_common.c +++ b/hw/intc/ioapic_common.c @@ -22,6 +22,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/module.h" +#include "migration/vmstate.h" #include "monitor/monitor.h" #include "hw/i386/ioapic.h" #include "hw/i386/ioapic_internal.h" diff --git a/hw/intc/lm32_pic.c b/hw/intc/lm32_pic.c index 170fa7a1ac..36de670c9e 100644 --- a/hw/intc/lm32_pic.c +++ b/hw/intc/lm32_pic.c @@ -19,13 +19,14 @@ #include "qemu/osdep.h" -#include "hw/hw.h" +#include "migration/vmstate.h" #include "monitor/monitor.h" #include "qemu/module.h" #include "hw/sysbus.h" #include "trace.h" #include "hw/lm32/lm32_pic.h" #include "hw/intc/intc.h" +#include "hw/irq.h" #define TYPE_LM32_PIC "lm32-pic" #define LM32_PIC(obj) OBJECT_CHECK(LM32PicState, (obj), TYPE_LM32_PIC) diff --git a/hw/intc/mips_gic.c b/hw/intc/mips_gic.c index 33ab51c5b8..54b3059f3f 100644 --- a/hw/intc/mips_gic.c +++ b/hw/intc/mips_gic.c @@ -13,13 +13,14 @@ #include "qemu/log.h" #include "qemu/module.h" #include "qapi/error.h" -#include "hw/hw.h" #include "hw/sysbus.h" #include "exec/memory.h" -#include "sysemu/sysemu.h" #include "sysemu/kvm.h" +#include "sysemu/reset.h" #include "kvm_mips.h" #include "hw/intc/mips_gic.h" +#include "hw/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/nios2_iic.c b/hw/intc/nios2_iic.c index 7329434b91..3a5d86c2a4 100644 --- a/hw/intc/nios2_iic.c +++ b/hw/intc/nios2_iic.c @@ -22,6 +22,7 @@ #include "qemu/module.h" #include "qapi/error.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "cpu.h" diff --git a/hw/intc/omap_intc.c b/hw/intc/omap_intc.c index 053e67c66b..854b709ca0 100644 --- a/hw/intc/omap_intc.c +++ b/hw/intc/omap_intc.c @@ -19,7 +19,8 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" +#include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/arm/omap.h" #include "hw/sysbus.h" #include "qemu/error-report.h" diff --git a/hw/intc/ompic.c b/hw/intc/ompic.c index 9cb310a5dd..ca9614fda1 100644 --- a/hw/intc/ompic.c +++ b/hw/intc/ompic.c @@ -10,8 +10,10 @@ #include "qemu/log.h" #include "qemu/module.h" #include "qapi/error.h" -#include "hw/hw.h" +#include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "exec/memory.h" #define TYPE_OR1K_OMPIC "or1k-ompic" diff --git a/hw/intc/openpic.c b/hw/intc/openpic.c index 9b4fc6cf43..c797ba78f3 100644 --- a/hw/intc/openpic.c +++ b/hw/intc/openpic.c @@ -35,12 +35,14 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" +#include "hw/irq.h" #include "hw/ppc/mac.h" #include "hw/pci/pci.h" #include "hw/ppc/openpic.h" #include "hw/ppc/ppc_e500.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/pci/msi.h" #include "qapi/error.h" #include "qemu/bitops.h" diff --git a/hw/intc/openpic_kvm.c b/hw/intc/openpic_kvm.c index 49fc6fa0cf..c09bebedd1 100644 --- a/hw/intc/openpic_kvm.c +++ b/hw/intc/openpic_kvm.c @@ -27,10 +27,10 @@ #include "cpu.h" #include <sys/ioctl.h> #include "exec/address-spaces.h" -#include "hw/hw.h" #include "hw/ppc/openpic.h" #include "hw/ppc/openpic_kvm.h" #include "hw/pci/msi.h" +#include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "sysemu/kvm.h" #include "qemu/log.h" diff --git a/hw/intc/pl190.c b/hw/intc/pl190.c index b4f31efc45..e3bd3dd121 100644 --- a/hw/intc/pl190.c +++ b/hw/intc/pl190.c @@ -8,7 +8,9 @@ */ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/intc/pnv_xive.c b/hw/intc/pnv_xive.c index 4dc92ef1e3..a8caf258fd 100644 --- a/hw/intc/pnv_xive.c +++ b/hw/intc/pnv_xive.c @@ -14,6 +14,7 @@ #include "target/ppc/cpu.h" #include "sysemu/cpus.h" #include "sysemu/dma.h" +#include "sysemu/reset.h" #include "monitor/monitor.h" #include "hw/ppc/fdt.h" #include "hw/ppc/pnv.h" @@ -21,6 +22,7 @@ #include "hw/ppc/pnv_xscom.h" #include "hw/ppc/pnv_xive.h" #include "hw/ppc/xive_regs.h" +#include "hw/qdev-properties.h" #include "hw/ppc/ppc.h" #include <libfdt.h> diff --git a/hw/intc/puv3_intc.c b/hw/intc/puv3_intc.c index e2f6d9875a..e018955ce8 100644 --- a/hw/intc/puv3_intc.c +++ b/hw/intc/puv3_intc.c @@ -10,6 +10,7 @@ */ #include "qemu/osdep.h" +#include "hw/irq.h" #include "hw/sysbus.h" #undef DEBUG_PUV3 diff --git a/hw/intc/realview_gic.c b/hw/intc/realview_gic.c index 99557544db..73fe8cd815 100644 --- a/hw/intc/realview_gic.c +++ b/hw/intc/realview_gic.c @@ -11,6 +11,8 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/intc/realview_gic.h" +#include "hw/irq.h" +#include "hw/qdev-properties.h" static void realview_gic_set_irq(void *opaque, int irq, int level) { diff --git a/hw/intc/s390_flic.c b/hw/intc/s390_flic.c index d0be755c82..a159c0c7cf 100644 --- a/hw/intc/s390_flic.c +++ b/hw/intc/s390_flic.c @@ -12,14 +12,15 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #include "qemu/module.h" #include "hw/sysbus.h" #include "hw/s390x/ioinst.h" #include "hw/s390x/s390_flic.h" +#include "hw/qdev-properties.h" #include "hw/s390x/css.h" #include "trace.h" #include "cpu.h" -#include "hw/qdev.h" #include "qapi/error.h" #include "hw/s390x/s390-virtio-ccw.h" diff --git a/hw/intc/s390_flic_kvm.c b/hw/intc/s390_flic_kvm.c index ff45b4ab0b..819aa5e198 100644 --- a/hw/intc/s390_flic_kvm.c +++ b/hw/intc/s390_flic_kvm.c @@ -22,6 +22,7 @@ #include "hw/s390x/s390_flic.h" #include "hw/s390x/adapter.h" #include "hw/s390x/css.h" +#include "migration/qemu-file-types.h" #include "trace.h" #define FLIC_SAVE_INITIAL_SIZE getpagesize() diff --git a/hw/intc/sh_intc.c b/hw/intc/sh_intc.c index bac7886f25..72a55e32dd 100644 --- a/hw/intc/sh_intc.c +++ b/hw/intc/sh_intc.c @@ -11,7 +11,7 @@ #include "qemu/osdep.h" #include "cpu.h" #include "hw/sh4/sh_intc.h" -#include "hw/hw.h" +#include "hw/irq.h" #include "hw/sh4/sh.h" //#define DEBUG_INTC diff --git a/hw/intc/slavio_intctl.c b/hw/intc/slavio_intctl.c index ca528753bf..c4cf9096eb 100644 --- a/hw/intc/slavio_intctl.c +++ b/hw/intc/slavio_intctl.c @@ -23,10 +23,12 @@ */ #include "qemu/osdep.h" +#include "migration/vmstate.h" #include "monitor/monitor.h" #include "qemu/module.h" #include "hw/sysbus.h" #include "hw/intc/intc.h" +#include "hw/irq.h" #include "trace.h" //#define DEBUG_IRQ_COUNT diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c index 3ae311d9ff..aad981cb78 100644 --- a/hw/intc/spapr_xive.c +++ b/hw/intc/spapr_xive.c @@ -14,6 +14,8 @@ #include "qemu/error-report.h" #include "target/ppc/cpu.h" #include "sysemu/cpus.h" +#include "sysemu/reset.h" +#include "migration/vmstate.h" #include "monitor/monitor.h" #include "hw/ppc/fdt.h" #include "hw/ppc/spapr.h" @@ -21,6 +23,7 @@ #include "hw/ppc/spapr_xive.h" #include "hw/ppc/xive.h" #include "hw/ppc/xive_regs.h" +#include "hw/qdev-properties.h" /* * XIVE Virtualization Controller BAR and Thread Managment BAR that we diff --git a/hw/intc/spapr_xive_kvm.c b/hw/intc/spapr_xive_kvm.c index 8898615c69..17af4d19f5 100644 --- a/hw/intc/spapr_xive_kvm.c +++ b/hw/intc/spapr_xive_kvm.c @@ -14,6 +14,7 @@ #include "target/ppc/cpu.h" #include "sysemu/cpus.h" #include "sysemu/kvm.h" +#include "sysemu/runstate.h" #include "hw/ppc/spapr.h" #include "hw/ppc/spapr_cpu_core.h" #include "hw/ppc/spapr_xive.h" diff --git a/hw/intc/xics.c b/hw/intc/xics.c index faa976e2f8..b2fca2975c 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -28,16 +28,19 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "cpu.h" -#include "hw/hw.h" #include "trace.h" #include "qemu/timer.h" #include "hw/ppc/xics.h" +#include "hw/qdev-properties.h" #include "qemu/error-report.h" #include "qemu/module.h" #include "qapi/visitor.h" +#include "migration/vmstate.h" #include "monitor/monitor.h" #include "hw/intc/intc.h" +#include "hw/irq.h" #include "sysemu/kvm.h" +#include "sysemu/reset.h" void icp_pic_print_info(ICPState *icp, Monitor *mon) { diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c index 65c35f90f9..a4d2e876cc 100644 --- a/hw/intc/xics_kvm.c +++ b/hw/intc/xics_kvm.c @@ -29,7 +29,6 @@ #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" -#include "hw/hw.h" #include "trace.h" #include "sysemu/kvm.h" #include "hw/ppc/spapr.h" diff --git a/hw/intc/xics_pnv.c b/hw/intc/xics_pnv.c index 67f2702e52..35f3811264 100644 --- a/hw/intc/xics_pnv.c +++ b/hw/intc/xics_pnv.c @@ -19,7 +19,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "sysemu/sysemu.h" #include "qemu/log.h" #include "qemu/module.h" #include "hw/ppc/xics.h" diff --git a/hw/intc/xics_spapr.c b/hw/intc/xics_spapr.c index 7cd3c93d71..6577be0d92 100644 --- a/hw/intc/xics_spapr.c +++ b/hw/intc/xics_spapr.c @@ -27,7 +27,6 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "hw/hw.h" #include "trace.h" #include "qemu/timer.h" #include "hw/ppc/spapr.h" diff --git a/hw/intc/xilinx_intc.c b/hw/intc/xilinx_intc.c index d5363e977f..e15cb42b36 100644 --- a/hw/intc/xilinx_intc.c +++ b/hw/intc/xilinx_intc.c @@ -25,7 +25,8 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "qemu/module.h" -#include "hw/hw.h" +#include "hw/irq.h" +#include "hw/qdev-properties.h" #define D(x) diff --git a/hw/intc/xive.c b/hw/intc/xive.c index da148e9f6f..7a6e4b763a 100644 --- a/hw/intc/xive.c +++ b/hw/intc/xive.c @@ -14,8 +14,11 @@ #include "target/ppc/cpu.h" #include "sysemu/cpus.h" #include "sysemu/dma.h" +#include "sysemu/reset.h" #include "hw/qdev-properties.h" +#include "migration/vmstate.h" #include "monitor/monitor.h" +#include "hw/irq.h" #include "hw/ppc/xive.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 0b8ff897dc..f9a1401a94 100644 --- a/hw/intc/xlnx-pmu-iomod-intc.c +++ b/hw/intc/xlnx-pmu-iomod-intc.c @@ -26,11 +26,14 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/register.h" #include "qemu/bitops.h" #include "qemu/log.h" #include "qemu/module.h" #include "hw/intc/xlnx-pmu-iomod-intc.h" +#include "hw/irq.h" +#include "hw/qdev-properties.h" #ifndef XLNX_PMU_IO_INTC_ERR_DEBUG #define XLNX_PMU_IO_INTC_ERR_DEBUG 0 diff --git a/hw/intc/xlnx-zynqmp-ipi.c b/hw/intc/xlnx-zynqmp-ipi.c index 0dad6c04f5..adc1179014 100644 --- a/hw/intc/xlnx-zynqmp-ipi.c +++ b/hw/intc/xlnx-zynqmp-ipi.c @@ -27,11 +27,13 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" +#include "migration/vmstate.h" #include "hw/register.h" #include "qemu/bitops.h" #include "qemu/log.h" #include "qemu/module.h" #include "hw/intc/xlnx-zynqmp-ipi.h" +#include "hw/irq.h" #ifndef XLNX_ZYNQMP_IPI_ERR_DEBUG #define XLNX_ZYNQMP_IPI_ERR_DEBUG 0 |