From c755f3b95964f344806fa8e6a6e05ffc3ee1c4fa Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Thu, 27 Nov 2025 08:38:26 +0100 Subject: [PATCH] include: move hw/sysbus.h to hw/core/ Signed-off-by: Paolo Bonzini --- hw/acpi/cxl.c | 2 +- hw/adc/stm32f2xx_adc.c | 2 +- hw/arm/allwinner-a10.c | 2 +- hw/arm/allwinner-h3.c | 2 +- hw/arm/allwinner-r40.c | 2 +- hw/arm/armsse.c | 2 +- hw/arm/armv7m.c | 2 +- hw/arm/bcm2836.c | 2 +- hw/arm/bcm2838.c | 2 +- hw/arm/collie.c | 2 +- hw/arm/exynos4210.c | 2 +- hw/arm/exynos4_boards.c | 2 +- hw/arm/highbank.c | 2 +- hw/arm/integratorcp.c | 2 +- hw/arm/musicpal.c | 2 +- hw/arm/nrf51_soc.c | 2 +- hw/arm/omap1.c | 2 +- hw/arm/realview.c | 2 +- hw/arm/smmuv3.c | 2 +- hw/arm/stellaris.c | 2 +- hw/arm/strongarm.c | 2 +- hw/arm/versatilepb.c | 2 +- hw/arm/vexpress.c | 2 +- hw/arm/virt.c | 2 +- hw/arm/xilinx_zynq.c | 2 +- hw/arm/xlnx-versal-virt.c | 2 +- hw/arm/xlnx-versal.c | 2 +- hw/audio/asc.c | 2 +- hw/audio/cs4231.c | 2 +- hw/audio/marvell_88w8618.c | 2 +- hw/audio/pl041.c | 2 +- hw/avr/atmega.c | 2 +- hw/block/fdc-sysbus.c | 2 +- hw/block/pflash_cfi01.c | 2 +- hw/block/pflash_cfi02.c | 2 +- hw/block/swim.c | 2 +- hw/char/cadence_uart.c | 2 +- hw/char/cmsdk-apb-uart.c | 2 +- hw/char/digic-uart.c | 2 +- hw/char/escc.c | 2 +- hw/char/exynos4210_uart.c | 2 +- hw/char/goldfish_tty.c | 2 +- hw/char/grlib_apbuart.c | 2 +- hw/char/mcf_uart.c | 2 +- hw/char/pl011.c | 2 +- hw/char/sh_serial.c | 2 +- hw/char/xilinx_uartlite.c | 2 +- hw/core/qdev.c | 2 +- hw/core/sysbus.c | 2 +- hw/display/apple-gfx-mmio.m | 2 +- hw/display/artist.c | 2 +- hw/display/cg3.c | 2 +- hw/display/exynos4210_fimd.c | 2 +- hw/display/g364fb.c | 2 +- hw/display/jazz_led.c | 2 +- hw/display/macfb.c | 2 +- hw/display/pl110.c | 2 +- hw/display/sm501.c | 2 +- hw/display/tcx.c | 2 +- hw/display/vga-mmio.c | 2 +- hw/dma/pl080.c | 2 +- hw/dma/pl330.c | 2 +- hw/dma/rc4030.c | 2 +- hw/dma/sifive_pdma.c | 2 +- hw/dma/sparc32_dma.c | 2 +- hw/dma/xilinx_axidma.c | 2 +- hw/dma/xlnx_csu_dma.c | 2 +- hw/gpio/bcm2835_gpio.c | 2 +- hw/gpio/bcm2838_gpio.c | 2 +- hw/gpio/gpio_key.c | 2 +- hw/gpio/gpio_pwr.c | 2 +- hw/gpio/mpc8xxx.c | 2 +- hw/gpio/omap_gpio.c | 2 +- hw/gpio/pl061.c | 2 +- hw/gpio/zaurus.c | 2 +- hw/hyperv/vmbus.c | 2 +- hw/i2c/aspeed_i2c.c | 2 +- hw/i2c/bitbang_i2c.c | 2 +- hw/i2c/exynos4210_i2c.c | 2 +- hw/i2c/i2c_mux_pca954x.c | 2 +- hw/i2c/mpc_i2c.c | 2 +- hw/i2c/omap_i2c.c | 2 +- hw/i386/intel_iommu.c | 2 +- hw/i386/kvm/clock.c | 2 +- hw/i386/kvm/xen_evtchn.c | 2 +- hw/i386/kvm/xen_evtchn.h | 2 +- hw/i386/kvm/xen_gnttab.c | 2 +- hw/i386/kvm/xen_overlay.c | 2 +- hw/i386/kvm/xen_primary_console.c | 2 +- hw/i386/kvm/xen_xenstore.c | 2 +- hw/i386/microvm-dt.c | 2 +- hw/i386/nitro_enclave.c | 2 +- hw/i386/pc_piix.c | 2 +- hw/i386/pc_sysfw.c | 2 +- hw/i386/vapic.c | 2 +- hw/i386/x86-iommu.c | 2 +- hw/ide/mmio.c | 2 +- hw/input/lasips2.c | 2 +- hw/input/pl050.c | 2 +- hw/input/ps2.c | 2 +- hw/intc/allwinner-a10-pic.c | 2 +- hw/intc/apic_common.c | 2 +- hw/intc/arm_gic.c | 2 +- hw/intc/arm_gicv2m.c | 2 +- hw/intc/armv7m_nvic.c | 2 +- hw/intc/exynos4210_combiner.c | 2 +- hw/intc/exynos4210_gic.c | 2 +- hw/intc/goldfish_pic.c | 2 +- hw/intc/grlib_irqmp.c | 2 +- hw/intc/ioapic_common.c | 2 +- hw/intc/ioapic_internal.h | 2 +- hw/intc/loongarch_dintc.c | 2 +- hw/intc/loongarch_pch_msi.c | 2 +- hw/intc/loongson_ipi_common.c | 2 +- hw/intc/mips_gic.c | 2 +- hw/intc/omap_intc.c | 2 +- hw/intc/ompic.c | 2 +- hw/intc/openpic.c | 2 +- hw/intc/openpic_kvm.c | 2 +- hw/intc/pl190.c | 2 +- hw/intc/riscv_aclint.c | 2 +- hw/intc/riscv_aplic.c | 2 +- hw/intc/riscv_imsic.c | 2 +- hw/intc/s390_flic.c | 2 +- hw/intc/sifive_plic.c | 2 +- hw/intc/slavio_intctl.c | 2 +- hw/intc/xilinx_intc.c | 2 +- hw/intc/xlnx-pmu-iomod-intc.c | 2 +- hw/intc/xlnx-zynqmp-ipi.c | 2 +- hw/isa/isa-bus.c | 2 +- hw/m68k/mcf5206.c | 2 +- hw/m68k/mcf5208.c | 2 +- hw/m68k/mcf_intc.c | 2 +- hw/m68k/next-cube.c | 2 +- hw/m68k/next-kbd.c | 2 +- hw/m68k/q800.c | 2 +- hw/m68k/virt.c | 2 +- hw/mem/sparse-mem.c | 2 +- hw/microblaze/petalogix_ml605_mmu.c | 2 +- hw/microblaze/petalogix_s3adsp1800_mmu.c | 2 +- hw/mips/jazz.c | 2 +- hw/mips/malta.c | 2 +- hw/misc/allwinner-a10-ccm.c | 2 +- hw/misc/allwinner-a10-dramc.c | 2 +- hw/misc/allwinner-cpucfg.c | 2 +- hw/misc/allwinner-h3-ccu.c | 2 +- hw/misc/allwinner-h3-dramc.c | 2 +- hw/misc/allwinner-h3-sysctrl.c | 2 +- hw/misc/allwinner-r40-ccu.c | 2 +- hw/misc/allwinner-r40-dramc.c | 2 +- hw/misc/allwinner-sid.c | 2 +- hw/misc/allwinner-sramc.c | 2 +- hw/misc/arm_integrator_debug.c | 2 +- hw/misc/arm_l2x0.c | 2 +- hw/misc/arm_sysctl.c | 2 +- hw/misc/armsse-cpu-pwrctrl.c | 2 +- hw/misc/armsse-cpuid.c | 2 +- hw/misc/armsse-mhu.c | 2 +- hw/misc/eccmemctl.c | 2 +- hw/misc/empty_slot.c | 2 +- hw/misc/exynos4210_clk.c | 2 +- hw/misc/exynos4210_pmu.c | 2 +- hw/misc/exynos4210_rng.c | 2 +- hw/misc/grlib_ahb_apb_pnp.c | 2 +- hw/misc/iosb.c | 2 +- hw/misc/iotkit-secctl.c | 2 +- hw/misc/iotkit-sysctl.c | 2 +- hw/misc/iotkit-sysinfo.c | 2 +- hw/misc/ivshmem-flat.c | 2 +- hw/misc/mac_via.c | 2 +- hw/misc/mchp_pfsoc_dmc.c | 2 +- hw/misc/mchp_pfsoc_ioscb.c | 2 +- hw/misc/mchp_pfsoc_sysreg.c | 2 +- hw/misc/mips_cmgcr.c | 2 +- hw/misc/mips_cpc.c | 2 +- hw/misc/mps2-fpgaio.c | 2 +- hw/misc/mps2-scc.c | 2 +- hw/misc/pvpanic-mmio.c | 2 +- hw/misc/sbsa_ec.c | 2 +- hw/misc/sifive_e_prci.c | 2 +- hw/misc/sifive_test.c | 2 +- hw/misc/sifive_u_otp.c | 2 +- hw/misc/sifive_u_prci.c | 2 +- hw/misc/slavio_misc.c | 2 +- hw/misc/tz-mpc.c | 2 +- hw/misc/tz-msc.c | 2 +- hw/misc/tz-ppc.c | 2 +- hw/misc/unimp.c | 2 +- hw/misc/virt_ctrl.c | 2 +- hw/misc/xlnx-versal-cframe-reg.c | 2 +- hw/misc/xlnx-versal-cfu.c | 2 +- hw/misc/xlnx-versal-crl.c | 2 +- hw/misc/xlnx-versal-pmc-iou-slcr.c | 2 +- hw/misc/xlnx-versal-xramc.c | 2 +- hw/misc/xlnx-zynqmp-apu-ctrl.c | 2 +- hw/misc/xlnx-zynqmp-crf.c | 2 +- hw/misc/zynq_slcr.c | 2 +- hw/net/allwinner-sun8i-emac.c | 2 +- hw/net/allwinner_emac.c | 2 +- hw/net/can/xlnx-versal-canfd.c | 2 +- hw/net/can/xlnx-zynqmp-can.c | 2 +- hw/net/dp8393x.c | 2 +- hw/net/fsl_etsec/etsec.c | 2 +- hw/net/fsl_etsec/etsec.h | 2 +- hw/net/lan9118.c | 2 +- hw/net/lasi_i82596.c | 2 +- hw/net/mcf_fec.c | 2 +- hw/net/mv88w8618_eth.c | 2 +- hw/net/opencores_eth.c | 2 +- hw/net/smc91c111.c | 2 +- hw/net/stellaris_enet.c | 2 +- hw/net/xgmac.c | 2 +- hw/net/xilinx_axienet.c | 2 +- hw/net/xilinx_ethlite.c | 2 +- hw/nubus/mac-nubus-bridge.c | 2 +- hw/nubus/nubus-bridge.c | 2 +- hw/nvram/ds1225y.c | 2 +- hw/nvram/fw_cfg.c | 2 +- hw/openrisc/openrisc_sim.c | 2 +- hw/openrisc/virt.c | 2 +- hw/pci-bridge/cxl_root_port.c | 2 +- hw/pci-host/i440fx.c | 2 +- hw/pci-host/mv64361.c | 2 +- hw/pci-host/sabre.c | 2 +- hw/pci-host/sh_pci.c | 2 +- hw/pci-host/versatile.c | 2 +- hw/ppc/e500-ccsr.h | 2 +- hw/ppc/e500.c | 2 +- hw/ppc/e500plat.c | 2 +- hw/ppc/mac_newworld.c | 2 +- hw/ppc/mpc8544_guts.c | 2 +- hw/ppc/pegasos.c | 2 +- hw/ppc/pnv_xscom.c | 2 +- hw/ppc/ppc440_bamboo.c | 2 +- hw/ppc/ppce500_spin.c | 2 +- hw/ppc/sam460ex.c | 2 +- hw/ppc/spapr_pci.c | 2 +- hw/ppc/spapr_vio.c | 2 +- hw/ppc/virtex_ml507.c | 2 +- hw/riscv/microblaze-v-generic.c | 2 +- hw/riscv/microchip_pfsoc.c | 2 +- hw/riscv/riscv-iommu-sys.c | 2 +- hw/riscv/riscv_hart.c | 2 +- hw/riscv/sifive_e.c | 2 +- hw/riscv/sifive_u.c | 2 +- hw/riscv/spike.c | 2 +- hw/riscv/virt.c | 2 +- hw/rtc/allwinner-rtc.c | 2 +- hw/rtc/exynos4210_rtc.c | 2 +- hw/rtc/goldfish_rtc.c | 2 +- hw/rtc/ls7a_rtc.c | 2 +- hw/rtc/m48t59.c | 2 +- hw/rtc/pl031.c | 2 +- hw/rtc/sun4v-rtc.c | 2 +- hw/rtc/xlnx-zynqmp-rtc.c | 2 +- hw/rx/rx62n.c | 2 +- hw/s390x/ap-bridge.c | 2 +- hw/s390x/css-bridge.c | 2 +- hw/scsi/esp.c | 2 +- hw/scsi/lasi_ncr710.c | 2 +- hw/scsi/lasi_ncr710.h | 2 +- hw/scsi/ncr53c710.c | 2 +- hw/scsi/ncr53c710.h | 2 +- hw/sd/omap_mmc.c | 2 +- hw/sd/pl181.c | 2 +- hw/sh4/r2d.c | 2 +- hw/sh4/sh7750.c | 2 +- hw/sparc/sun4m.c | 2 +- hw/sparc/sun4m_iommu.c | 2 +- hw/sparc64/sun4u.c | 2 +- hw/sparc64/sun4u_iommu.c | 2 +- hw/ssi/aspeed_smc.c | 2 +- hw/ssi/pl022.c | 2 +- hw/ssi/sifive_spi.c | 2 +- hw/ssi/xilinx_spi.c | 2 +- hw/ssi/xilinx_spips.c | 2 +- hw/ssi/xlnx-versal-ospi.c | 2 +- hw/timer/allwinner-a10-pit.c | 2 +- hw/timer/arm_timer.c | 2 +- hw/timer/armv7m_systick.c | 2 +- hw/timer/aspeed_timer.c | 2 +- hw/timer/cadence_ttc.c | 2 +- hw/timer/cmsdk-apb-dualtimer.c | 2 +- hw/timer/cmsdk-apb-timer.c | 2 +- hw/timer/digic-timer.c | 2 +- hw/timer/exynos4210_mct.c | 2 +- hw/timer/exynos4210_pwm.c | 2 +- hw/timer/grlib_gptimer.c | 2 +- hw/timer/hpet.c | 2 +- hw/timer/pxa2xx_timer.c | 2 +- hw/timer/slavio_timer.c | 2 +- hw/timer/sse-counter.c | 2 +- hw/timer/sse-timer.c | 2 +- hw/timer/xilinx_timer.c | 2 +- hw/tpm/tpm_tis_i2c.c | 2 +- hw/tpm/tpm_tis_sysbus.c | 2 +- hw/tricore/tc27x_soc.c | 2 +- hw/tricore/tricore_testdevice.c | 2 +- hw/uefi/var-service-sysbus.c | 2 +- hw/usb/hcd-dwc2.h | 2 +- hw/usb/hcd-dwc3.c | 2 +- hw/usb/hcd-ehci.h | 2 +- hw/usb/hcd-ohci-pci.c | 2 +- hw/usb/hcd-ohci-sysbus.c | 2 +- hw/usb/hcd-ohci.c | 2 +- hw/usb/hcd-ohci.h | 2 +- hw/usb/hcd-xhci-sysbus.h | 2 +- hw/usb/xlnx-usb-subsystem.c | 2 +- hw/usb/xlnx-versal-usb2-ctrl-regs.c | 2 +- hw/virtio/virtio-mmio.c | 2 +- hw/vmapple/aes.c | 2 +- hw/vmapple/bdif.c | 2 +- hw/vmapple/cfg.c | 2 +- hw/vmapple/vmapple.c | 2 +- hw/watchdog/allwinner-wdt.c | 2 +- hw/watchdog/cmsdk-apb-watchdog.c | 2 +- hw/watchdog/wdt_aspeed.c | 2 +- hw/xen/xen-bus.c | 2 +- hw/xen/xen-legacy-backend.c | 2 +- hw/xtensa/xtfpga.c | 2 +- include/hw/acpi/generic_event_device.h | 2 +- include/hw/adc/aspeed_adc.h | 2 +- include/hw/adc/npcm7xx_adc.h | 2 +- include/hw/adc/stm32f2xx_adc.h | 2 +- include/hw/adc/zynq-xadc.h | 2 +- include/hw/arm/armsse.h | 2 +- include/hw/arm/armv7m.h | 2 +- include/hw/arm/bcm2835_peripherals.h | 2 +- include/hw/arm/exynos4210.h | 2 +- include/hw/arm/fsl-imx8mp.h | 2 +- include/hw/arm/nrf51_soc.h | 2 +- include/hw/arm/smmu-common.h | 2 +- include/hw/arm/xlnx-versal.h | 2 +- include/hw/audio/asc.h | 2 +- include/hw/block/swim.h | 2 +- include/hw/char/avr_usart.h | 2 +- include/hw/char/bcm2835_aux.h | 2 +- include/hw/char/cadence_uart.h | 2 +- include/hw/char/cmsdk-apb-uart.h | 2 +- include/hw/char/digic-uart.h | 2 +- include/hw/char/escc.h | 2 +- include/hw/char/goldfish_tty.h | 2 +- include/hw/char/ibex_uart.h | 2 +- include/hw/char/imx_serial.h | 2 +- include/hw/char/max78000_uart.h | 2 +- include/hw/char/mchp_pfsoc_mmuart.h | 2 +- include/hw/char/nrf51_uart.h | 2 +- include/hw/char/pl011.h | 2 +- include/hw/char/renesas_sci.h | 2 +- include/hw/char/serial-mm.h | 2 +- include/hw/char/shakti_uart.h | 2 +- include/hw/char/sifive_uart.h | 2 +- include/hw/char/stm32f2xx_usart.h | 2 +- include/hw/char/stm32l4x5_usart.h | 2 +- include/hw/core/or-irq.h | 2 +- include/hw/core/platform-bus.h | 2 +- include/hw/core/split-irq.h | 2 +- include/hw/{ => core}/sysbus.h | 0 include/hw/cpu/a15mpcore.h | 2 +- include/hw/cpu/a9mpcore.h | 2 +- include/hw/cpu/arm11mpcore.h | 2 +- include/hw/display/bcm2835_fb.h | 2 +- include/hw/display/macfb.h | 2 +- include/hw/display/xlnx_dp.h | 2 +- include/hw/dma/bcm2835_dma.h | 2 +- include/hw/dma/pl080.h | 2 +- include/hw/dma/sifive_pdma.h | 2 +- include/hw/dma/xlnx-zdma.h | 2 +- include/hw/dma/xlnx-zynq-devcfg.h | 2 +- include/hw/dma/xlnx_csu_dma.h | 2 +- include/hw/dma/xlnx_dpdma.h | 2 +- include/hw/fsi/aspeed_apb2opb.h | 2 +- include/hw/gpio/aspeed_gpio.h | 2 +- include/hw/gpio/bcm2835_gpio.h | 2 +- include/hw/gpio/bcm2838_gpio.h | 2 +- include/hw/gpio/imx_gpio.h | 2 +- include/hw/gpio/npcm7xx_gpio.h | 2 +- include/hw/gpio/nrf51_gpio.h | 2 +- include/hw/gpio/sifive_gpio.h | 2 +- include/hw/gpio/stm32l4x5_gpio.h | 2 +- include/hw/hyperv/vmbus-bridge.h | 2 +- include/hw/i2c/allwinner-i2c.h | 2 +- include/hw/i2c/arm_sbcon_i2c.h | 2 +- include/hw/i2c/aspeed_i2c.h | 2 +- include/hw/i2c/bcm2835_i2c.h | 2 +- include/hw/i2c/imx_i2c.h | 2 +- include/hw/i2c/microbit_i2c.h | 2 +- include/hw/i2c/npcm7xx_smbus.h | 2 +- include/hw/i2c/ppc4xx_i2c.h | 2 +- include/hw/i386/x86-iommu.h | 2 +- include/hw/ide/ahci-sysbus.h | 2 +- include/hw/input/i8042.h | 2 +- include/hw/input/lasips2.h | 2 +- include/hw/input/pl050.h | 2 +- include/hw/input/ps2.h | 2 +- include/hw/input/stellaris_gamepad.h | 2 +- include/hw/intc/allwinner-a10-pic.h | 2 +- include/hw/intc/arm_gic_common.h | 2 +- include/hw/intc/arm_gicv3_common.h | 2 +- include/hw/intc/arm_gicv3_its_common.h | 2 +- include/hw/intc/armv7m_nvic.h | 2 +- include/hw/intc/aspeed_intc.h | 2 +- include/hw/intc/aspeed_vic.h | 2 +- include/hw/intc/bcm2835_ic.h | 2 +- include/hw/intc/bcm2836_control.h | 2 +- include/hw/intc/exynos4210_combiner.h | 2 +- include/hw/intc/exynos4210_gic.h | 2 +- include/hw/intc/goldfish_pic.h | 2 +- include/hw/intc/grlib_irqmp.h | 2 +- include/hw/intc/heathrow_pic.h | 2 +- include/hw/intc/imx_avic.h | 2 +- include/hw/intc/imx_gpcv2.h | 2 +- include/hw/intc/loongarch_dintc.h | 2 +- include/hw/intc/loongarch_extioi_common.h | 2 +- include/hw/intc/loongarch_pch_msi.h | 2 +- include/hw/intc/loongarch_pic_common.h | 2 +- include/hw/intc/loongson_ipi.h | 2 +- include/hw/intc/loongson_ipi_common.h | 2 +- include/hw/intc/loongson_liointc.h | 2 +- include/hw/intc/m68k_irqc.h | 2 +- include/hw/intc/mips_gic.h | 2 +- include/hw/intc/realview_gic.h | 2 +- include/hw/intc/riscv_aclint.h | 2 +- include/hw/intc/riscv_aplic.h | 2 +- include/hw/intc/riscv_imsic.h | 2 +- include/hw/intc/rx_icu.h | 2 +- include/hw/intc/sifive_plic.h | 2 +- include/hw/intc/xlnx-pmu-iomod-intc.h | 2 +- include/hw/intc/xlnx-zynqmp-ipi.h | 2 +- include/hw/m68k/q800-glue.h | 2 +- include/hw/mem/npcm7xx_mc.h | 2 +- include/hw/mips/cps.h | 2 +- include/hw/misc/a9scu.h | 2 +- include/hw/misc/allwinner-a10-ccm.h | 2 +- include/hw/misc/allwinner-a10-dramc.h | 2 +- include/hw/misc/allwinner-cpucfg.h | 2 +- include/hw/misc/allwinner-h3-ccu.h | 2 +- include/hw/misc/allwinner-h3-dramc.h | 2 +- include/hw/misc/allwinner-h3-sysctrl.h | 2 +- include/hw/misc/allwinner-r40-ccu.h | 2 +- include/hw/misc/allwinner-r40-dramc.h | 2 +- include/hw/misc/allwinner-sid.h | 2 +- include/hw/misc/allwinner-sramc.h | 2 +- include/hw/misc/arm11scu.h | 2 +- include/hw/misc/armsse-cpu-pwrctrl.h | 2 +- include/hw/misc/armsse-cpuid.h | 2 +- include/hw/misc/armsse-mhu.h | 2 +- include/hw/misc/armv7m_ras.h | 2 +- include/hw/misc/aspeed_hace.h | 2 +- include/hw/misc/aspeed_i3c.h | 2 +- include/hw/misc/aspeed_lpc.h | 2 +- include/hw/misc/aspeed_peci.h | 2 +- include/hw/misc/aspeed_sbc.h | 2 +- include/hw/misc/aspeed_scu.h | 2 +- include/hw/misc/aspeed_sdmc.h | 2 +- include/hw/misc/aspeed_sli.h | 2 +- include/hw/misc/aspeed_xdma.h | 2 +- include/hw/misc/avr_power.h | 2 +- include/hw/misc/bcm2835_cprman.h | 2 +- include/hw/misc/bcm2835_mbox.h | 2 +- include/hw/misc/bcm2835_mphi.h | 2 +- include/hw/misc/bcm2835_powermgt.h | 2 +- include/hw/misc/bcm2835_property.h | 2 +- include/hw/misc/bcm2835_rng.h | 2 +- include/hw/misc/bcm2835_thermal.h | 2 +- include/hw/misc/djmemc.h | 2 +- include/hw/misc/imx6_src.h | 2 +- include/hw/misc/imx7_gpr.h | 2 +- include/hw/misc/imx7_snvs.h | 2 +- include/hw/misc/imx7_src.h | 2 +- include/hw/misc/imx8mp_analog.h | 2 +- include/hw/misc/imx_ccm.h | 2 +- include/hw/misc/imx_rngc.h | 2 +- include/hw/misc/iotkit-secctl.h | 2 +- include/hw/misc/iotkit-sysctl.h | 2 +- include/hw/misc/iotkit-sysinfo.h | 2 +- include/hw/misc/ivshmem-flat.h | 2 +- include/hw/misc/lasi.h | 2 +- include/hw/misc/mac_via.h | 2 +- include/hw/misc/macio/gpio.h | 2 +- include/hw/misc/max78000_aes.h | 2 +- include/hw/misc/max78000_gcr.h | 2 +- include/hw/misc/max78000_icc.h | 2 +- include/hw/misc/max78000_trng.h | 2 +- include/hw/misc/mchp_pfsoc_dmc.h | 2 +- include/hw/misc/mchp_pfsoc_ioscb.h | 2 +- include/hw/misc/mchp_pfsoc_sysreg.h | 2 +- include/hw/misc/mips_cmgcr.h | 2 +- include/hw/misc/mips_cpc.h | 2 +- include/hw/misc/mips_itu.h | 2 +- include/hw/misc/mos6522.h | 2 +- include/hw/misc/mps2-fpgaio.h | 2 +- include/hw/misc/mps2-scc.h | 2 +- include/hw/misc/msf2-sysreg.h | 2 +- include/hw/misc/npcm7xx_mft.h | 2 +- include/hw/misc/npcm7xx_pwm.h | 2 +- include/hw/misc/npcm7xx_rng.h | 2 +- include/hw/misc/npcm_clk.h | 2 +- include/hw/misc/npcm_gcr.h | 2 +- include/hw/misc/nrf51_rng.h | 2 +- include/hw/misc/sifive_e_aon.h | 2 +- include/hw/misc/sifive_e_prci.h | 2 +- include/hw/misc/sifive_test.h | 2 +- include/hw/misc/sifive_u_otp.h | 2 +- include/hw/misc/sifive_u_prci.h | 2 +- include/hw/misc/stm32_rcc.h | 2 +- include/hw/misc/stm32f2xx_syscfg.h | 2 +- include/hw/misc/stm32f4xx_exti.h | 2 +- include/hw/misc/stm32f4xx_syscfg.h | 2 +- include/hw/misc/stm32l4x5_exti.h | 2 +- include/hw/misc/stm32l4x5_rcc.h | 2 +- include/hw/misc/stm32l4x5_syscfg.h | 2 +- include/hw/misc/tz-mpc.h | 2 +- include/hw/misc/tz-msc.h | 2 +- include/hw/misc/tz-ppc.h | 2 +- include/hw/misc/unimp.h | 2 +- include/hw/misc/virt_ctrl.h | 2 +- include/hw/misc/xlnx-versal-cframe-reg.h | 2 +- include/hw/misc/xlnx-versal-cfu.h | 2 +- include/hw/misc/xlnx-versal-crl.h | 2 +- include/hw/misc/xlnx-versal-pmc-iou-slcr.h | 2 +- include/hw/misc/xlnx-versal-trng.h | 2 +- include/hw/misc/xlnx-versal-xramc.h | 2 +- include/hw/misc/xlnx-zynqmp-apu-ctrl.h | 2 +- include/hw/misc/xlnx-zynqmp-crf.h | 2 +- include/hw/net/allwinner-sun8i-emac.h | 2 +- include/hw/net/allwinner_emac.h | 2 +- include/hw/net/cadence_gem.h | 2 +- include/hw/net/dp8393x.h | 2 +- include/hw/net/ftgmac100.h | 2 +- include/hw/net/imx_fec.h | 2 +- include/hw/net/lan9118_phy.h | 2 +- include/hw/net/lance.h | 2 +- include/hw/net/lasi_82596.h | 2 +- include/hw/net/msf2-emac.h | 2 +- include/hw/net/npcm7xx_emc.h | 2 +- include/hw/net/npcm_gmac.h | 2 +- include/hw/net/npcm_pcs.h | 2 +- include/hw/net/xlnx-zynqmp-can.h | 2 +- include/hw/nubus/nubus.h | 2 +- include/hw/nvram/bcm2835_otp.h | 2 +- include/hw/nvram/fw_cfg.h | 2 +- include/hw/nvram/mac_nvram.h | 2 +- include/hw/nvram/npcm7xx_otp.h | 2 +- include/hw/nvram/nrf51_nvm.h | 2 +- include/hw/nvram/xlnx-bbram.h | 2 +- include/hw/nvram/xlnx-versal-efuse.h | 2 +- include/hw/nvram/xlnx-zynqmp-efuse.h | 2 +- include/hw/pci-host/aspeed_pcie.h | 2 +- include/hw/pci-host/designware.h | 2 +- include/hw/pci-host/fsl_imx8m_phy.h | 2 +- include/hw/pci-host/gpex.h | 2 +- include/hw/pci-host/xilinx-pcie.h | 2 +- include/hw/pci/pci_host.h | 2 +- include/hw/ppc/mac_dbdma.h | 2 +- include/hw/ppc/openpic.h | 2 +- include/hw/ppc/pnv.h | 2 +- include/hw/ppc/pnv_chip.h | 2 +- include/hw/ppc/pnv_pnor.h | 2 +- include/hw/ppc/pnv_psi.h | 2 +- include/hw/ppc/ppc4xx.h | 2 +- include/hw/ppc/xive.h | 2 +- include/hw/ppc/xive2.h | 2 +- include/hw/riscv/numa.h | 2 +- include/hw/riscv/riscv_hart.h | 2 +- include/hw/riscv/spike.h | 2 +- include/hw/riscv/virt.h | 2 +- include/hw/rtc/allwinner-rtc.h | 2 +- include/hw/rtc/aspeed_rtc.h | 2 +- include/hw/rtc/goldfish_rtc.h | 2 +- include/hw/rtc/pl031.h | 2 +- include/hw/rtc/xlnx-zynqmp-rtc.h | 2 +- include/hw/s390x/3270-ccw.h | 2 +- include/hw/s390x/css-bridge.h | 2 +- include/hw/s390x/s390_flic.h | 2 +- include/hw/s390x/sclp.h | 2 +- include/hw/scsi/esp.h | 2 +- include/hw/sd/allwinner-sdhost.h | 2 +- include/hw/sd/bcm2835_sdhost.h | 2 +- include/hw/sd/sdhci.h | 2 +- include/hw/sparc/sparc32_dma.h | 2 +- include/hw/sparc/sun4m_iommu.h | 2 +- include/hw/sparc/sun4u_iommu.h | 2 +- include/hw/ssi/allwinner-a10-spi.h | 2 +- include/hw/ssi/aspeed_smc.h | 2 +- include/hw/ssi/bcm2835_spi.h | 2 +- include/hw/ssi/ibex_spi_host.h | 2 +- include/hw/ssi/imx_spi.h | 2 +- include/hw/ssi/mss-spi.h | 2 +- include/hw/ssi/npcm7xx_fiu.h | 2 +- include/hw/ssi/npcm_pspi.h | 2 +- include/hw/ssi/pl022.h | 2 +- include/hw/ssi/pnv_spi.h | 2 +- include/hw/ssi/sifive_spi.h | 2 +- include/hw/ssi/stm32f2xx_spi.h | 2 +- include/hw/ssi/xilinx_spips.h | 2 +- include/hw/timer/a9gtimer.h | 2 +- include/hw/timer/allwinner-a10-pit.h | 2 +- include/hw/timer/arm_mptimer.h | 2 +- include/hw/timer/armv7m_systick.h | 2 +- include/hw/timer/avr_timer16.h | 2 +- include/hw/timer/bcm2835_systmr.h | 2 +- include/hw/timer/cadence_ttc.h | 2 +- include/hw/timer/cmsdk-apb-dualtimer.h | 2 +- include/hw/timer/cmsdk-apb-timer.h | 2 +- include/hw/timer/digic-timer.h | 2 +- include/hw/timer/ibex_timer.h | 2 +- include/hw/timer/imx_epit.h | 2 +- include/hw/timer/imx_gpt.h | 2 +- include/hw/timer/mss-timer.h | 2 +- include/hw/timer/npcm7xx_timer.h | 2 +- include/hw/timer/nrf51_timer.h | 2 +- include/hw/timer/renesas_cmt.h | 2 +- include/hw/timer/renesas_tmr.h | 2 +- include/hw/timer/sifive_pwm.h | 2 +- include/hw/timer/sse-counter.h | 2 +- include/hw/timer/sse-timer.h | 2 +- include/hw/timer/stellaris-gptm.h | 2 +- include/hw/timer/stm32f2xx_timer.h | 2 +- include/hw/tricore/tc27x_soc.h | 2 +- include/hw/tricore/tricore_testdevice.h | 2 +- include/hw/usb/imx-usb-phy.h | 2 +- include/hw/usb/xlnx-usb-subsystem.h | 2 +- include/hw/usb/xlnx-versal-usb2-ctrl-regs.h | 2 +- include/hw/virtio/virtio-mmio.h | 2 +- include/hw/watchdog/allwinner-wdt.h | 2 +- include/hw/watchdog/cmsdk-apb-watchdog.h | 2 +- include/hw/watchdog/sbsa_gwdt.h | 2 +- include/hw/watchdog/wdt_aspeed.h | 2 +- include/hw/watchdog/wdt_imx2.h | 2 +- include/hw/xen/xen_pvdev.h | 2 +- rust/hw/core/wrapper.h | 2 +- system/qdev-monitor.c | 2 +- 633 files changed, 632 insertions(+), 632 deletions(-) rename include/hw/{ => core}/sysbus.h (100%) diff --git a/hw/acpi/cxl.c b/hw/acpi/cxl.c index 75d5b30bb8..75edb2c0a6 100644 --- a/hw/acpi/cxl.c +++ b/hw/acpi/cxl.c @@ -18,7 +18,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/pci/pci_bridge.h" #include "hw/pci/pci_host.h" #include "hw/cxl/cxl.h" diff --git a/hw/adc/stm32f2xx_adc.c b/hw/adc/stm32f2xx_adc.c index a490ae640d..50a04a0722 100644 --- a/hw/adc/stm32f2xx_adc.c +++ b/hw/adc/stm32f2xx_adc.c @@ -23,7 +23,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/arm/allwinner-a10.c b/hw/arm/allwinner-a10.c index d7508ee0ec..66f30757dd 100644 --- a/hw/arm/allwinner-a10.c +++ b/hw/arm/allwinner-a10.c @@ -20,7 +20,7 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "hw/char/serial-mm.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/arm/allwinner-a10.h" #include "hw/misc/unimp.h" #include "system/system.h" diff --git a/hw/arm/allwinner-h3.c b/hw/arm/allwinner-h3.c index 757c89ef39..262e99b3f9 100644 --- a/hw/arm/allwinner-h3.c +++ b/hw/arm/allwinner-h3.c @@ -23,7 +23,7 @@ #include "qemu/module.h" #include "qemu/units.h" #include "hw/core/qdev.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/char/serial-mm.h" #include "hw/misc/unimp.h" #include "hw/usb/hcd-ehci.h" diff --git a/hw/arm/allwinner-r40.c b/hw/arm/allwinner-r40.c index 396e886af4..a1ae75deb6 100644 --- a/hw/arm/allwinner-r40.c +++ b/hw/arm/allwinner-r40.c @@ -24,7 +24,7 @@ #include "qemu/units.h" #include "hw/core/boards.h" #include "hw/core/qdev.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/char/serial-mm.h" #include "hw/misc/unimp.h" #include "hw/usb/hcd-ehci.h" diff --git a/hw/arm/armsse.c b/hw/arm/armsse.c index b6fc95df3b..ddb210c895 100644 --- a/hw/arm/armsse.c +++ b/hw/arm/armsse.c @@ -16,7 +16,7 @@ #include "qemu/units.h" #include "qapi/error.h" #include "trace.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/core/registerfields.h" #include "hw/arm/armsse.h" diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c index 844d620286..a29eab6c91 100644 --- a/hw/arm/armv7m.c +++ b/hw/arm/armv7m.c @@ -10,7 +10,7 @@ #include "qemu/osdep.h" #include "hw/arm/armv7m.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/arm/boot.h" #include "hw/core/loader.h" #include "hw/core/qdev-properties.h" diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c index cd61ba1505..ee2f44debd 100644 --- a/hw/arm/bcm2836.c +++ b/hw/arm/bcm2836.c @@ -14,7 +14,7 @@ #include "qemu/module.h" #include "hw/arm/bcm2836.h" #include "hw/arm/raspi_platform.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "target/arm/cpu-qom.h" #include "target/arm/gtimer.h" diff --git a/hw/arm/bcm2838.c b/hw/arm/bcm2838.c index 22aa754613..c14a854046 100644 --- a/hw/arm/bcm2838.c +++ b/hw/arm/bcm2838.c @@ -10,7 +10,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "hw/arm/raspi_platform.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/arm/bcm2838.h" #include "trace.h" diff --git a/hw/arm/collie.c b/hw/arm/collie.c index 73c40bc57d..91f0a94b6f 100644 --- a/hw/arm/collie.c +++ b/hw/arm/collie.c @@ -11,7 +11,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "qemu/cutils.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/boards.h" #include "strongarm.h" #include "hw/arm/boot.h" diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c index 5d68579cd6..25c385ba1f 100644 --- a/hw/arm/exynos4210.c +++ b/hw/arm/exynos4210.c @@ -29,7 +29,7 @@ #include "hw/core/irq.h" #include "system/blockdev.h" #include "system/system.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/arm/boot.h" #include "hw/core/loader.h" #include "hw/core/qdev-properties.h" diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c index e8c171f40a..1b8c9b618f 100644 --- a/hw/arm/exynos4_boards.c +++ b/hw/arm/exynos4_boards.c @@ -25,7 +25,7 @@ #include "qemu/units.h" #include "qapi/error.h" #include "qemu/error-report.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "net/net.h" #include "hw/arm/boot.h" #include "hw/arm/machines-qom.h" diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c index b8c1256328..92d497999c 100644 --- a/hw/arm/highbank.c +++ b/hw/arm/highbank.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "qemu/datadir.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/arm/boot.h" #include "hw/arm/machines-qom.h" diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index b24df11db9..118808f2dc 100644 --- a/hw/arm/integratorcp.c +++ b/hw/arm/integratorcp.c @@ -9,7 +9,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/core/boards.h" #include "hw/arm/boot.h" diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index 39e8f69cae..250fdb49b6 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -12,7 +12,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/arm/boot.h" #include "hw/arm/machines-qom.h" diff --git a/hw/arm/nrf51_soc.c b/hw/arm/nrf51_soc.c index a4ccfa373a..8d8ea71da4 100644 --- a/hw/arm/nrf51_soc.c +++ b/hw/arm/nrf51_soc.c @@ -11,7 +11,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/arm/boot.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/qdev-clock.h" #include "hw/misc/unimp.h" #include "qemu/log.h" diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c index fcba6eb52d..f3d6be1e29 100644 --- a/hw/arm/omap1.c +++ b/hw/arm/omap1.c @@ -38,7 +38,7 @@ #include "system/runstate.h" #include "system/rtc.h" #include "qemu/range.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/cutils.h" #include "qemu/bcd.h" #include "target/arm/cpu-qom.h" diff --git a/hw/arm/realview.c b/hw/arm/realview.c index d7f96b9d3e..c9558be4d4 100644 --- a/hw/arm/realview.c +++ b/hw/arm/realview.c @@ -10,7 +10,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "cpu.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/arm/boot.h" #include "hw/arm/primecell.h" #include "hw/arm/machines-qom.h" diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c index e12a64a20f..985dfb345f 100644 --- a/hw/arm/smmuv3.c +++ b/hw/arm/smmuv3.c @@ -19,7 +19,7 @@ #include "qemu/osdep.h" #include "qemu/bitops.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/core/qdev-properties.h" #include "hw/core/qdev.h" diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c index f3e8e15de8..56ecc828f4 100644 --- a/hw/arm/stellaris.c +++ b/hw/arm/stellaris.c @@ -11,7 +11,7 @@ #include "qemu/bitops.h" #include "qapi/error.h" #include "hw/core/split-irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/sd/sd.h" #include "hw/ssi/ssi.h" #include "hw/arm/boot.h" diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c index acc75476c3..5a3242195a 100644 --- a/hw/arm/strongarm.c +++ b/hw/arm/strongarm.c @@ -31,7 +31,7 @@ #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" #include "hw/core/qdev-properties-system.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "strongarm.h" #include "qemu/error-report.h" diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c index 94661b83d0..254b1610b3 100644 --- a/hw/arm/versatilepb.c +++ b/hw/arm/versatilepb.c @@ -9,7 +9,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/arm/boot.h" #include "hw/arm/machines-qom.h" diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index 75cb77da82..cc6ae7d4c4 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/datadir.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/arm/boot.h" #include "hw/arm/primecell.h" #include "hw/arm/machines-qom.h" diff --git a/hw/arm/virt.c b/hw/arm/virt.c index d8773cb541..fd0e28f030 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -34,7 +34,7 @@ #include "qemu/option.h" #include "qemu/target-info.h" #include "monitor/qdev.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/arm/boot.h" #include "hw/arm/primecell.h" #include "hw/arm/virt.h" diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index 0d9c01e4b7..d43f36b718 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -18,7 +18,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/arm/boot.h" #include "hw/arm/machines-qom.h" #include "net/net.h" diff --git a/hw/arm/xlnx-versal-virt.c b/hw/arm/xlnx-versal-virt.c index e82ac8e353..2b04513ba2 100644 --- a/hw/arm/xlnx-versal-virt.c +++ b/hw/arm/xlnx-versal-virt.c @@ -17,7 +17,7 @@ #include "system/address-spaces.h" #include "hw/block/flash.h" #include "hw/core/boards.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/arm/fdt.h" #include "hw/arm/xlnx-versal.h" #include "hw/arm/boot.h" diff --git a/hw/arm/xlnx-versal.c b/hw/arm/xlnx-versal.c index a0b2f18b55..facf92b45c 100644 --- a/hw/arm/xlnx-versal.c +++ b/hw/arm/xlnx-versal.c @@ -15,7 +15,7 @@ #include "qapi/error.h" #include "qobject/qlist.h" #include "qemu/module.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "net/net.h" #include "system/system.h" #include "hw/misc/unimp.h" diff --git a/hw/audio/asc.c b/hw/audio/asc.c index 77a5cc1092..a934c2e82c 100644 --- a/hw/audio/asc.c +++ b/hw/audio/asc.c @@ -13,7 +13,7 @@ #include "qemu/osdep.h" #include "qemu/timer.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "qemu/audio.h" #include "hw/audio/asc.h" diff --git a/hw/audio/cs4231.c b/hw/audio/cs4231.c index 97cceb44d8..bcf98160ec 100644 --- a/hw/audio/cs4231.c +++ b/hw/audio/cs4231.c @@ -23,7 +23,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "trace.h" diff --git a/hw/audio/marvell_88w8618.c b/hw/audio/marvell_88w8618.c index 39f4b4514d..6d5e99123d 100644 --- a/hw/audio/marvell_88w8618.c +++ b/hw/audio/marvell_88w8618.c @@ -11,7 +11,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" diff --git a/hw/audio/pl041.c b/hw/audio/pl041.c index 117b6b0ae6..4a9b8ad65c 100644 --- a/hw/audio/pl041.c +++ b/hw/audio/pl041.c @@ -23,7 +23,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/avr/atmega.c b/hw/avr/atmega.c index b185295d55..280f613af3 100644 --- a/hw/avr/atmega.c +++ b/hw/avr/atmega.c @@ -17,7 +17,7 @@ #include "system/address-spaces.h" #include "system/system.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #include "hw/misc/unimp.h" #include "migration/vmstate.h" diff --git a/hw/block/fdc-sysbus.c b/hw/block/fdc-sysbus.c index 956860ab29..ab57dfd83e 100644 --- a/hw/block/fdc-sysbus.c +++ b/hw/block/fdc-sysbus.c @@ -27,7 +27,7 @@ #include "qapi/error.h" #include "qom/object.h" #include "system/memory.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/block/fdc.h" #include "migration/vmstate.h" #include "fdc-internal.h" diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index d1673a1b41..c0f5b9d8fa 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -48,7 +48,7 @@ #include "qemu/host-utils.h" #include "qemu/log.h" #include "qemu/option.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "system/blockdev.h" #include "system/runstate.h" diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index 423516cb30..6f952fe7de 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -44,7 +44,7 @@ #include "system/block-backend.h" #include "qemu/host-utils.h" #include "qemu/module.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "trace.h" diff --git a/hw/block/swim.c b/hw/block/swim.c index 53ba7fa59c..54b63bfbb5 100644 --- a/hw/block/swim.c +++ b/hw/block/swim.c @@ -14,7 +14,7 @@ #include "qemu/main-loop.h" #include "qapi/error.h" #include "system/block-backend.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/block/block.h" #include "hw/block/swim.h" diff --git a/hw/char/cadence_uart.c b/hw/char/cadence_uart.c index c24ece5fe8..eff6a3c4d1 100644 --- a/hw/char/cadence_uart.c +++ b/hw/char/cadence_uart.c @@ -22,7 +22,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "chardev/char-fe.h" #include "chardev/char-serial.h" diff --git a/hw/char/cmsdk-apb-uart.c b/hw/char/cmsdk-apb-uart.c index 1a83e4a9bd..bf891081dc 100644 --- a/hw/char/cmsdk-apb-uart.c +++ b/hw/char/cmsdk-apb-uart.c @@ -20,7 +20,7 @@ #include "qemu/module.h" #include "qapi/error.h" #include "trace.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/core/registerfields.h" #include "chardev/char-fe.h" diff --git a/hw/char/digic-uart.c b/hw/char/digic-uart.c index 8a704dfcf5..bd669173f0 100644 --- a/hw/char/digic-uart.c +++ b/hw/char/digic-uart.c @@ -27,7 +27,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "chardev/char-fe.h" #include "qemu/log.h" diff --git a/hw/char/escc.c b/hw/char/escc.c index a2fb682f8b..3b46818ecc 100644 --- a/hw/char/escc.c +++ b/hw/char/escc.c @@ -26,7 +26,7 @@ #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" #include "hw/core/qdev-properties-system.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "hw/char/escc.h" diff --git a/hw/char/exynos4210_uart.c b/hw/char/exynos4210_uart.c index d1c2f24915..46fc4e31b8 100644 --- a/hw/char/exynos4210_uart.c +++ b/hw/char/exynos4210_uart.c @@ -20,7 +20,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/error-report.h" diff --git a/hw/char/goldfish_tty.c b/hw/char/goldfish_tty.c index 35bcb2a967..8e1e9228c7 100644 --- a/hw/char/goldfish_tty.c +++ b/hw/char/goldfish_tty.c @@ -10,7 +10,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties-system.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "chardev/char-fe.h" #include "qemu/log.h" diff --git a/hw/char/grlib_apbuart.c b/hw/char/grlib_apbuart.c index 7be847d093..92f534552e 100644 --- a/hw/char/grlib_apbuart.c +++ b/hw/char/grlib_apbuart.c @@ -29,7 +29,7 @@ #include "hw/core/qdev-properties.h" #include "hw/core/qdev-properties-system.h" #include "hw/char/grlib_uart.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/module.h" #include "chardev/char-fe.h" diff --git a/hw/char/mcf_uart.c b/hw/char/mcf_uart.c index 51edf917c9..24fd42da06 100644 --- a/hw/char/mcf_uart.c +++ b/hw/char/mcf_uart.c @@ -8,7 +8,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/module.h" #include "qapi/error.h" #include "hw/m68k/mcf.h" diff --git a/hw/char/pl011.c b/hw/char/pl011.c index 0b0af67798..ac453c1057 100644 --- a/hw/char/pl011.c +++ b/hw/char/pl011.c @@ -22,7 +22,7 @@ #include "qapi/error.h" #include "hw/char/pl011.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/qdev-clock.h" #include "hw/core/qdev-properties.h" #include "hw/core/qdev-properties-system.h" diff --git a/hw/char/sh_serial.c b/hw/char/sh_serial.c index b3bed2bb7b..10f96e3a44 100644 --- a/hw/char/sh_serial.c +++ b/hw/char/sh_serial.c @@ -26,7 +26,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "hw/core/qdev.h" #include "hw/core/qdev-properties.h" diff --git a/hw/char/xilinx_uartlite.c b/hw/char/xilinx_uartlite.c index ba7e9e339b..3ef99adadd 100644 --- a/hw/char/xilinx_uartlite.c +++ b/hw/char/xilinx_uartlite.c @@ -29,7 +29,7 @@ #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" #include "hw/core/qdev-properties-system.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/module.h" #include "chardev/char-fe.h" #include "qom/object.h" diff --git a/hw/core/qdev.c b/hw/core/qdev.c index a3b41286ea..fc3425a8fe 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -35,7 +35,7 @@ #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" #include "hw/core/boards.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/qdev-clock.h" #include "migration/vmstate.h" #include "trace.h" diff --git a/hw/core/sysbus.c b/hw/core/sysbus.c index ae447c1196..3adf2f2faf 100644 --- a/hw/core/sysbus.c +++ b/hw/core/sysbus.c @@ -19,7 +19,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "monitor/monitor.h" #include "system/address-spaces.h" diff --git a/hw/display/apple-gfx-mmio.m b/hw/display/apple-gfx-mmio.m index b83f5f4fe6..983fc1724a 100644 --- a/hw/display/apple-gfx-mmio.m +++ b/hw/display/apple-gfx-mmio.m @@ -15,7 +15,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "block/aio-wait.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "apple-gfx.h" #include "trace.h" diff --git a/hw/display/artist.c b/hw/display/artist.c index 22524d9c5f..206f77afba 100644 --- a/hw/display/artist.c +++ b/hw/display/artist.c @@ -14,7 +14,7 @@ #include "qemu/units.h" #include "qemu/bswap.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/loader.h" #include "hw/core/qdev.h" #include "hw/core/qdev-properties.h" diff --git a/hw/display/cg3.c b/hw/display/cg3.c index f4067d7825..59d66d3d4b 100644 --- a/hw/display/cg3.c +++ b/hw/display/cg3.c @@ -28,7 +28,7 @@ #include "qapi/error.h" #include "qemu/error-report.h" #include "ui/console.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/core/irq.h" #include "hw/core/loader.h" diff --git a/hw/display/exynos4210_fimd.c b/hw/display/exynos4210_fimd.c index 8e3a61ed0e..7f841b8804 100644 --- a/hw/display/exynos4210_fimd.c +++ b/hw/display/exynos4210_fimd.c @@ -26,7 +26,7 @@ #include "hw/core/qdev-properties.h" #include "hw/hw.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "ui/console.h" #include "ui/pixel_ops.h" diff --git a/hw/display/g364fb.c b/hw/display/g364fb.c index 8ed3e6ecc3..2eefafcaf6 100644 --- a/hw/display/g364fb.c +++ b/hw/display/g364fb.c @@ -28,7 +28,7 @@ #include "ui/console.h" #include "ui/pixel_ops.h" #include "trace.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qom/object.h" diff --git a/hw/display/jazz_led.c b/hw/display/jazz_led.c index 90e82b58be..9d62e51bed 100644 --- a/hw/display/jazz_led.c +++ b/hw/display/jazz_led.c @@ -27,7 +27,7 @@ #include "ui/console.h" #include "ui/pixel_ops.h" #include "trace.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qom/object.h" diff --git a/hw/display/macfb.c b/hw/display/macfb.c index fa3572ead3..388f8de507 100644 --- a/hw/display/macfb.c +++ b/hw/display/macfb.c @@ -12,7 +12,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "ui/console.h" #include "ui/pixel_ops.h" #include "hw/nubus/nubus.h" diff --git a/hw/display/pl110.c b/hw/display/pl110.c index 2537c26462..4cd62a9875 100644 --- a/hw/display/pl110.c +++ b/hw/display/pl110.c @@ -9,7 +9,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "ui/console.h" diff --git a/hw/display/sm501.c b/hw/display/sm501.c index 6ccec03fe7..a07aa9886f 100644 --- a/hw/display/sm501.c +++ b/hw/display/sm501.c @@ -32,7 +32,7 @@ #include "hw/usb/hcd-ohci.h" #include "hw/char/serial-mm.h" #include "ui/console.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/pci/pci_device.h" #include "hw/core/qdev-properties.h" diff --git a/hw/display/tcx.c b/hw/display/tcx.c index b208923523..7cba3e25a7 100644 --- a/hw/display/tcx.c +++ b/hw/display/tcx.c @@ -29,7 +29,7 @@ #include "ui/pixel_ops.h" #include "hw/core/loader.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/error-report.h" #include "qemu/module.h" diff --git a/hw/display/vga-mmio.c b/hw/display/vga-mmio.c index 4c497b70f4..1a9608d865 100644 --- a/hw/display/vga-mmio.c +++ b/hw/display/vga-mmio.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/display/vga.h" #include "hw/core/qdev-properties.h" #include "ui/console.h" diff --git a/hw/dma/pl080.c b/hw/dma/pl080.c index bd61d8ed48..514206b7c3 100644 --- a/hw/dma/pl080.c +++ b/hw/dma/pl080.c @@ -8,7 +8,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/dma/pl330.c b/hw/dma/pl330.c index 4f00092f85..5a8df39d8f 100644 --- a/hw/dma/pl330.c +++ b/hw/dma/pl330.c @@ -18,7 +18,7 @@ #include "qemu/cutils.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/timer.h" diff --git a/hw/dma/rc4030.c b/hw/dma/rc4030.c index 8ce74257b6..93db286e69 100644 --- a/hw/dma/rc4030.c +++ b/hw/dma/rc4030.c @@ -26,7 +26,7 @@ #include "qemu/units.h" #include "hw/core/irq.h" #include "hw/mips/mips.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/timer.h" diff --git a/hw/dma/sifive_pdma.c b/hw/dma/sifive_pdma.c index 2fbc37ffd1..2844515b2d 100644 --- a/hw/dma/sifive_pdma.c +++ b/hw/dma/sifive_pdma.c @@ -26,7 +26,7 @@ #include "qapi/error.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "system/dma.h" #include "hw/dma/sifive_pdma.h" diff --git a/hw/dma/sparc32_dma.c b/hw/dma/sparc32_dma.c index 5601d221ec..5b77059986 100644 --- a/hw/dma/sparc32_dma.c +++ b/hw/dma/sparc32_dma.c @@ -30,7 +30,7 @@ #include "hw/core/qdev-properties.h" #include "hw/sparc/sparc32_dma.h" #include "hw/sparc/sun4m_iommu.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "system/dma.h" #include "qapi/error.h" diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c index 90ba7bf057..8488f125b5 100644 --- a/hw/dma/xilinx_axidma.c +++ b/hw/dma/xilinx_axidma.c @@ -23,7 +23,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qapi/error.h" #include "qemu/timer.h" #include "hw/hw.h" diff --git a/hw/dma/xlnx_csu_dma.c b/hw/dma/xlnx_csu_dma.c index b390d09269..436f9915e0 100644 --- a/hw/dma/xlnx_csu_dma.c +++ b/hw/dma/xlnx_csu_dma.c @@ -23,7 +23,7 @@ #include "qapi/error.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "system/dma.h" #include "hw/core/ptimer.h" diff --git a/hw/gpio/bcm2835_gpio.c b/hw/gpio/bcm2835_gpio.c index bd9170b893..d7c44ea2ab 100644 --- a/hw/gpio/bcm2835_gpio.c +++ b/hw/gpio/bcm2835_gpio.c @@ -16,7 +16,7 @@ #include "qemu/module.h" #include "qemu/timer.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/sd/sd.h" #include "hw/gpio/bcm2835_gpio.h" diff --git a/hw/gpio/bcm2838_gpio.c b/hw/gpio/bcm2838_gpio.c index dab50faf28..4ae7706b9a 100644 --- a/hw/gpio/bcm2838_gpio.c +++ b/hw/gpio/bcm2838_gpio.c @@ -15,7 +15,7 @@ #include "qemu/module.h" #include "qemu/timer.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/sd/sd.h" #include "hw/gpio/bcm2838_gpio.h" diff --git a/hw/gpio/gpio_key.c b/hw/gpio/gpio_key.c index f8cf4da239..14e0fb9d4c 100644 --- a/hw/gpio/gpio_key.c +++ b/hw/gpio/gpio_key.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "qemu/timer.h" diff --git a/hw/gpio/gpio_pwr.c b/hw/gpio/gpio_pwr.c index 2d14f8b344..a60b24a553 100644 --- a/hw/gpio/gpio_pwr.c +++ b/hw/gpio/gpio_pwr.c @@ -23,7 +23,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "system/runstate.h" #define TYPE_GPIOPWR "gpio-pwr" diff --git a/hw/gpio/mpc8xxx.c b/hw/gpio/mpc8xxx.c index 377832e9d2..2e882329f0 100644 --- a/hw/gpio/mpc8xxx.c +++ b/hw/gpio/mpc8xxx.c @@ -21,7 +21,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qom/object.h" diff --git a/hw/gpio/omap_gpio.c b/hw/gpio/omap_gpio.c index 0c2a0f9aa6..f7619260ca 100644 --- a/hw/gpio/omap_gpio.c +++ b/hw/gpio/omap_gpio.c @@ -23,7 +23,7 @@ #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" #include "hw/arm/omap.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/error-report.h" #include "qemu/module.h" #include "qapi/error.h" diff --git a/hw/gpio/pl061.c b/hw/gpio/pl061.c index 55f51b6cf2..d6a4fb90b9 100644 --- a/hw/gpio/pl061.c +++ b/hw/gpio/pl061.c @@ -31,7 +31,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/qdev-properties.h" #include "migration/vmstate.h" #include "qapi/error.h" diff --git a/hw/gpio/zaurus.c b/hw/gpio/zaurus.c index 0a9f76e774..3cf626a550 100644 --- a/hw/gpio/zaurus.c +++ b/hw/gpio/zaurus.c @@ -18,7 +18,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "qemu/log.h" diff --git a/hw/hyperv/vmbus.c b/hw/hyperv/vmbus.c index 86b53a23ad..c01f339236 100644 --- a/hw/hyperv/vmbus.c +++ b/hw/hyperv/vmbus.c @@ -18,7 +18,7 @@ #include "hw/hyperv/hyperv.h" #include "hw/hyperv/vmbus.h" #include "hw/hyperv/vmbus-bridge.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "exec/target_page.h" #include "trace.h" diff --git a/hw/i2c/aspeed_i2c.c b/hw/i2c/aspeed_i2c.c index 1f9ce131bf..faf2160c06 100644 --- a/hw/i2c/aspeed_i2c.c +++ b/hw/i2c/aspeed_i2c.c @@ -19,7 +19,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/cutils.h" #include "qemu/log.h" diff --git a/hw/i2c/bitbang_i2c.c b/hw/i2c/bitbang_i2c.c index d379cfd775..1f5d66ce33 100644 --- a/hw/i2c/bitbang_i2c.c +++ b/hw/i2c/bitbang_i2c.c @@ -13,7 +13,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/i2c/bitbang_i2c.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/module.h" #include "qom/object.h" #include "trace.h" diff --git a/hw/i2c/exynos4210_i2c.c b/hw/i2c/exynos4210_i2c.c index dd72dda4fd..9fac588e82 100644 --- a/hw/i2c/exynos4210_i2c.c +++ b/hw/i2c/exynos4210_i2c.c @@ -23,7 +23,7 @@ #include "qemu/osdep.h" #include "qemu/module.h" #include "qemu/timer.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/i2c/i2c.h" #include "hw/core/irq.h" diff --git a/hw/i2c/i2c_mux_pca954x.c b/hw/i2c/i2c_mux_pca954x.c index 7802c68452..c603446028 100644 --- a/hw/i2c/i2c_mux_pca954x.c +++ b/hw/i2c/i2c_mux_pca954x.c @@ -21,7 +21,7 @@ #include "hw/i2c/smbus_slave.h" #include "hw/core/qdev.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/log.h" #include "qemu/module.h" #include "qemu/queue.h" diff --git a/hw/i2c/mpc_i2c.c b/hw/i2c/mpc_i2c.c index e2097f819c..abb2240f9f 100644 --- a/hw/i2c/mpc_i2c.c +++ b/hw/i2c/mpc_i2c.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "hw/i2c/i2c.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qom/object.h" #include "trace.h" diff --git a/hw/i2c/omap_i2c.c b/hw/i2c/omap_i2c.c index c768f99e38..e0798f2c8a 100644 --- a/hw/i2c/omap_i2c.c +++ b/hw/i2c/omap_i2c.c @@ -24,7 +24,7 @@ #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" #include "hw/arm/omap.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/error-report.h" #include "qapi/error.h" diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index f744be9f70..224b7b9479 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -23,7 +23,7 @@ #include "qemu/error-report.h" #include "qemu/main-loop.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "intel_iommu_internal.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bus.h" diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c index 310b9a8eb5..8ca88afae2 100644 --- a/hw/i386/kvm/clock.c +++ b/hw/i386/kvm/clock.c @@ -21,7 +21,7 @@ #include "system/hw_accel.h" #include "kvm/kvm_i386.h" #include "migration/vmstate.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/i386/kvm/clock.h" #include "hw/core/qdev-properties.h" #include "qapi/error.h" diff --git a/hw/i386/kvm/xen_evtchn.c b/hw/i386/kvm/xen_evtchn.c index a510ab871d..b65871f354 100644 --- a/hw/i386/kvm/xen_evtchn.c +++ b/hw/i386/kvm/xen_evtchn.c @@ -27,7 +27,7 @@ #include "migration/vmstate.h" #include "trace.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/xen/xen.h" #include "hw/i386/x86.h" #include "hw/i386/pc.h" diff --git a/hw/i386/kvm/xen_evtchn.h b/hw/i386/kvm/xen_evtchn.h index 0521ebc092..8d339db560 100644 --- a/hw/i386/kvm/xen_evtchn.h +++ b/hw/i386/kvm/xen_evtchn.h @@ -12,7 +12,7 @@ #ifndef QEMU_XEN_EVTCHN_H #define QEMU_XEN_EVTCHN_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" typedef uint32_t evtchn_port_t; diff --git a/hw/i386/kvm/xen_gnttab.c b/hw/i386/kvm/xen_gnttab.c index 4b9e272c5e..85b324e62d 100644 --- a/hw/i386/kvm/xen_gnttab.c +++ b/hw/i386/kvm/xen_gnttab.c @@ -20,7 +20,7 @@ #include "system/address-spaces.h" #include "migration/vmstate.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/xen/xen.h" #include "hw/xen/xen_backend_ops.h" #include "xen_overlay.h" diff --git a/hw/i386/kvm/xen_overlay.c b/hw/i386/kvm/xen_overlay.c index 3cb7361937..74cadffb72 100644 --- a/hw/i386/kvm/xen_overlay.c +++ b/hw/i386/kvm/xen_overlay.c @@ -19,7 +19,7 @@ #include "system/address-spaces.h" #include "migration/vmstate.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/xen/xen.h" #include "xen_overlay.h" diff --git a/hw/i386/kvm/xen_primary_console.c b/hw/i386/kvm/xen_primary_console.c index 6e9d6417c3..bf61f6235b 100644 --- a/hw/i386/kvm/xen_primary_console.c +++ b/hw/i386/kvm/xen_primary_console.c @@ -13,7 +13,7 @@ #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/xen/xen.h" #include "hw/xen/xen_backend_ops.h" #include "xen_evtchn.h" diff --git a/hw/i386/kvm/xen_xenstore.c b/hw/i386/kvm/xen_xenstore.c index 42955cccd9..0dc0edf3bf 100644 --- a/hw/i386/kvm/xen_xenstore.c +++ b/hw/i386/kvm/xen_xenstore.c @@ -20,7 +20,7 @@ #include "qom/object.h" #include "migration/vmstate.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/xen/xen.h" #include "hw/xen/xen_backend_ops.h" #include "xen_overlay.h" diff --git a/hw/i386/microvm-dt.c b/hw/i386/microvm-dt.c index 81eaddafc8..45fbb5bbd1 100644 --- a/hw/i386/microvm-dt.c +++ b/hw/i386/microvm-dt.c @@ -37,7 +37,7 @@ #include "hw/char/serial-isa.h" #include "hw/i386/fw_cfg.h" #include "hw/rtc/mc146818rtc.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/virtio/virtio-mmio.h" #include "hw/usb/xhci.h" diff --git a/hw/i386/nitro_enclave.c b/hw/i386/nitro_enclave.c index 5ee50f3b85..640b1d8c54 100644 --- a/hw/i386/nitro_enclave.c +++ b/hw/i386/nitro_enclave.c @@ -14,7 +14,7 @@ #include "qom/object_interfaces.h" #include "chardev/char.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/eif.h" #include "hw/i386/x86.h" #include "hw/i386/microvm.h" diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 3f8fd07831..2e2671d605 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -41,7 +41,7 @@ #include "hw/core/irq.h" #include "system/kvm.h" #include "hw/i386/kvm/clock.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/i2c/smbus_eeprom.h" #include "system/memory.h" #include "hw/acpi/acpi.h" diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c index 906df5e788..d8a86756ca 100644 --- a/hw/i386/pc_sysfw.c +++ b/hw/i386/pc_sysfw.c @@ -29,7 +29,7 @@ #include "qemu/error-report.h" #include "qemu/option.h" #include "qemu/units.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/i386/x86.h" #include "hw/i386/pc.h" #include "hw/core/loader.h" diff --git a/hw/i386/vapic.c b/hw/i386/vapic.c index 3a4254638b..32f92a28b8 100644 --- a/hw/i386/vapic.c +++ b/hw/i386/vapic.c @@ -19,7 +19,7 @@ #include "system/runstate.h" #include "system/address-spaces.h" #include "hw/i386/apic_internal.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/boards.h" #include "migration/vmstate.h" #include "qom/object.h" diff --git a/hw/i386/x86-iommu.c b/hw/i386/x86-iommu.c index 21e0d40e11..33ac0bfc97 100644 --- a/hw/i386/x86-iommu.c +++ b/hw/i386/x86-iommu.c @@ -18,7 +18,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/i386/x86-iommu.h" #include "hw/core/qdev-properties.h" #include "hw/i386/pc.h" diff --git a/hw/ide/mmio.c b/hw/ide/mmio.c index 04b56ac5d8..0de904ac56 100644 --- a/hw/ide/mmio.c +++ b/hw/ide/mmio.c @@ -24,7 +24,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "system/dma.h" diff --git a/hw/input/lasips2.c b/hw/input/lasips2.c index e34e9cb5c0..c03a127f3d 100644 --- a/hw/input/lasips2.c +++ b/hw/input/lasips2.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/input/ps2.h" #include "hw/input/lasips2.h" #include "exec/hwaddr.h" diff --git a/hw/input/pl050.c b/hw/input/pl050.c index cb8efc74f7..48df2734e2 100644 --- a/hw/input/pl050.c +++ b/hw/input/pl050.c @@ -16,7 +16,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/input/ps2.h" #include "hw/input/pl050.h" diff --git a/hw/input/ps2.c b/hw/input/ps2.c index 96850124a7..10ac732403 100644 --- a/hw/input/ps2.c +++ b/hw/input/ps2.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/input/ps2.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 0e1ec521e4..8e17a77c80 100644 --- a/hw/intc/allwinner-a10-pic.c +++ b/hw/intc/allwinner-a10-pic.c @@ -16,7 +16,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/intc/allwinner-a10-pic.h" #include "hw/core/irq.h" diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c index afac20440f..4e9e308994 100644 --- a/hw/intc/apic_common.c +++ b/hw/intc/apic_common.c @@ -30,7 +30,7 @@ #include "hw/core/boards.h" #include "system/kvm.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" bool apic_report_tpr_access; diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c index e27bb20bf8..4d0cb125a6 100644 --- a/hw/intc/arm_gic.c +++ b/hw/intc/arm_gic.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "gic_internal.h" #include "qapi/error.h" #include "hw/core/cpu.h" diff --git a/hw/intc/arm_gicv2m.c b/hw/intc/arm_gicv2m.c index c39d31b187..b343e17ca5 100644 --- a/hw/intc/arm_gicv2m.c +++ b/hw/intc/arm_gicv2m.c @@ -27,7 +27,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "hw/pci/msi.h" #include "hw/core/qdev-properties.h" diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c index 5fa210c633..3a31eb56f3 100644 --- a/hw/intc/armv7m_nvic.c +++ b/hw/intc/armv7m_nvic.c @@ -12,7 +12,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/timer.h" #include "hw/intc/armv7m_nvic.h" diff --git a/hw/intc/exynos4210_combiner.c b/hw/intc/exynos4210_combiner.c index 8bea69d91b..ec935a084d 100644 --- a/hw/intc/exynos4210_combiner.c +++ b/hw/intc/exynos4210_combiner.c @@ -28,7 +28,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "hw/intc/exynos4210_combiner.h" diff --git a/hw/intc/exynos4210_gic.c b/hw/intc/exynos4210_gic.c index a65c9c6d28..d15e41174a 100644 --- a/hw/intc/exynos4210_gic.c +++ b/hw/intc/exynos4210_gic.c @@ -21,7 +21,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/module.h" diff --git a/hw/intc/goldfish_pic.c b/hw/intc/goldfish_pic.c index 96e7d5c225..16f351a30d 100644 --- a/hw/intc/goldfish_pic.c +++ b/hw/intc/goldfish_pic.c @@ -10,7 +10,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "trace.h" diff --git a/hw/intc/grlib_irqmp.c b/hw/intc/grlib_irqmp.c index ce7cbc98c1..d860ec15d8 100644 --- a/hw/intc/grlib_irqmp.c +++ b/hw/intc/grlib_irqmp.c @@ -28,7 +28,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/qdev-properties.h" #include "hw/intc/grlib_irqmp.h" diff --git a/hw/intc/ioapic_common.c b/hw/intc/ioapic_common.c index fce3486e51..d3bcd5699f 100644 --- a/hw/intc/ioapic_common.c +++ b/hw/intc/ioapic_common.c @@ -26,7 +26,7 @@ #include "hw/intc/intc.h" #include "hw/intc/ioapic.h" #include "hw/intc/ioapic_internal.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" /* ioapic_no count start from 0 to MAX_IOAPICS, * remove as static variable from ioapic_common_init. diff --git a/hw/intc/ioapic_internal.h b/hw/intc/ioapic_internal.h index 51205767f4..499b997d4b 100644 --- a/hw/intc/ioapic_internal.h +++ b/hw/intc/ioapic_internal.h @@ -24,7 +24,7 @@ #include "system/memory.h" #include "hw/intc/ioapic.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/notify.h" #include "qom/object.h" diff --git a/hw/intc/loongarch_dintc.c b/hw/intc/loongarch_dintc.c index 574e4a0d27..c42a919df4 100644 --- a/hw/intc/loongarch_dintc.c +++ b/hw/intc/loongarch_dintc.c @@ -6,7 +6,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "hw/intc/loongarch_pch_msi.h" #include "hw/intc/loongarch_pch_pic.h" diff --git a/hw/intc/loongarch_pch_msi.c b/hw/intc/loongarch_pch_msi.c index 63090b2726..3656c6cea9 100644 --- a/hw/intc/loongarch_pch_msi.c +++ b/hw/intc/loongarch_pch_msi.c @@ -6,7 +6,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "hw/intc/loongarch_pch_msi.h" #include "hw/intc/loongarch_pch_pic.h" diff --git a/hw/intc/loongson_ipi_common.c b/hw/intc/loongson_ipi_common.c index b3d8e781ca..d9d8a374d3 100644 --- a/hw/intc/loongson_ipi_common.c +++ b/hw/intc/loongson_ipi_common.c @@ -6,7 +6,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/intc/loongson_ipi_common.h" #include "hw/core/irq.h" #include "qemu/log.h" diff --git a/hw/intc/mips_gic.c b/hw/intc/mips_gic.c index e983f3a2b5..ad9363a4c7 100644 --- a/hw/intc/mips_gic.c +++ b/hw/intc/mips_gic.c @@ -13,7 +13,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "system/memory.h" #include "system/kvm.h" #include "system/reset.h" diff --git a/hw/intc/omap_intc.c b/hw/intc/omap_intc.c index deb21f9dc1..b2438d2d5f 100644 --- a/hw/intc/omap_intc.c +++ b/hw/intc/omap_intc.c @@ -22,7 +22,7 @@ #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" #include "hw/arm/omap.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/error-report.h" #include "qemu/module.h" #include "qapi/error.h" diff --git a/hw/intc/ompic.c b/hw/intc/ompic.c index 05f0ef8254..58736cd8a0 100644 --- a/hw/intc/ompic.c +++ b/hw/intc/ompic.c @@ -11,7 +11,7 @@ #include "qapi/error.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "system/memory.h" #include "qom/object.h" diff --git a/hw/intc/openpic.c b/hw/intc/openpic.c index 4cc5068ffc..cd353a04f5 100644 --- a/hw/intc/openpic.c +++ b/hw/intc/openpic.c @@ -36,7 +36,7 @@ #include "hw/ppc/openpic.h" #include "hw/ppc/ppc_e500.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/pci/msi.h" #include "qapi/error.h" diff --git a/hw/intc/openpic_kvm.c b/hw/intc/openpic_kvm.c index 6558135baa..9aafef5d9e 100644 --- a/hw/intc/openpic_kvm.c +++ b/hw/intc/openpic_kvm.c @@ -29,7 +29,7 @@ #include "hw/ppc/openpic_kvm.h" #include "hw/pci/msi.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "system/kvm.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/intc/pl190.c b/hw/intc/pl190.c index f1e4959e9a..d53292d15e 100644 --- a/hw/intc/pl190.c +++ b/hw/intc/pl190.c @@ -9,7 +9,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/intc/riscv_aclint.c b/hw/intc/riscv_aclint.c index 83968ad7cc..9c1491bd04 100644 --- a/hw/intc/riscv_aclint.c +++ b/hw/intc/riscv_aclint.c @@ -26,7 +26,7 @@ #include "qemu/error-report.h" #include "qemu/log.h" #include "qemu/module.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "target/riscv/cpu.h" #include "target/riscv/time_helper.h" #include "hw/core/qdev-properties.h" diff --git a/hw/intc/riscv_aplic.c b/hw/intc/riscv_aplic.c index cc5f30b558..92ff0ecaa7 100644 --- a/hw/intc/riscv_aplic.c +++ b/hw/intc/riscv_aplic.c @@ -23,7 +23,7 @@ #include "qemu/error-report.h" #include "qemu/bswap.h" #include "system/address-spaces.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/pci/msi.h" #include "hw/core/boards.h" #include "hw/core/qdev-properties.h" diff --git a/hw/intc/riscv_imsic.c b/hw/intc/riscv_imsic.c index bc580c000e..7c9a012033 100644 --- a/hw/intc/riscv_imsic.c +++ b/hw/intc/riscv_imsic.c @@ -23,7 +23,7 @@ #include "qemu/error-report.h" #include "qemu/bswap.h" #include "system/address-spaces.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/pci/msi.h" #include "hw/core/boards.h" #include "hw/core/qdev-properties.h" diff --git a/hw/intc/s390_flic.c b/hw/intc/s390_flic.c index 508b58382e..57fd4b2b81 100644 --- a/hw/intc/s390_flic.c +++ b/hw/intc/s390_flic.c @@ -14,7 +14,7 @@ #include "qemu/error-report.h" #include "qemu/main-loop.h" #include "qemu/module.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/s390x/ioinst.h" #include "hw/s390x/s390_flic.h" #include "hw/core/qdev-properties.h" diff --git a/hw/intc/sifive_plic.c b/hw/intc/sifive_plic.c index 5df578822f..9c84ff06a9 100644 --- a/hw/intc/sifive_plic.c +++ b/hw/intc/sifive_plic.c @@ -23,7 +23,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "qemu/error-report.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/pci/msi.h" #include "hw/core/qdev-properties.h" #include "hw/intc/sifive_plic.h" diff --git a/hw/intc/slavio_intctl.c b/hw/intc/slavio_intctl.c index b12c8cbd69..640d8e2baa 100644 --- a/hw/intc/slavio_intctl.c +++ b/hw/intc/slavio_intctl.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "migration/vmstate.h" #include "qemu/module.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/intc/intc.h" #include "hw/core/irq.h" #include "trace.h" diff --git a/hw/intc/xilinx_intc.c b/hw/intc/xilinx_intc.c index f93f0d6e7e..782a286e43 100644 --- a/hw/intc/xilinx_intc.c +++ b/hw/intc/xilinx_intc.c @@ -27,7 +27,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/module.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" diff --git a/hw/intc/xlnx-pmu-iomod-intc.c b/hw/intc/xlnx-pmu-iomod-intc.c index b8bafe2f3f..0d9e85473d 100644 --- a/hw/intc/xlnx-pmu-iomod-intc.c +++ b/hw/intc/xlnx-pmu-iomod-intc.c @@ -25,7 +25,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/core/register.h" #include "qemu/bitops.h" diff --git a/hw/intc/xlnx-zynqmp-ipi.c b/hw/intc/xlnx-zynqmp-ipi.c index e69ea74ff7..3538a0e5db 100644 --- a/hw/intc/xlnx-zynqmp-ipi.c +++ b/hw/intc/xlnx-zynqmp-ipi.c @@ -26,7 +26,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/core/register.h" #include "qemu/bitops.h" diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c index 6c9802eb7a..7e6d2ce5a9 100644 --- a/hw/isa/isa-bus.c +++ b/hw/isa/isa-bus.c @@ -21,7 +21,7 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "system/system.h" #include "hw/isa/isa.h" diff --git a/hw/m68k/mcf5206.c b/hw/m68k/mcf5206.c index 4bc7b1d189..c5befa02eb 100644 --- a/hw/m68k/mcf5206.c +++ b/hw/m68k/mcf5206.c @@ -17,7 +17,7 @@ #include "qemu/timer.h" #include "hw/core/ptimer.h" #include "system/system.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" /* General purpose timer module. */ typedef struct { diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c index 3a87e1f282..c6d1c5fae9 100644 --- a/hw/m68k/mcf5208.c +++ b/hw/m68k/mcf5208.c @@ -31,7 +31,7 @@ #include "net/net.h" #include "hw/core/boards.h" #include "hw/core/loader.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "elf.h" #define SYS_FREQ 166666666 diff --git a/hw/m68k/mcf_intc.c b/hw/m68k/mcf_intc.c index b8770e3a53..20112c94be 100644 --- a/hw/m68k/mcf_intc.c +++ b/hw/m68k/mcf_intc.c @@ -12,7 +12,7 @@ #include "qemu/log.h" #include "cpu.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/m68k/mcf.h" #include "hw/core/qdev-properties.h" #include "qom/object.h" diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c index 75ae66c311..ca3df7b887 100644 --- a/hw/m68k/next-cube.c +++ b/hw/m68k/next-cube.c @@ -20,7 +20,7 @@ #include "hw/core/boards.h" #include "hw/core/loader.h" #include "hw/scsi/esp.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #include "hw/char/escc.h" /* ZILOG 8530 Serial Emulation */ #include "hw/block/fdc.h" diff --git a/hw/m68k/next-kbd.c b/hw/m68k/next-kbd.c index 2bec945acf..571a955504 100644 --- a/hw/m68k/next-kbd.c +++ b/hw/m68k/next-kbd.c @@ -29,7 +29,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/m68k/next-cube.h" #include "ui/console.h" #include "migration/vmstate.h" diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c index 6fe030e8c5..25ddddb5d9 100644 --- a/hw/m68k/q800.c +++ b/hw/m68k/q800.c @@ -33,7 +33,7 @@ #include "hw/core/loader.h" #include "ui/console.h" #include "hw/char/escc.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/scsi/esp.h" #include "standard-headers/asm-m68k/bootinfo.h" #include "standard-headers/asm-m68k/bootinfo-mac.h" diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c index 2d83919fa8..7be3a24800 100644 --- a/hw/m68k/virt.c +++ b/hw/m68k/virt.c @@ -18,7 +18,7 @@ #include "elf.h" #include "hw/core/loader.h" #include "ui/console.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "standard-headers/asm-m68k/bootinfo.h" #include "standard-headers/asm-m68k/bootinfo-virt.h" #include "bootinfo.h" diff --git a/hw/mem/sparse-mem.c b/hw/mem/sparse-mem.c index 9186da6b1a..3b754de887 100644 --- a/hw/mem/sparse-mem.c +++ b/hw/mem/sparse-mem.c @@ -14,7 +14,7 @@ #include "qemu/error-report.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qapi/error.h" #include "qemu/units.h" #include "system/qtest.h" diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c index 51ee237d58..b3bdc4d65f 100644 --- a/hw/microblaze/petalogix_ml605_mmu.c +++ b/hw/microblaze/petalogix_ml605_mmu.c @@ -29,7 +29,7 @@ #include "qemu/units.h" #include "qapi/error.h" #include "cpu.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "net/net.h" #include "hw/block/flash.h" #include "system/system.h" diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c index 266ecf9e8a..2a853a7fa5 100644 --- a/hw/microblaze/petalogix_s3adsp1800_mmu.c +++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c @@ -27,7 +27,7 @@ #include "qemu/units.h" #include "qapi/error.h" #include "cpu.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "net/net.h" #include "hw/block/flash.h" #include "system/system.h" diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c index fb01af8ece..e0adb96c54 100644 --- a/hw/mips/jazz.c +++ b/hw/mips/jazz.c @@ -43,7 +43,7 @@ #include "hw/display/bochs-vbe.h" #include "hw/audio/pcspk.h" #include "hw/input/i8042.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "system/qtest.h" #include "system/reset.h" #include "qapi/error.h" diff --git a/hw/mips/malta.c b/hw/mips/malta.c index e5ed0b5692..812ff64d83 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -47,7 +47,7 @@ #include "hw/core/loader.h" #include "elf.h" #include "qom/object.h" -#include "hw/sysbus.h" /* SysBusDevice */ +#include "hw/core/sysbus.h" /* SysBusDevice */ #include "qemu/host-utils.h" #include "system/qtest.h" #include "system/reset.h" diff --git a/hw/misc/allwinner-a10-ccm.c b/hw/misc/allwinner-a10-ccm.c index 6b188c25a5..dc7f8ff205 100644 --- a/hw/misc/allwinner-a10-ccm.c +++ b/hw/misc/allwinner-a10-ccm.c @@ -22,7 +22,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/allwinner-a10-dramc.c b/hw/misc/allwinner-a10-dramc.c index c16814cc5b..757f2cad95 100644 --- a/hw/misc/allwinner-a10-dramc.c +++ b/hw/misc/allwinner-a10-dramc.c @@ -22,7 +22,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/allwinner-cpucfg.c b/hw/misc/allwinner-cpucfg.c index 90dd872abf..3a1526bda0 100644 --- a/hw/misc/allwinner-cpucfg.c +++ b/hw/misc/allwinner-cpucfg.c @@ -19,7 +19,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/allwinner-h3-ccu.c b/hw/misc/allwinner-h3-ccu.c index be91c0c1ca..ac5ae01acc 100644 --- a/hw/misc/allwinner-h3-ccu.c +++ b/hw/misc/allwinner-h3-ccu.c @@ -19,7 +19,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/allwinner-h3-dramc.c b/hw/misc/allwinner-h3-dramc.c index ef491b36ff..10d929a303 100644 --- a/hw/misc/allwinner-h3-dramc.c +++ b/hw/misc/allwinner-h3-dramc.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "qemu/error-report.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/allwinner-h3-sysctrl.c b/hw/misc/allwinner-h3-sysctrl.c index 6b86524606..d37c0a6e26 100644 --- a/hw/misc/allwinner-h3-sysctrl.c +++ b/hw/misc/allwinner-h3-sysctrl.c @@ -19,7 +19,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/allwinner-r40-ccu.c b/hw/misc/allwinner-r40-ccu.c index 4e21eeafdd..8ba4e7aa42 100644 --- a/hw/misc/allwinner-r40-ccu.c +++ b/hw/misc/allwinner-r40-ccu.c @@ -19,7 +19,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/allwinner-r40-dramc.c b/hw/misc/allwinner-r40-dramc.c index 3af8af733a..8e6aa7c310 100644 --- a/hw/misc/allwinner-r40-dramc.c +++ b/hw/misc/allwinner-r40-dramc.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "qemu/error-report.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/allwinner-sid.c b/hw/misc/allwinner-sid.c index 92a0c7918b..b5f827d4bd 100644 --- a/hw/misc/allwinner-sid.c +++ b/hw/misc/allwinner-sid.c @@ -19,7 +19,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/allwinner-sramc.c b/hw/misc/allwinner-sramc.c index 423e0a844f..1d30f8cf32 100644 --- a/hw/misc/allwinner-sramc.c +++ b/hw/misc/allwinner-sramc.c @@ -19,7 +19,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/arm_integrator_debug.c b/hw/misc/arm_integrator_debug.c index 9a19727829..9ac6a50a93 100644 --- a/hw/misc/arm_integrator_debug.c +++ b/hw/misc/arm_integrator_debug.c @@ -15,7 +15,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/misc/arm_integrator_debug.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/arm_l2x0.c b/hw/misc/arm_l2x0.c index a5511845c7..039f1b0f2c 100644 --- a/hw/misc/arm_l2x0.c +++ b/hw/misc/arm_l2x0.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/arm_sysctl.c b/hw/misc/arm_sysctl.c index 0c91ebafac..2a317ac7f5 100644 --- a/hw/misc/arm_sysctl.c +++ b/hw/misc/arm_sysctl.c @@ -13,7 +13,7 @@ #include "qemu/timer.h" #include "system/runstate.h" #include "qemu/bitops.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/arm/primecell.h" #include "qemu/log.h" diff --git a/hw/misc/armsse-cpu-pwrctrl.c b/hw/misc/armsse-cpu-pwrctrl.c index 87770facfc..86a26a8ac5 100644 --- a/hw/misc/armsse-cpu-pwrctrl.c +++ b/hw/misc/armsse-cpu-pwrctrl.c @@ -21,7 +21,7 @@ #include "trace.h" #include "qapi/error.h" #include "migration/vmstate.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/registerfields.h" #include "hw/misc/armsse-cpu-pwrctrl.h" diff --git a/hw/misc/armsse-cpuid.c b/hw/misc/armsse-cpuid.c index 0383312551..ea2a099ccb 100644 --- a/hw/misc/armsse-cpuid.c +++ b/hw/misc/armsse-cpuid.c @@ -23,7 +23,7 @@ #include "qemu/module.h" #include "trace.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/registerfields.h" #include "hw/misc/armsse-cpuid.h" #include "hw/core/qdev-properties.h" diff --git a/hw/misc/armsse-mhu.c b/hw/misc/armsse-mhu.c index 6fbe2cca37..48c4b59067 100644 --- a/hw/misc/armsse-mhu.c +++ b/hw/misc/armsse-mhu.c @@ -20,7 +20,7 @@ #include "qemu/module.h" #include "trace.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/core/registerfields.h" #include "hw/core/irq.h" diff --git a/hw/misc/eccmemctl.c b/hw/misc/eccmemctl.c index f93cbd1659..dd1be7d698 100644 --- a/hw/misc/eccmemctl.c +++ b/hw/misc/eccmemctl.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "trace.h" diff --git a/hw/misc/empty_slot.c b/hw/misc/empty_slot.c index a012668214..aab9373c09 100644 --- a/hw/misc/empty_slot.c +++ b/hw/misc/empty_slot.c @@ -10,7 +10,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/qdev-properties.h" #include "hw/misc/empty_slot.h" #include "qapi/error.h" diff --git a/hw/misc/exynos4210_clk.c b/hw/misc/exynos4210_clk.c index fdf5bdd603..e752679219 100644 --- a/hw/misc/exynos4210_clk.c +++ b/hw/misc/exynos4210_clk.c @@ -18,7 +18,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/exynos4210_pmu.c b/hw/misc/exynos4210_pmu.c index a86ec9aba8..0be793b3aa 100644 --- a/hw/misc/exynos4210_pmu.c +++ b/hw/misc/exynos4210_pmu.c @@ -25,7 +25,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "system/runstate.h" diff --git a/hw/misc/exynos4210_rng.c b/hw/misc/exynos4210_rng.c index 2d0ebc457b..3f743b4750 100644 --- a/hw/misc/exynos4210_rng.c +++ b/hw/misc/exynos4210_rng.c @@ -18,7 +18,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/log.h" diff --git a/hw/misc/grlib_ahb_apb_pnp.c b/hw/misc/grlib_ahb_apb_pnp.c index cdca00ad54..0d12bcde9d 100644 --- a/hw/misc/grlib_ahb_apb_pnp.c +++ b/hw/misc/grlib_ahb_apb_pnp.c @@ -23,7 +23,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/misc/grlib_ahb_apb_pnp.h" #include "trace.h" diff --git a/hw/misc/iosb.c b/hw/misc/iosb.c index 96221e1ee5..ea63e34b93 100644 --- a/hw/misc/iosb.c +++ b/hw/misc/iosb.c @@ -10,7 +10,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "migration/vmstate.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/misc/iosb.h" #include "trace.h" diff --git a/hw/misc/iotkit-secctl.c b/hw/misc/iotkit-secctl.c index 832b021777..54bfe1ba59 100644 --- a/hw/misc/iotkit-secctl.c +++ b/hw/misc/iotkit-secctl.c @@ -14,7 +14,7 @@ #include "qemu/module.h" #include "qapi/error.h" #include "trace.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/core/registerfields.h" #include "hw/core/irq.h" diff --git a/hw/misc/iotkit-sysctl.c b/hw/misc/iotkit-sysctl.c index d673ae326b..dff89c677f 100644 --- a/hw/misc/iotkit-sysctl.c +++ b/hw/misc/iotkit-sysctl.c @@ -23,7 +23,7 @@ #include "system/runstate.h" #include "trace.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/core/registerfields.h" #include "hw/misc/iotkit-sysctl.h" diff --git a/hw/misc/iotkit-sysinfo.c b/hw/misc/iotkit-sysinfo.c index 3b4d228e3e..19f089e6ee 100644 --- a/hw/misc/iotkit-sysinfo.c +++ b/hw/misc/iotkit-sysinfo.c @@ -22,7 +22,7 @@ #include "qemu/module.h" #include "trace.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/registerfields.h" #include "hw/misc/iotkit-sysinfo.h" #include "hw/core/qdev-properties.h" diff --git a/hw/misc/ivshmem-flat.c b/hw/misc/ivshmem-flat.c index 1248f9e81b..920aa4943a 100644 --- a/hw/misc/ivshmem-flat.c +++ b/hw/misc/ivshmem-flat.c @@ -15,7 +15,7 @@ #include "qapi/error.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties-system.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "chardev/char-fe.h" #include "system/address-spaces.h" #include "trace.h" diff --git a/hw/misc/mac_via.c b/hw/misc/mac_via.c index 0c608c3dc6..26ee230dcc 100644 --- a/hw/misc/mac_via.c +++ b/hw/misc/mac_via.c @@ -18,7 +18,7 @@ #include "qemu/osdep.h" #include "system/address-spaces.h" #include "migration/vmstate.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "qemu/timer.h" #include "hw/misc/mac_via.h" diff --git a/hw/misc/mchp_pfsoc_dmc.c b/hw/misc/mchp_pfsoc_dmc.c index 599f845f45..1fe4535464 100644 --- a/hw/misc/mchp_pfsoc_dmc.c +++ b/hw/misc/mchp_pfsoc_dmc.c @@ -24,7 +24,7 @@ #include "qemu/bitops.h" #include "qemu/log.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/misc/mchp_pfsoc_dmc.h" /* DDR SGMII PHY module */ diff --git a/hw/misc/mchp_pfsoc_ioscb.c b/hw/misc/mchp_pfsoc_ioscb.c index 84e957244e..05538d012a 100644 --- a/hw/misc/mchp_pfsoc_ioscb.c +++ b/hw/misc/mchp_pfsoc_ioscb.c @@ -25,7 +25,7 @@ #include "qemu/log.h" #include "qapi/error.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/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 2a41515103..f190ecc78e 100644 --- a/hw/misc/mchp_pfsoc_sysreg.c +++ b/hw/misc/mchp_pfsoc_sysreg.c @@ -25,7 +25,7 @@ #include "qemu/log.h" #include "qapi/error.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/misc/mchp_pfsoc_sysreg.h" #include "system/runstate.h" diff --git a/hw/misc/mips_cmgcr.c b/hw/misc/mips_cmgcr.c index 1c6e9d1f6f..3e262e828b 100644 --- a/hw/misc/mips_cmgcr.c +++ b/hw/misc/mips_cmgcr.c @@ -12,7 +12,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "qemu/module.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/misc/mips_cmgcr.h" #include "hw/misc/mips_cpc.h" diff --git a/hw/misc/mips_cpc.c b/hw/misc/mips_cpc.c index efc0326f6f..924de855ee 100644 --- a/hw/misc/mips_cpc.c +++ b/hw/misc/mips_cpc.c @@ -22,7 +22,7 @@ #include "cpu.h" #include "qemu/log.h" #include "qemu/module.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/misc/mips_cpc.h" diff --git a/hw/misc/mps2-fpgaio.c b/hw/misc/mps2-fpgaio.c index 9cd5e9884c..da78cb6070 100644 --- a/hw/misc/mps2-fpgaio.c +++ b/hw/misc/mps2-fpgaio.c @@ -20,7 +20,7 @@ #include "qemu/module.h" #include "qapi/error.h" #include "trace.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/core/registerfields.h" #include "hw/misc/mps2-fpgaio.h" diff --git a/hw/misc/mps2-scc.c b/hw/misc/mps2-scc.c index 06d436cf58..350bba3dab 100644 --- a/hw/misc/mps2-scc.c +++ b/hw/misc/mps2-scc.c @@ -22,7 +22,7 @@ #include "qemu/module.h" #include "qemu/bitops.h" #include "trace.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "migration/vmstate.h" #include "hw/core/registerfields.h" diff --git a/hw/misc/pvpanic-mmio.c b/hw/misc/pvpanic-mmio.c index 2d1464435a..a173a1a9a5 100644 --- a/hw/misc/pvpanic-mmio.c +++ b/hw/misc/pvpanic-mmio.c @@ -10,7 +10,7 @@ #include "hw/core/qdev-properties.h" #include "hw/misc/pvpanic.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "standard-headers/misc/pvpanic.h" OBJECT_DECLARE_SIMPLE_TYPE(PVPanicMMIOState, PVPANIC_MMIO_DEVICE) diff --git a/hw/misc/sbsa_ec.c b/hw/misc/sbsa_ec.c index dfee1af5ad..93296d3350 100644 --- a/hw/misc/sbsa_ec.c +++ b/hw/misc/sbsa_ec.c @@ -12,7 +12,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "system/runstate.h" typedef struct SECUREECState { diff --git a/hw/misc/sifive_e_prci.c b/hw/misc/sifive_e_prci.c index a8702c6a5d..400664aaba 100644 --- a/hw/misc/sifive_e_prci.c +++ b/hw/misc/sifive_e_prci.c @@ -19,7 +19,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qapi/error.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/sifive_test.c b/hw/misc/sifive_test.c index b94bb2d29d..41f102e2dc 100644 --- a/hw/misc/sifive_test.c +++ b/hw/misc/sifive_test.c @@ -19,7 +19,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qapi/error.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/sifive_u_otp.c b/hw/misc/sifive_u_otp.c index 899bc31745..7205374bc3 100644 --- a/hw/misc/sifive_u_otp.c +++ b/hw/misc/sifive_u_otp.c @@ -22,7 +22,7 @@ #include "qapi/error.h" #include "hw/core/qdev-properties.h" #include "hw/core/qdev-properties-system.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/error-report.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/sifive_u_prci.c b/hw/misc/sifive_u_prci.c index 6e75cb6d0d..f51588623a 100644 --- a/hw/misc/sifive_u_prci.c +++ b/hw/misc/sifive_u_prci.c @@ -19,7 +19,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/log.h" #include "qemu/module.h" #include "hw/misc/sifive_u_prci.h" diff --git a/hw/misc/slavio_misc.c b/hw/misc/slavio_misc.c index 43ce5d0bc9..49be827c45 100644 --- a/hw/misc/slavio_misc.c +++ b/hw/misc/slavio_misc.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "system/runstate.h" diff --git a/hw/misc/tz-mpc.c b/hw/misc/tz-mpc.c index 65517d390d..02fe0bcb1d 100644 --- a/hw/misc/tz-mpc.c +++ b/hw/misc/tz-mpc.c @@ -14,7 +14,7 @@ #include "qemu/module.h" #include "qapi/error.h" #include "trace.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/core/registerfields.h" #include "hw/core/irq.h" diff --git a/hw/misc/tz-msc.c b/hw/misc/tz-msc.c index dd845193d6..9d9fc072ff 100644 --- a/hw/misc/tz-msc.c +++ b/hw/misc/tz-msc.c @@ -14,7 +14,7 @@ #include "qemu/module.h" #include "qapi/error.h" #include "trace.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/core/registerfields.h" #include "hw/core/irq.h" diff --git a/hw/misc/tz-ppc.c b/hw/misc/tz-ppc.c index 7b812a034b..159073d1e6 100644 --- a/hw/misc/tz-ppc.c +++ b/hw/misc/tz-ppc.c @@ -14,7 +14,7 @@ #include "qemu/module.h" #include "qapi/error.h" #include "trace.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/core/registerfields.h" #include "hw/core/irq.h" diff --git a/hw/misc/unimp.c b/hw/misc/unimp.c index 4370c14ef1..521b84bf20 100644 --- a/hw/misc/unimp.c +++ b/hw/misc/unimp.c @@ -12,7 +12,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/misc/unimp.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/misc/virt_ctrl.c b/hw/misc/virt_ctrl.c index 7cb1ea5d18..40747925a2 100644 --- a/hw/misc/virt_ctrl.c +++ b/hw/misc/virt_ctrl.c @@ -6,7 +6,7 @@ #include "qemu/osdep.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "trace.h" diff --git a/hw/misc/xlnx-versal-cframe-reg.c b/hw/misc/xlnx-versal-cframe-reg.c index efacbe83ab..47d3b9e84a 100644 --- a/hw/misc/xlnx-versal-cframe-reg.c +++ b/hw/misc/xlnx-versal-cframe-reg.c @@ -9,7 +9,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #include "hw/core/registerfields.h" #include "qemu/bitops.h" diff --git a/hw/misc/xlnx-versal-cfu.c b/hw/misc/xlnx-versal-cfu.c index bdce0ce747..86df37d6e8 100644 --- a/hw/misc/xlnx-versal-cfu.c +++ b/hw/misc/xlnx-versal-cfu.c @@ -11,7 +11,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #include "hw/core/irq.h" #include "qemu/bitops.h" diff --git a/hw/misc/xlnx-versal-crl.c b/hw/misc/xlnx-versal-crl.c index 9bbf44def6..1379974f81 100644 --- a/hw/misc/xlnx-versal-crl.c +++ b/hw/misc/xlnx-versal-crl.c @@ -10,7 +10,7 @@ #include "qemu/osdep.h" #include "migration/vmstate.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "hw/core/register.h" #include "hw/core/resettable.h" diff --git a/hw/misc/xlnx-versal-pmc-iou-slcr.c b/hw/misc/xlnx-versal-pmc-iou-slcr.c index 0246167a5e..57a24641cf 100644 --- a/hw/misc/xlnx-versal-pmc-iou-slcr.c +++ b/hw/misc/xlnx-versal-pmc-iou-slcr.c @@ -24,7 +24,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #include "hw/core/irq.h" #include "qemu/bitops.h" diff --git a/hw/misc/xlnx-versal-xramc.c b/hw/misc/xlnx-versal-xramc.c index f4f02c7680..da8c98ae03 100644 --- a/hw/misc/xlnx-versal-xramc.c +++ b/hw/misc/xlnx-versal-xramc.c @@ -10,7 +10,7 @@ #include "qemu/units.h" #include "qapi/error.h" #include "migration/vmstate.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #include "hw/core/qdev-properties.h" #include "hw/core/irq.h" diff --git a/hw/misc/xlnx-zynqmp-apu-ctrl.c b/hw/misc/xlnx-zynqmp-apu-ctrl.c index 957043f01b..c46951d552 100644 --- a/hw/misc/xlnx-zynqmp-apu-ctrl.c +++ b/hw/misc/xlnx-zynqmp-apu-ctrl.c @@ -13,7 +13,7 @@ #include "qemu/log.h" #include "migration/vmstate.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "hw/core/register.h" diff --git a/hw/misc/xlnx-zynqmp-crf.c b/hw/misc/xlnx-zynqmp-crf.c index a2ebf6ce5d..1f7107c322 100644 --- a/hw/misc/xlnx-zynqmp-crf.c +++ b/hw/misc/xlnx-zynqmp-crf.c @@ -7,7 +7,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #include "qemu/bitops.h" #include "qemu/log.h" diff --git a/hw/misc/zynq_slcr.c b/hw/misc/zynq_slcr.c index d7d490b093..faae98fa02 100644 --- a/hw/misc/zynq_slcr.c +++ b/hw/misc/zynq_slcr.c @@ -17,7 +17,7 @@ #include "qemu/osdep.h" #include "qemu/timer.h" #include "system/runstate.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/net/allwinner-sun8i-emac.c b/hw/net/allwinner-sun8i-emac.c index 8ff0db5ccd..9b7c67ae8e 100644 --- a/hw/net/allwinner-sun8i-emac.c +++ b/hw/net/allwinner-sun8i-emac.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "net/net.h" #include "hw/core/irq.h" diff --git a/hw/net/allwinner_emac.c b/hw/net/allwinner_emac.c index cbe4cb80e4..55d1b6a9a6 100644 --- a/hw/net/allwinner_emac.c +++ b/hw/net/allwinner_emac.c @@ -18,7 +18,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "net/net.h" #include "qemu/fifo8.h" diff --git a/hw/net/can/xlnx-versal-canfd.c b/hw/net/can/xlnx-versal-canfd.c index 3ceb1a8b91..4a7cdc31ee 100644 --- a/hw/net/can/xlnx-versal-canfd.c +++ b/hw/net/can/xlnx-versal-canfd.c @@ -31,7 +31,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "hw/core/register.h" #include "qapi/error.h" diff --git a/hw/net/can/xlnx-zynqmp-can.c b/hw/net/can/xlnx-zynqmp-can.c index 6c583cab8f..bccf624016 100644 --- a/hw/net/can/xlnx-zynqmp-can.c +++ b/hw/net/can/xlnx-zynqmp-can.c @@ -30,7 +30,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #include "hw/core/irq.h" #include "qapi/error.h" diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c index 182f0e5f6b..5b611fcbbe 100644 --- a/hw/net/dp8393x.c +++ b/hw/net/dp8393x.c @@ -21,7 +21,7 @@ #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" #include "hw/net/dp8393x.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "net/net.h" #include "qapi/error.h" diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c index 5b77528e36..1d61d918b8 100644 --- a/hw/net/fsl_etsec/etsec.c +++ b/hw/net/fsl_etsec/etsec.c @@ -27,7 +27,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "hw/net/mii.h" #include "hw/core/ptimer.h" diff --git a/hw/net/fsl_etsec/etsec.h b/hw/net/fsl_etsec/etsec.h index ca8ad5638a..24e1344bf1 100644 --- a/hw/net/fsl_etsec/etsec.h +++ b/hw/net/fsl_etsec/etsec.h @@ -25,7 +25,7 @@ #ifndef ETSEC_H #define ETSEC_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "net/net.h" #include "hw/core/ptimer.h" #include "qom/object.h" diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c index 381fd38764..072a741d81 100644 --- a/hw/net/lan9118.c +++ b/hw/net/lan9118.c @@ -11,7 +11,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "net/net.h" #include "net/eth.h" diff --git a/hw/net/lasi_i82596.c b/hw/net/lasi_i82596.c index 50e3c4fa86..423a8676a0 100644 --- a/hw/net/lasi_i82596.c +++ b/hw/net/lasi_i82596.c @@ -13,7 +13,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/timer.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "system/system.h" #include "net/eth.h" #include "hw/net/lasi_82596.h" diff --git a/hw/net/mcf_fec.c b/hw/net/mcf_fec.c index ecf105adf2..5f267e5ea3 100644 --- a/hw/net/mcf_fec.c +++ b/hw/net/mcf_fec.c @@ -15,7 +15,7 @@ #include "hw/m68k/mcf_fec.h" #include "hw/net/mii.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include /* for crc32 */ //#define DEBUG_FEC 1 diff --git a/hw/net/mv88w8618_eth.c b/hw/net/mv88w8618_eth.c index 1a1bba8b57..1fcfbe912e 100644 --- a/hw/net/mv88w8618_eth.c +++ b/hw/net/mv88w8618_eth.c @@ -8,7 +8,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "hw/net/mv88w8618_eth.h" #include "migration/vmstate.h" diff --git a/hw/net/opencores_eth.c b/hw/net/opencores_eth.c index 34992f3cc9..ec3301414c 100644 --- a/hw/net/opencores_eth.c +++ b/hw/net/opencores_eth.c @@ -35,7 +35,7 @@ #include "hw/core/irq.h" #include "hw/net/mii.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "net/net.h" #include "qemu/module.h" #include "net/eth.h" diff --git a/hw/net/smc91c111.c b/hw/net/smc91c111.c index d6f57bc004..3420d8e28e 100644 --- a/hw/net/smc91c111.c +++ b/hw/net/smc91c111.c @@ -8,7 +8,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "net/net.h" #include "hw/core/irq.h" diff --git a/hw/net/stellaris_enet.c b/hw/net/stellaris_enet.c index c97d694585..ac7924bdd9 100644 --- a/hw/net/stellaris_enet.c +++ b/hw/net/stellaris_enet.c @@ -10,7 +10,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "net/net.h" #include "qemu/log.h" diff --git a/hw/net/xgmac.c b/hw/net/xgmac.c index f07be72512..8d316e94c1 100644 --- a/hw/net/xgmac.c +++ b/hw/net/xgmac.c @@ -27,7 +27,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "net/net.h" diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c index 451f8da212..29c09b88eb 100644 --- a/hw/net/xilinx_axienet.c +++ b/hw/net/xilinx_axienet.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qapi/error.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/net/xilinx_ethlite.c b/hw/net/xilinx_ethlite.c index 72b14811a9..ba3acd4c77 100644 --- a/hw/net/xilinx_ethlite.c +++ b/hw/net/xilinx_ethlite.c @@ -31,7 +31,7 @@ #include "qemu/bitops.h" #include "qom/object.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" #include "hw/core/qdev-properties-system.h" diff --git a/hw/nubus/mac-nubus-bridge.c b/hw/nubus/mac-nubus-bridge.c index 0dac8d19b3..dc9ae6d21f 100644 --- a/hw/nubus/mac-nubus-bridge.c +++ b/hw/nubus/mac-nubus-bridge.c @@ -9,7 +9,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/nubus/mac-nubus-bridge.h" diff --git a/hw/nubus/nubus-bridge.c b/hw/nubus/nubus-bridge.c index fb14402c4f..f0e1620ee0 100644 --- a/hw/nubus/nubus-bridge.c +++ b/hw/nubus/nubus-bridge.c @@ -9,7 +9,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/nubus/nubus.h" diff --git a/hw/nvram/ds1225y.c b/hw/nvram/ds1225y.c index 512e548518..4f35bfebda 100644 --- a/hw/nvram/ds1225y.c +++ b/hw/nvram/ds1225y.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "trace.h" #include "qemu/error-report.h" diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index e5c35b0e2e..437ab6e210 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -31,7 +31,7 @@ #include "hw/core/boards.h" #include "hw/nvram/fw_cfg.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/qemu-file-types.h" #include "migration/vmstate.h" #include "trace.h" diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c index bafb877cc3..603d8ca0d9 100644 --- a/hw/openrisc/openrisc_sim.c +++ b/hw/openrisc/openrisc_sim.c @@ -31,7 +31,7 @@ #include "system/address-spaces.h" #include "system/device_tree.h" #include "system/system.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "system/qtest.h" #include "system/reset.h" #include "hw/core/split-irq.h" diff --git a/hw/openrisc/virt.c b/hw/openrisc/virt.c index 446a81579c..54ce96666e 100644 --- a/hw/openrisc/virt.c +++ b/hw/openrisc/virt.c @@ -22,7 +22,7 @@ #include "hw/pci-host/gpex.h" #include "hw/core/qdev-properties.h" #include "hw/rtc/goldfish_rtc.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/virtio/virtio-mmio.h" #include "system/device_tree.h" #include "system/system.h" diff --git a/hw/pci-bridge/cxl_root_port.c b/hw/pci-bridge/cxl_root_port.c index 616d5d934c..197d3148d2 100644 --- a/hw/pci-bridge/cxl_root_port.c +++ b/hw/pci-bridge/cxl_root_port.c @@ -25,7 +25,7 @@ #include "hw/pci/msi.h" #include "hw/core/qdev-properties.h" #include "hw/core/qdev-properties-system.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qapi/error.h" #include "hw/cxl/cxl.h" diff --git a/hw/pci-host/i440fx.c b/hw/pci-host/i440fx.c index 15354abf3b..e7d638b296 100644 --- a/hw/pci-host/i440fx.c +++ b/hw/pci-host/i440fx.c @@ -30,7 +30,7 @@ #include "hw/pci/pci_host.h" #include "hw/pci-host/i440fx.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qapi/error.h" #include "migration/vmstate.h" #include "qapi/visitor.h" diff --git a/hw/pci-host/mv64361.c b/hw/pci-host/mv64361.c index 636228c407..ef1c77563e 100644 --- a/hw/pci-host/mv64361.c +++ b/hw/pci-host/mv64361.c @@ -11,7 +11,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/pci/pci_device.h" #include "hw/pci/pci_host.h" #include "hw/core/irq.h" diff --git a/hw/pci-host/sabre.c b/hw/pci-host/sabre.c index 87af933dc2..b3f57dca7d 100644 --- a/hw/pci-host/sabre.c +++ b/hw/pci-host/sabre.c @@ -25,7 +25,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" #include "hw/core/qdev-properties.h" diff --git a/hw/pci-host/sh_pci.c b/hw/pci-host/sh_pci.c index 87a71c889e..3ffd2cdbd7 100644 --- a/hw/pci-host/sh_pci.c +++ b/hw/pci-host/sh_pci.c @@ -23,7 +23,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/sh4/sh.h" #include "hw/core/irq.h" #include "hw/pci/pci_device.h" diff --git a/hw/pci-host/versatile.c b/hw/pci-host/versatile.c index 1fdae78210..b27531f7fb 100644 --- a/hw/pci-host/versatile.c +++ b/hw/pci-host/versatile.c @@ -9,7 +9,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/core/irq.h" #include "hw/pci/pci_device.h" diff --git a/hw/ppc/e500-ccsr.h b/hw/ppc/e500-ccsr.h index 249c17be3b..4de006b443 100644 --- a/hw/ppc/e500-ccsr.h +++ b/hw/ppc/e500-ccsr.h @@ -1,7 +1,7 @@ #ifndef E500_CCSR_H #define E500_CCSR_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" struct PPCE500CCSRState { diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 7f164331c8..113a2daca1 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -41,7 +41,7 @@ #include "hw/core/qdev-properties.h" #include "hw/core/loader.h" #include "elf.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/host-utils.h" #include "qemu/option.h" #include "hw/pci-host/ppce500.h" diff --git a/hw/ppc/e500plat.c b/hw/ppc/e500plat.c index 4f1d659e72..ca5647284d 100644 --- a/hw/ppc/e500plat.c +++ b/hw/ppc/e500plat.c @@ -15,7 +15,7 @@ #include "hw/net/fsl_etsec/etsec.h" #include "system/device_tree.h" #include "system/kvm.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/pci/pci.h" #include "hw/ppc/openpic.h" #include "kvm_ppc.h" diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index 410a3ac392..7275563a15 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -73,7 +73,7 @@ #include "system/reset.h" #include "kvm_ppc.h" #include "hw/usb/usb.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "trace.h" #define MAX_IDE_BUS 2 diff --git a/hw/ppc/mpc8544_guts.c b/hw/ppc/mpc8544_guts.c index a25041e836..88ae573d1e 100644 --- a/hw/ppc/mpc8544_guts.c +++ b/hw/ppc/mpc8544_guts.c @@ -21,7 +21,7 @@ #include "qemu/log.h" #include "system/runstate.h" #include "cpu.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define MPC8544_GUTS_MMIO_SIZE 0x1000 diff --git a/hw/ppc/pegasos.c b/hw/ppc/pegasos.c index bf290a7dcd..3e4d19fbe8 100644 --- a/hw/ppc/pegasos.c +++ b/hw/ppc/pegasos.c @@ -11,7 +11,7 @@ #include "qemu/units.h" #include "qapi/error.h" #include "hw/ppc/ppc.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/pci/pci_host.h" #include "hw/core/irq.h" #include "hw/core/or-irq.h" diff --git a/hw/ppc/pnv_xscom.c b/hw/ppc/pnv_xscom.c index fbfec829d5..8557b560ae 100644 --- a/hw/ppc/pnv_xscom.c +++ b/hw/ppc/pnv_xscom.c @@ -22,7 +22,7 @@ #include "qemu/module.h" #include "system/hw_accel.h" #include "target/ppc/cpu.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/ppc/fdt.h" #include "hw/ppc/pnv.h" diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c index 491560575c..2dde008b0e 100644 --- a/hw/ppc/ppc440_bamboo.c +++ b/hw/ppc/ppc440_bamboo.c @@ -28,7 +28,7 @@ #include "hw/pci-host/ppc4xx.h" #include "system/system.h" #include "system/reset.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/intc/ppc-uic.h" #include "hw/core/qdev-properties.h" #include "qapi/error.h" diff --git a/hw/ppc/ppce500_spin.c b/hw/ppc/ppce500_spin.c index bc70e50e92..a066ada77e 100644 --- a/hw/ppc/ppce500_spin.c +++ b/hw/ppc/ppce500_spin.c @@ -31,7 +31,7 @@ #include "qemu/module.h" #include "qemu/units.h" #include "hw/hw.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "system/hw_accel.h" #include "hw/ppc/ppc.h" #include "e500.h" diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c index b6e233747e..b13dd224ba 100644 --- a/hw/ppc/sam460ex.c +++ b/hw/ppc/sam460ex.c @@ -30,7 +30,7 @@ #include "hw/block/flash.h" #include "system/system.h" #include "system/reset.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/char/serial-mm.h" #include "hw/i2c/ppc4xx_i2c.h" #include "hw/i2c/smbus_eeprom.h" diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index a7c064be33..ea998bdff1 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -26,7 +26,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/pci/pci.h" #include "hw/pci/msi.h" diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c index 875c17f478..501e82a766 100644 --- a/hw/ppc/spapr_vio.c +++ b/hw/ppc/spapr_vio.c @@ -26,7 +26,7 @@ #include "qemu/log.h" #include "hw/core/loader.h" #include "elf.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "system/kvm.h" #include "system/device_tree.h" #include "kvm_ppc.h" diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c index cf2d10ecb2..8b3e67b627 100644 --- a/hw/ppc/virtex_ml507.c +++ b/hw/ppc/virtex_ml507.c @@ -27,7 +27,7 @@ #include "qemu/units.h" #include "exec/page-protection.h" #include "cpu.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/char/serial-mm.h" #include "hw/block/flash.h" #include "system/system.h" diff --git a/hw/riscv/microblaze-v-generic.c b/hw/riscv/microblaze-v-generic.c index 8a461a0dd5..d56b64792d 100644 --- a/hw/riscv/microblaze-v-generic.c +++ b/hw/riscv/microblaze-v-generic.c @@ -17,7 +17,7 @@ #include "qemu/units.h" #include "qapi/error.h" #include "cpu.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "system/system.h" #include "net/net.h" #include "hw/core/boards.h" diff --git a/hw/riscv/microchip_pfsoc.c b/hw/riscv/microchip_pfsoc.c index 9de6456c14..0cf849ffb6 100644 --- a/hw/riscv/microchip_pfsoc.c +++ b/hw/riscv/microchip_pfsoc.c @@ -42,7 +42,7 @@ #include "qapi/visitor.h" #include "hw/core/boards.h" #include "hw/core/loader.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "chardev/char.h" #include "hw/cpu/cluster.h" #include "target/riscv/cpu.h" diff --git a/hw/riscv/riscv-iommu-sys.c b/hw/riscv/riscv-iommu-sys.c index 2a11c4dab6..bf87b0b4ea 100644 --- a/hw/riscv/riscv-iommu-sys.c +++ b/hw/riscv/riscv-iommu-sys.c @@ -20,7 +20,7 @@ #include "hw/core/irq.h" #include "hw/pci/pci_bus.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/host-utils.h" diff --git a/hw/riscv/riscv_hart.c b/hw/riscv/riscv_hart.c index 3118748794..e675358e1a 100644 --- a/hw/riscv/riscv_hart.c +++ b/hw/riscv/riscv_hart.c @@ -24,7 +24,7 @@ #include "system/reset.h" #include "system/qtest.h" #include "qemu/cutils.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "target/riscv/cpu.h" #include "hw/core/qdev-properties.h" #include "hw/riscv/riscv_hart.h" diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c index c2032176c4..4cb9c07ffb 100644 --- a/hw/riscv/sifive_e.c +++ b/hw/riscv/sifive_e.c @@ -34,7 +34,7 @@ #include "qapi/error.h" #include "hw/core/boards.h" #include "hw/core/loader.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/misc/unimp.h" #include "target/riscv/cpu.h" #include "hw/riscv/riscv_hart.h" diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 3e081ddf37..f1b47ab584 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -42,7 +42,7 @@ #include "hw/core/boards.h" #include "hw/core/irq.h" #include "hw/core/loader.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/cpu/cluster.h" #include "hw/misc/unimp.h" #include "hw/sd/sd.h" diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c index c9451d7e3b..ea527c7bfc 100644 --- a/hw/riscv/spike.c +++ b/hw/riscv/spike.c @@ -27,7 +27,7 @@ #include "qapi/error.h" #include "hw/core/boards.h" #include "hw/core/loader.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "target/riscv/cpu.h" #include "hw/riscv/riscv_hart.h" #include "hw/riscv/spike.h" diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index d79add5576..c87c169d38 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -25,7 +25,7 @@ #include "qapi/error.h" #include "hw/core/boards.h" #include "hw/core/loader.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/qdev-properties.h" #include "hw/char/serial-mm.h" #include "target/riscv/cpu.h" diff --git a/hw/rtc/allwinner-rtc.c b/hw/rtc/allwinner-rtc.c index 0ffd38cf78..52006a0e3a 100644 --- a/hw/rtc/allwinner-rtc.c +++ b/hw/rtc/allwinner-rtc.c @@ -19,7 +19,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/rtc/exynos4210_rtc.c b/hw/rtc/exynos4210_rtc.c index a15b5274bd..846839d2d8 100644 --- a/hw/rtc/exynos4210_rtc.c +++ b/hw/rtc/exynos4210_rtc.c @@ -28,7 +28,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "qemu/module.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/timer.h" #include "qemu/bcd.h" diff --git a/hw/rtc/goldfish_rtc.c b/hw/rtc/goldfish_rtc.c index 79d2a04c72..5354a6b02f 100644 --- a/hw/rtc/goldfish_rtc.c +++ b/hw/rtc/goldfish_rtc.c @@ -24,7 +24,7 @@ #include "migration/vmstate.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/bitops.h" #include "qemu/timer.h" #include "system/system.h" diff --git a/hw/rtc/ls7a_rtc.c b/hw/rtc/ls7a_rtc.c index b0c6588e09..158c815505 100644 --- a/hw/rtc/ls7a_rtc.c +++ b/hw/rtc/ls7a_rtc.c @@ -6,7 +6,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "hw/core/register.h" #include "qemu/timer.h" diff --git a/hw/rtc/m48t59.c b/hw/rtc/m48t59.c index be8efb8c0a..be4196b21c 100644 --- a/hw/rtc/m48t59.c +++ b/hw/rtc/m48t59.c @@ -31,7 +31,7 @@ #include "system/runstate.h" #include "system/rtc.h" #include "system/system.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qapi/error.h" #include "qemu/bcd.h" #include "qemu/module.h" diff --git a/hw/rtc/pl031.c b/hw/rtc/pl031.c index 847349b407..b56877c3a2 100644 --- a/hw/rtc/pl031.c +++ b/hw/rtc/pl031.c @@ -16,7 +16,7 @@ #include "migration/vmstate.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/timer.h" #include "system/system.h" #include "system/rtc.h" diff --git a/hw/rtc/sun4v-rtc.c b/hw/rtc/sun4v-rtc.c index 29e24ef6be..675b6cd5bd 100644 --- a/hw/rtc/sun4v-rtc.c +++ b/hw/rtc/sun4v-rtc.c @@ -10,7 +10,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qapi/error.h" #include "qemu/module.h" #include "qemu/timer.h" diff --git a/hw/rtc/xlnx-zynqmp-rtc.c b/hw/rtc/xlnx-zynqmp-rtc.c index 49d48dc678..28ae7a24f9 100644 --- a/hw/rtc/xlnx-zynqmp-rtc.c +++ b/hw/rtc/xlnx-zynqmp-rtc.c @@ -25,7 +25,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #include "qemu/bitops.h" #include "qemu/log.h" diff --git a/hw/rx/rx62n.c b/hw/rx/rx62n.c index e1fa3d5661..3d137a517b 100644 --- a/hw/rx/rx62n.c +++ b/hw/rx/rx62n.c @@ -26,7 +26,7 @@ #include "qemu/units.h" #include "hw/rx/rx62n.h" #include "hw/core/loader.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/qdev-properties.h" #include "system/system.h" #include "qobject/qlist.h" diff --git a/hw/s390x/ap-bridge.c b/hw/s390x/ap-bridge.c index edeb3dbef3..5cdbf09807 100644 --- a/hw/s390x/ap-bridge.c +++ b/hw/s390x/ap-bridge.c @@ -10,7 +10,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/bitops.h" #include "qemu/module.h" #include "hw/s390x/ap-bridge.h" diff --git a/hw/s390x/css-bridge.c b/hw/s390x/css-bridge.c index 887794beef..440fefb7d0 100644 --- a/hw/s390x/css-bridge.c +++ b/hw/s390x/css-bridge.c @@ -14,7 +14,7 @@ #include "qapi/error.h" #include "hw/core/hotplug.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/bitops.h" #include "qemu/module.h" #include "hw/s390x/css.h" diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index 9da6119be2..933271431b 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -25,7 +25,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/core/irq.h" #include "hw/scsi/esp.h" diff --git a/hw/scsi/lasi_ncr710.c b/hw/scsi/lasi_ncr710.c index 7e0076c7a3..4fde2265b5 100644 --- a/hw/scsi/lasi_ncr710.c +++ b/hw/scsi/lasi_ncr710.c @@ -14,7 +14,7 @@ #include "qemu/osdep.h" #include "hw/scsi/lasi_ncr710.h" #include "hw/scsi/ncr53c710.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/timer.h" #include "qemu/log.h" #include "trace.h" diff --git a/hw/scsi/lasi_ncr710.h b/hw/scsi/lasi_ncr710.h index 058718068e..99be001fc3 100644 --- a/hw/scsi/lasi_ncr710.h +++ b/hw/scsi/lasi_ncr710.h @@ -14,7 +14,7 @@ #ifndef HW_LASI_NCR710_H #define HW_LASI_NCR710_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/osdep.h" #include "exec/memattrs.h" #include "hw/scsi/scsi.h" diff --git a/hw/scsi/ncr53c710.c b/hw/scsi/ncr53c710.c index 9931fd4dc7..0f8914d353 100644 --- a/hw/scsi/ncr53c710.c +++ b/hw/scsi/ncr53c710.c @@ -29,7 +29,7 @@ #include "qapi/error.h" #include "qemu/timer.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/scsi/scsi.h" #include "hw/scsi/ncr53c710.h" #include "migration/vmstate.h" diff --git a/hw/scsi/ncr53c710.h b/hw/scsi/ncr53c710.h index 9ae64a182d..a8dc92f4ef 100644 --- a/hw/scsi/ncr53c710.h +++ b/hw/scsi/ncr53c710.h @@ -16,7 +16,7 @@ #define HW_NCR53C710_H #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/scsi/scsi.h" #include "qemu/fifo8.h" #include "qom/object.h" diff --git a/hw/sd/omap_mmc.c b/hw/sd/omap_mmc.c index 267b723e3c..020429aa4f 100644 --- a/hw/sd/omap_mmc.c +++ b/hw/sd/omap_mmc.c @@ -23,7 +23,7 @@ #include "qemu/log.h" #include "qapi/error.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/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 761b262d7b..08c34fea31 100644 --- a/hw/sd/pl181.c +++ b/hw/sd/pl181.c @@ -9,7 +9,7 @@ #include "qemu/osdep.h" #include "system/blockdev.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/core/irq.h" #include "hw/sd/sd.h" diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c index 35db5cbbcd..acb3fe75a8 100644 --- a/hw/sh4/r2d.c +++ b/hw/sh4/r2d.c @@ -28,7 +28,7 @@ #include "qapi/error.h" #include "qemu/error-report.h" #include "cpu.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/sh4/sh.h" #include "system/reset.h" #include "system/runstate.h" diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c index a0aa89ad31..3ae71f99fe 100644 --- a/hw/sh4/sh7750.c +++ b/hw/sh4/sh7750.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "hw/sh4/sh.h" #include "system/system.h" diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 2e3952c917..8ad4eb46bb 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -28,7 +28,7 @@ #include "qemu/datadir.h" #include "cpu.h" #include "exec/target_page.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/error-report.h" #include "qemu/timer.h" #include "hw/sparc/sun4m_iommu.h" diff --git a/hw/sparc/sun4m_iommu.c b/hw/sparc/sun4m_iommu.c index 10c4786dad..ab5eb67072 100644 --- a/hw/sparc/sun4m_iommu.c +++ b/hw/sparc/sun4m_iommu.c @@ -26,7 +26,7 @@ #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" #include "hw/sparc/sun4m_iommu.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "system/address-spaces.h" diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index 14b47c037b..d3ce32b6b0 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -51,7 +51,7 @@ #include "hw/nvram/chrp_nvram.h" #include "hw/sparc/sparc64.h" #include "hw/nvram/fw_cfg.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/ide/pci.h" #include "hw/core/loader.h" #include "hw/core/fw-path-provider.h" diff --git a/hw/sparc64/sun4u_iommu.c b/hw/sparc64/sun4u_iommu.c index 14645f475a..0188ce35d2 100644 --- a/hw/sparc64/sun4u_iommu.c +++ b/hw/sparc64/sun4u_iommu.c @@ -25,7 +25,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/sparc/sun4u_iommu.h" #include "system/address-spaces.h" #include "qemu/log.h" diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c index 6bef856c62..b9d5ecba29 100644 --- a/hw/ssi/aspeed_smc.c +++ b/hw/ssi/aspeed_smc.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "hw/block/flash.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/ssi/pl022.c b/hw/ssi/pl022.c index 1851118d55..715a2d21f4 100644 --- a/hw/ssi/pl022.c +++ b/hw/ssi/pl022.c @@ -8,7 +8,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/core/irq.h" #include "hw/ssi/pl022.h" diff --git a/hw/ssi/sifive_spi.c b/hw/ssi/sifive_spi.c index 577cd5d2d8..2ece78053b 100644 --- a/hw/ssi/sifive_spi.c +++ b/hw/ssi/sifive_spi.c @@ -22,7 +22,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/ssi/ssi.h" #include "qemu/fifo8.h" #include "qemu/log.h" diff --git a/hw/ssi/xilinx_spi.c b/hw/ssi/xilinx_spi.c index cf406d0824..79f3e8bfae 100644 --- a/hw/ssi/xilinx_spi.c +++ b/hw/ssi/xilinx_spi.c @@ -26,7 +26,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "qemu/fifo8.h" diff --git a/hw/ssi/xilinx_spips.c b/hw/ssi/xilinx_spips.c index a56a5e304d..a4718fb72d 100644 --- a/hw/ssi/xilinx_spips.c +++ b/hw/ssi/xilinx_spips.c @@ -23,7 +23,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "hw/core/ptimer.h" #include "hw/core/qdev-properties.h" diff --git a/hw/ssi/xlnx-versal-ospi.c b/hw/ssi/xlnx-versal-ospi.c index 93cdc9d399..467f0ce703 100644 --- a/hw/ssi/xlnx-versal-ospi.c +++ b/hw/ssi/xlnx-versal-ospi.c @@ -23,7 +23,7 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/core/qdev-properties.h" #include "qemu/bitops.h" diff --git a/hw/timer/allwinner-a10-pit.c b/hw/timer/allwinner-a10-pit.c index d52669787e..bb995313ae 100644 --- a/hw/timer/allwinner-a10-pit.c +++ b/hw/timer/allwinner-a10-pit.c @@ -18,7 +18,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/timer/allwinner-a10-pit.h" #include "migration/vmstate.h" #include "qemu/log.h" diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c index c38e56f5b8..fb70333c53 100644 --- a/hw/timer/arm_timer.c +++ b/hw/timer/arm_timer.c @@ -8,7 +8,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/timer.h" #include "hw/core/irq.h" diff --git a/hw/timer/armv7m_systick.c b/hw/timer/armv7m_systick.c index baba0817b8..65cfaf4914 100644 --- a/hw/timer/armv7m_systick.c +++ b/hw/timer/armv7m_systick.c @@ -13,7 +13,7 @@ #include "hw/timer/armv7m_systick.h" #include "migration/vmstate.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/qdev-clock.h" #include "qemu/timer.h" #include "qemu/log.h" diff --git a/hw/timer/aspeed_timer.c b/hw/timer/aspeed_timer.c index 20adb7decb..1e954f7aec 100644 --- a/hw/timer/aspeed_timer.c +++ b/hw/timer/aspeed_timer.c @@ -12,7 +12,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/timer/aspeed_timer.h" #include "migration/vmstate.h" #include "qemu/bitops.h" diff --git a/hw/timer/cadence_ttc.c b/hw/timer/cadence_ttc.c index 6f02c6a02d..3d53921cfa 100644 --- a/hw/timer/cadence_ttc.c +++ b/hw/timer/cadence_ttc.c @@ -18,7 +18,7 @@ #include "qemu/osdep.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "qemu/timer.h" diff --git a/hw/timer/cmsdk-apb-dualtimer.c b/hw/timer/cmsdk-apb-dualtimer.c index 39b1fa3a14..0f57f01aad 100644 --- a/hw/timer/cmsdk-apb-dualtimer.c +++ b/hw/timer/cmsdk-apb-dualtimer.c @@ -21,7 +21,7 @@ #include "trace.h" #include "qapi/error.h" #include "qemu/module.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" #include "hw/core/registerfields.h" diff --git a/hw/timer/cmsdk-apb-timer.c b/hw/timer/cmsdk-apb-timer.c index e8b6601097..4717cec046 100644 --- a/hw/timer/cmsdk-apb-timer.c +++ b/hw/timer/cmsdk-apb-timer.c @@ -32,7 +32,7 @@ #include "qemu/module.h" #include "qapi/error.h" #include "trace.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "hw/core/registerfields.h" #include "hw/core/qdev-clock.h" diff --git a/hw/timer/digic-timer.c b/hw/timer/digic-timer.c index 12b79914df..352132bf21 100644 --- a/hw/timer/digic-timer.c +++ b/hw/timer/digic-timer.c @@ -27,7 +27,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/ptimer.h" #include "qemu/module.h" #include "qemu/log.h" diff --git a/hw/timer/exynos4210_mct.c b/hw/timer/exynos4210_mct.c index f6527a451b..0424539c78 100644 --- a/hw/timer/exynos4210_mct.c +++ b/hw/timer/exynos4210_mct.c @@ -54,7 +54,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/timer.h" #include "qemu/module.h" diff --git a/hw/timer/exynos4210_pwm.c b/hw/timer/exynos4210_pwm.c index 1643fa3941..64eb4f5c8d 100644 --- a/hw/timer/exynos4210_pwm.c +++ b/hw/timer/exynos4210_pwm.c @@ -22,7 +22,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/timer.h" #include "qemu/module.h" diff --git a/hw/timer/grlib_gptimer.c b/hw/timer/grlib_gptimer.c index dbce6f736f..099ab6c586 100644 --- a/hw/timer/grlib_gptimer.c +++ b/hw/timer/grlib_gptimer.c @@ -26,7 +26,7 @@ #include "qemu/osdep.h" #include "hw/timer/grlib_gptimer.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/timer.h" #include "hw/core/irq.h" #include "hw/core/ptimer.h" diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c index 82006df0e3..070b40e7f6 100644 --- a/hw/timer/hpet.c +++ b/hw/timer/hpet.c @@ -31,7 +31,7 @@ #include "qemu/timer.h" #include "hw/core/qdev-properties.h" #include "hw/timer/hpet.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/rtc/mc146818rtc.h" #include "hw/rtc/mc146818rtc_regs.h" #include "migration/vmstate.h" diff --git a/hw/timer/pxa2xx_timer.c b/hw/timer/pxa2xx_timer.c index b875c05052..b4f501e57f 100644 --- a/hw/timer/pxa2xx_timer.c +++ b/hw/timer/pxa2xx_timer.c @@ -12,7 +12,7 @@ #include "hw/core/qdev-properties.h" #include "qemu/timer.h" #include "system/runstate.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" diff --git a/hw/timer/slavio_timer.c b/hw/timer/slavio_timer.c index 07359a6fe7..71696a4b61 100644 --- a/hw/timer/slavio_timer.c +++ b/hw/timer/slavio_timer.c @@ -27,7 +27,7 @@ #include "hw/core/irq.h" #include "hw/core/ptimer.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "trace.h" #include "qemu/module.h" diff --git a/hw/timer/sse-counter.c b/hw/timer/sse-counter.c index 39d140347e..bec3333b0d 100644 --- a/hw/timer/sse-counter.c +++ b/hw/timer/sse-counter.c @@ -32,7 +32,7 @@ #include "qapi/error.h" #include "trace.h" #include "hw/timer/sse-counter.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/registerfields.h" #include "hw/core/clock.h" #include "hw/core/qdev-clock.h" diff --git a/hw/timer/sse-timer.c b/hw/timer/sse-timer.c index 62381e07e0..ea60711892 100644 --- a/hw/timer/sse-timer.c +++ b/hw/timer/sse-timer.c @@ -40,7 +40,7 @@ #include "trace.h" #include "hw/timer/sse-timer.h" #include "hw/timer/sse-counter.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "hw/core/registerfields.h" #include "hw/core/clock.h" diff --git a/hw/timer/xilinx_timer.c b/hw/timer/xilinx_timer.c index 9c2969a2c4..8a502dae0e 100644 --- a/hw/timer/xilinx_timer.c +++ b/hw/timer/xilinx_timer.c @@ -27,7 +27,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "hw/core/ptimer.h" #include "hw/core/qdev-properties.h" diff --git a/hw/tpm/tpm_tis_i2c.c b/hw/tpm/tpm_tis_i2c.c index 5ce84dc7a4..9f13e0ec12 100644 --- a/hw/tpm/tpm_tis_i2c.c +++ b/hw/tpm/tpm_tis_i2c.c @@ -19,7 +19,7 @@ #include "qemu/osdep.h" #include "hw/i2c/i2c.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/acpi/tpm.h" #include "migration/vmstate.h" #include "tpm_prop.h" diff --git a/hw/tpm/tpm_tis_sysbus.c b/hw/tpm/tpm_tis_sysbus.c index 07c3040130..e9372e7316 100644 --- a/hw/tpm/tpm_tis_sysbus.c +++ b/hw/tpm/tpm_tis_sysbus.c @@ -27,7 +27,7 @@ #include "migration/vmstate.h" #include "hw/acpi/tpm.h" #include "tpm_prop.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "tpm_tis.h" #include "qom/object.h" diff --git a/hw/tricore/tc27x_soc.c b/hw/tricore/tc27x_soc.c index e1a97a4387..5b1b07cee1 100644 --- a/hw/tricore/tc27x_soc.c +++ b/hw/tricore/tc27x_soc.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/loader.h" #include "qemu/units.h" #include "hw/misc/unimp.h" diff --git a/hw/tricore/tricore_testdevice.c b/hw/tricore/tricore_testdevice.c index d3ffc5fe9f..2eb16731e9 100644 --- a/hw/tricore/tricore_testdevice.c +++ b/hw/tricore/tricore_testdevice.c @@ -17,7 +17,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/qdev-properties.h" #include "hw/tricore/tricore_testdevice.h" diff --git a/hw/uefi/var-service-sysbus.c b/hw/uefi/var-service-sysbus.c index 3bf9335650..75b0790518 100644 --- a/hw/uefi/var-service-sysbus.c +++ b/hw/uefi/var-service-sysbus.c @@ -7,7 +7,7 @@ #include "migration/vmstate.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/uefi/hardware-info.h" #include "hw/uefi/var-service.h" diff --git a/hw/usb/hcd-dwc2.h b/hw/usb/hcd-dwc2.h index a99409a654..68877661ca 100644 --- a/hw/usb/hcd-dwc2.h +++ b/hw/usb/hcd-dwc2.h @@ -21,7 +21,7 @@ #include "qemu/timer.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/usb/usb.h" #include "system/dma.h" #include "qom/object.h" diff --git a/hw/usb/hcd-dwc3.c b/hw/usb/hcd-dwc3.c index 4018d70f02..785732fc97 100644 --- a/hw/usb/hcd-dwc3.c +++ b/hw/usb/hcd-dwc3.c @@ -28,7 +28,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #include "qemu/bitops.h" #include "qom/object.h" diff --git a/hw/usb/hcd-ehci.h b/hw/usb/hcd-ehci.h index c16717294d..0ae8c06331 100644 --- a/hw/usb/hcd-ehci.h +++ b/hw/usb/hcd-ehci.h @@ -22,7 +22,7 @@ #include "hw/usb/usb.h" #include "system/dma.h" #include "hw/pci/pci_device.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #ifndef EHCI_DEBUG #define EHCI_DEBUG 0 diff --git a/hw/usb/hcd-ohci-pci.c b/hw/usb/hcd-ohci-pci.c index bdbbaaa87a..18b58f5fcb 100644 --- a/hw/usb/hcd-ohci-pci.c +++ b/hw/usb/hcd-ohci-pci.c @@ -24,7 +24,7 @@ #include "hw/usb/usb.h" #include "migration/vmstate.h" #include "hw/pci/pci_device.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/qdev-dma.h" #include "hw/core/qdev-properties.h" #include "trace.h" diff --git a/hw/usb/hcd-ohci-sysbus.c b/hw/usb/hcd-ohci-sysbus.c index 350b011899..1a2cf29bed 100644 --- a/hw/usb/hcd-ohci-sysbus.c +++ b/hw/usb/hcd-ohci-sysbus.c @@ -25,7 +25,7 @@ #include "qemu/timer.h" #include "hw/usb/usb.h" #include "migration/vmstate.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/qdev-dma.h" #include "hw/core/qdev-properties.h" #include "trace.h" diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c index c771aafdd0..c7e9c71903 100644 --- a/hw/usb/hcd-ohci.c +++ b/hw/usb/hcd-ohci.c @@ -32,7 +32,7 @@ #include "qemu/timer.h" #include "hw/usb/usb.h" #include "migration/vmstate.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/qdev-dma.h" #include "hw/core/qdev-properties.h" #include "trace.h" diff --git a/hw/usb/hcd-ohci.h b/hw/usb/hcd-ohci.h index 75e266de90..243cd1f46a 100644 --- a/hw/usb/hcd-ohci.h +++ b/hw/usb/hcd-ohci.h @@ -21,7 +21,7 @@ #ifndef HCD_OHCI_H #define HCD_OHCI_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "system/dma.h" #include "hw/usb/usb.h" #include "qom/object.h" diff --git a/hw/usb/hcd-xhci-sysbus.h b/hw/usb/hcd-xhci-sysbus.h index f8175470ba..0ce6b6d989 100644 --- a/hw/usb/hcd-xhci-sysbus.h +++ b/hw/usb/hcd-xhci-sysbus.h @@ -13,7 +13,7 @@ #include "hw/usb/usb.h" #include "hcd-xhci.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #define XHCI_SYSBUS(obj) \ OBJECT_CHECK(XHCISysbusState, (obj), TYPE_XHCI_SYSBUS) diff --git a/hw/usb/xlnx-usb-subsystem.c b/hw/usb/xlnx-usb-subsystem.c index e0dfdfdcbd..9bf040c917 100644 --- a/hw/usb/xlnx-usb-subsystem.c +++ b/hw/usb/xlnx-usb-subsystem.c @@ -23,7 +23,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #include "qemu/bitops.h" #include "qom/object.h" diff --git a/hw/usb/xlnx-versal-usb2-ctrl-regs.c b/hw/usb/xlnx-versal-usb2-ctrl-regs.c index 33a7d7fbca..15ea438448 100644 --- a/hw/usb/xlnx-versal-usb2-ctrl-regs.c +++ b/hw/usb/xlnx-versal-usb2-ctrl-regs.c @@ -28,7 +28,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "hw/core/register.h" #include "qemu/bitops.h" diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c index 54bd0c57b5..0b0412b22f 100644 --- a/hw/virtio/virtio-mmio.c +++ b/hw/virtio/virtio-mmio.c @@ -23,7 +23,7 @@ #include "standard-headers/linux/virtio_mmio.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/virtio/virtio.h" #include "migration/qemu-file-types.h" #include "qemu/host-utils.h" diff --git a/hw/vmapple/aes.c b/hw/vmapple/aes.c index a6e94610b8..553e688adb 100644 --- a/hw/vmapple/aes.c +++ b/hw/vmapple/aes.c @@ -15,7 +15,7 @@ #include "crypto/aes.h" #include "crypto/cipher.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/vmapple/vmapple.h" #include "migration/vmstate.h" #include "qemu/cutils.h" diff --git a/hw/vmapple/bdif.c b/hw/vmapple/bdif.c index 5ccd374581..4dc10c151d 100644 --- a/hw/vmapple/bdif.c +++ b/hw/vmapple/bdif.c @@ -15,7 +15,7 @@ #include "qemu/module.h" #include "trace.h" #include "hw/vmapple/vmapple.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/block/block.h" #include "qapi/error.h" #include "system/block-backend.h" diff --git a/hw/vmapple/cfg.c b/hw/vmapple/cfg.c index 3d58a29f69..2a3204f0ec 100644 --- a/hw/vmapple/cfg.c +++ b/hw/vmapple/cfg.c @@ -11,7 +11,7 @@ #include "qemu/osdep.h" #include "hw/vmapple/vmapple.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/log.h" #include "qemu/module.h" #include "qapi/error.h" diff --git a/hw/vmapple/vmapple.c b/hw/vmapple/vmapple.c index 2ebd0f07bd..b1379eafef 100644 --- a/hw/vmapple/vmapple.c +++ b/hw/vmapple/vmapple.c @@ -29,7 +29,7 @@ #include "hw/core/irq.h" #include "hw/core/loader.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/usb/usb.h" #include "hw/arm/boot.h" #include "hw/arm/primecell.h" diff --git a/hw/watchdog/allwinner-wdt.c b/hw/watchdog/allwinner-wdt.c index 68b600689a..156f823534 100644 --- a/hw/watchdog/allwinner-wdt.c +++ b/hw/watchdog/allwinner-wdt.c @@ -25,7 +25,7 @@ #include "qemu/units.h" #include "qemu/module.h" #include "trace.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/registerfields.h" #include "hw/watchdog/allwinner-wdt.h" #include "system/watchdog.h" diff --git a/hw/watchdog/cmsdk-apb-watchdog.c b/hw/watchdog/cmsdk-apb-watchdog.c index ceae792580..c474166cfc 100644 --- a/hw/watchdog/cmsdk-apb-watchdog.c +++ b/hw/watchdog/cmsdk-apb-watchdog.c @@ -26,7 +26,7 @@ #include "qapi/error.h" #include "qemu/module.h" #include "system/watchdog.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "hw/core/qdev-properties.h" #include "hw/core/registerfields.h" diff --git a/hw/watchdog/wdt_aspeed.c b/hw/watchdog/wdt_aspeed.c index 930834bfca..26506f3c33 100644 --- a/hw/watchdog/wdt_aspeed.c +++ b/hw/watchdog/wdt_aspeed.c @@ -15,7 +15,7 @@ #include "qemu/timer.h" #include "system/watchdog.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/watchdog/wdt_aspeed.h" #include "migration/vmstate.h" #include "trace.h" diff --git a/hw/xen/xen-bus.c b/hw/xen/xen-bus.c index e3c51030f3..dfad2bc508 100644 --- a/hw/xen/xen-bus.c +++ b/hw/xen/xen-bus.c @@ -10,7 +10,7 @@ #include "qemu/module.h" #include "qemu/uuid.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/xen/xen.h" #include "hw/xen/xen-backend.h" #include "hw/xen/xen-legacy-backend.h" /* xen_be_init() */ diff --git a/hw/xen/xen-legacy-backend.c b/hw/xen/xen-legacy-backend.c index f9b0dd1513..7977b52712 100644 --- a/hw/xen/xen-legacy-backend.c +++ b/hw/xen/xen-legacy-backend.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/boards.h" #include "hw/core/qdev-properties.h" #include "qemu/main-loop.h" diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c index a533f2bac3..5e6f897429 100644 --- a/hw/xtensa/xtfpga.c +++ b/hw/xtensa/xtfpga.c @@ -38,7 +38,7 @@ #include "exec/tswap.h" #include "hw/char/serial-mm.h" #include "net/net.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/block/flash.h" #include "chardev/char.h" #include "system/device_tree.h" diff --git a/include/hw/acpi/generic_event_device.h b/include/hw/acpi/generic_event_device.h index 130c014d3f..7cbfb5fe7d 100644 --- a/include/hw/acpi/generic_event_device.h +++ b/include/hw/acpi/generic_event_device.h @@ -59,7 +59,7 @@ #ifndef HW_ACPI_GENERIC_EVENT_DEVICE_H #define HW_ACPI_GENERIC_EVENT_DEVICE_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/acpi/memory_hotplug.h" #include "hw/acpi/ghes.h" #include "hw/acpi/cpu.h" diff --git a/include/hw/adc/aspeed_adc.h b/include/hw/adc/aspeed_adc.h index f502f197ac..75c00b0325 100644 --- a/include/hw/adc/aspeed_adc.h +++ b/include/hw/adc/aspeed_adc.h @@ -11,7 +11,7 @@ #ifndef HW_ADC_ASPEED_ADC_H #define HW_ADC_ASPEED_ADC_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #define TYPE_ASPEED_ADC "aspeed.adc" #define TYPE_ASPEED_2400_ADC TYPE_ASPEED_ADC "-ast2400" diff --git a/include/hw/adc/npcm7xx_adc.h b/include/hw/adc/npcm7xx_adc.h index 02dc1902fc..867e4c767c 100644 --- a/include/hw/adc/npcm7xx_adc.h +++ b/include/hw/adc/npcm7xx_adc.h @@ -18,7 +18,7 @@ #include "hw/core/clock.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/timer.h" #define NPCM7XX_ADC_NUM_INPUTS 8 diff --git a/include/hw/adc/stm32f2xx_adc.h b/include/hw/adc/stm32f2xx_adc.h index 42b48981f2..2af21f1852 100644 --- a/include/hw/adc/stm32f2xx_adc.h +++ b/include/hw/adc/stm32f2xx_adc.h @@ -25,7 +25,7 @@ #ifndef HW_STM32F2XX_ADC_H #define HW_STM32F2XX_ADC_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define ADC_SR 0x00 diff --git a/include/hw/adc/zynq-xadc.h b/include/hw/adc/zynq-xadc.h index c10cc4c379..9b4943681b 100644 --- a/include/hw/adc/zynq-xadc.h +++ b/include/hw/adc/zynq-xadc.h @@ -15,7 +15,7 @@ #ifndef ZYNQ_XADC_H #define ZYNQ_XADC_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define ZYNQ_XADC_MMIO_SIZE 0x0020 diff --git a/include/hw/arm/armsse.h b/include/hw/arm/armsse.h index 414e553600..bdf2d4db8e 100644 --- a/include/hw/arm/armsse.h +++ b/include/hw/arm/armsse.h @@ -93,7 +93,7 @@ #ifndef ARMSSE_H #define ARMSSE_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/arm/armv7m.h" #include "hw/misc/iotkit-secctl.h" #include "hw/misc/tz-ppc.h" diff --git a/include/hw/arm/armv7m.h b/include/hw/arm/armv7m.h index e31888cc8c..98ad08db03 100644 --- a/include/hw/arm/armv7m.h +++ b/include/hw/arm/armv7m.h @@ -10,7 +10,7 @@ #ifndef HW_ARM_ARMV7M_H #define HW_ARM_ARMV7M_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/intc/armv7m_nvic.h" #include "hw/misc/armv7m_ras.h" #include "target/arm/idau.h" diff --git a/include/hw/arm/bcm2835_peripherals.h b/include/hw/arm/bcm2835_peripherals.h index d46d892956..bf35bb18e5 100644 --- a/include/hw/arm/bcm2835_peripherals.h +++ b/include/hw/arm/bcm2835_peripherals.h @@ -12,7 +12,7 @@ #ifndef BCM2835_PERIPHERALS_H #define BCM2835_PERIPHERALS_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/char/pl011.h" #include "hw/char/bcm2835_aux.h" #include "hw/display/bcm2835_fb.h" diff --git a/include/hw/arm/exynos4210.h b/include/hw/arm/exynos4210.h index fbe4370219..b29e7243c7 100644 --- a/include/hw/arm/exynos4210.h +++ b/include/hw/arm/exynos4210.h @@ -25,7 +25,7 @@ #define EXYNOS4210_H #include "hw/core/or-irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/cpu/a9mpcore.h" #include "hw/intc/exynos4210_gic.h" #include "hw/intc/exynos4210_combiner.h" diff --git a/include/hw/arm/fsl-imx8mp.h b/include/hw/arm/fsl-imx8mp.h index 1275df22f1..4b367b754c 100644 --- a/include/hw/arm/fsl-imx8mp.h +++ b/include/hw/arm/fsl-imx8mp.h @@ -26,7 +26,7 @@ #include "hw/timer/imx_gpt.h" #include "hw/usb/hcd-dwc3.h" #include "hw/watchdog/wdt_imx2.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #include "qemu/units.h" diff --git a/include/hw/arm/nrf51_soc.h b/include/hw/arm/nrf51_soc.h index 94d7fc62ac..f759d007a1 100644 --- a/include/hw/arm/nrf51_soc.h +++ b/include/hw/arm/nrf51_soc.h @@ -10,7 +10,7 @@ #ifndef NRF51_SOC_H #define NRF51_SOC_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/arm/armv7m.h" #include "hw/char/nrf51_uart.h" #include "hw/misc/nrf51_rng.h" diff --git a/include/hw/arm/smmu-common.h b/include/hw/arm/smmu-common.h index 80d0fecfde..48368c8e89 100644 --- a/include/hw/arm/smmu-common.h +++ b/include/hw/arm/smmu-common.h @@ -19,7 +19,7 @@ #ifndef HW_ARM_SMMU_COMMON_H #define HW_ARM_SMMU_COMMON_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/pci/pci.h" #include "qom/object.h" diff --git a/include/hw/arm/xlnx-versal.h b/include/hw/arm/xlnx-versal.h index e1fb1f4cf5..4c4599add1 100644 --- a/include/hw/arm/xlnx-versal.h +++ b/include/hw/arm/xlnx-versal.h @@ -13,7 +13,7 @@ #ifndef XLNX_VERSAL_H #define XLNX_VERSAL_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #include "net/can_emu.h" #include "hw/arm/xlnx-versal-version.h" diff --git a/include/hw/audio/asc.h b/include/hw/audio/asc.h index bb51e9a3d1..f4aefbfe5a 100644 --- a/include/hw/audio/asc.h +++ b/include/hw/audio/asc.h @@ -13,7 +13,7 @@ #ifndef HW_AUDIO_ASC_H #define HW_AUDIO_ASC_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/audio.h" #define ASC_FREQ 22257 diff --git a/include/hw/block/swim.h b/include/hw/block/swim.h index 5f567e8d59..e8998f57c4 100644 --- a/include/hw/block/swim.h +++ b/include/hw/block/swim.h @@ -12,7 +12,7 @@ #define SWIM_H #include "hw/block/block.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define SWIM_MAX_FD 2 diff --git a/include/hw/char/avr_usart.h b/include/hw/char/avr_usart.h index bd2d488f9a..8af7a5d1ee 100644 --- a/include/hw/char/avr_usart.h +++ b/include/hw/char/avr_usart.h @@ -22,7 +22,7 @@ #ifndef HW_CHAR_AVR_USART_H #define HW_CHAR_AVR_USART_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "chardev/char-fe.h" #include "qom/object.h" diff --git a/include/hw/char/bcm2835_aux.h b/include/hw/char/bcm2835_aux.h index a11134f216..c5ce148bbc 100644 --- a/include/hw/char/bcm2835_aux.h +++ b/include/hw/char/bcm2835_aux.h @@ -9,7 +9,7 @@ #ifndef BCM2835_AUX_H #define BCM2835_AUX_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "chardev/char-fe.h" #include "qom/object.h" diff --git a/include/hw/char/cadence_uart.h b/include/hw/char/cadence_uart.h index ad09fbdf32..751a751248 100644 --- a/include/hw/char/cadence_uart.h +++ b/include/hw/char/cadence_uart.h @@ -20,7 +20,7 @@ #define CADENCE_UART_H #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "chardev/char-fe.h" #include "qapi/error.h" #include "qemu/timer.h" diff --git a/include/hw/char/cmsdk-apb-uart.h b/include/hw/char/cmsdk-apb-uart.h index 3d0af26ceb..0c62b7f2f5 100644 --- a/include/hw/char/cmsdk-apb-uart.h +++ b/include/hw/char/cmsdk-apb-uart.h @@ -12,7 +12,7 @@ #ifndef CMSDK_APB_UART_H #define CMSDK_APB_UART_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "chardev/char-fe.h" #include "qom/object.h" diff --git a/include/hw/char/digic-uart.h b/include/hw/char/digic-uart.h index 3eebdab8a0..6f67b70dfd 100644 --- a/include/hw/char/digic-uart.h +++ b/include/hw/char/digic-uart.h @@ -18,7 +18,7 @@ #ifndef HW_CHAR_DIGIC_UART_H #define HW_CHAR_DIGIC_UART_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "chardev/char-fe.h" #include "qom/object.h" diff --git a/include/hw/char/escc.h b/include/hw/char/escc.h index 857f64699e..9e60175b77 100644 --- a/include/hw/char/escc.h +++ b/include/hw/char/escc.h @@ -3,7 +3,7 @@ #include "chardev/char-fe.h" #include "chardev/char-serial.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "ui/input.h" #include "qom/object.h" diff --git a/include/hw/char/goldfish_tty.h b/include/hw/char/goldfish_tty.h index 70fdedd1d0..a696362fa5 100644 --- a/include/hw/char/goldfish_tty.h +++ b/include/hw/char/goldfish_tty.h @@ -12,7 +12,7 @@ #include "qemu/fifo8.h" #include "chardev/char-fe.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #define TYPE_GOLDFISH_TTY "goldfish_tty" OBJECT_DECLARE_SIMPLE_TYPE(GoldfishTTYState, GOLDFISH_TTY) diff --git a/include/hw/char/ibex_uart.h b/include/hw/char/ibex_uart.h index 1ccbb602e6..882796e0c6 100644 --- a/include/hw/char/ibex_uart.h +++ b/include/hw/char/ibex_uart.h @@ -25,7 +25,7 @@ #ifndef HW_IBEX_UART_H #define HW_IBEX_UART_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "chardev/char-fe.h" #include "qemu/timer.h" #include "qom/object.h" diff --git a/include/hw/char/imx_serial.h b/include/hw/char/imx_serial.h index 2dcd2e6bcd..855792b605 100644 --- a/include/hw/char/imx_serial.h +++ b/include/hw/char/imx_serial.h @@ -18,7 +18,7 @@ #ifndef IMX_SERIAL_H #define IMX_SERIAL_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "chardev/char-fe.h" #include "qom/object.h" #include "qemu/fifo32.h" diff --git a/include/hw/char/max78000_uart.h b/include/hw/char/max78000_uart.h index ac93f83389..6977c7b3f1 100644 --- a/include/hw/char/max78000_uart.h +++ b/include/hw/char/max78000_uart.h @@ -9,7 +9,7 @@ #ifndef HW_MAX78000_UART_H #define HW_MAX78000_UART_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "chardev/char-fe.h" #include "qemu/fifo8.h" #include "qom/object.h" diff --git a/include/hw/char/mchp_pfsoc_mmuart.h b/include/hw/char/mchp_pfsoc_mmuart.h index a7b8b1b08b..1e27732df1 100644 --- a/include/hw/char/mchp_pfsoc_mmuart.h +++ b/include/hw/char/mchp_pfsoc_mmuart.h @@ -28,7 +28,7 @@ #ifndef HW_MCHP_PFSOC_MMUART_H #define HW_MCHP_PFSOC_MMUART_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/char/serial-mm.h" #define MCHP_PFSOC_MMUART_REG_COUNT 13 diff --git a/include/hw/char/nrf51_uart.h b/include/hw/char/nrf51_uart.h index 7a54db746b..36a6c54cde 100644 --- a/include/hw/char/nrf51_uart.h +++ b/include/hw/char/nrf51_uart.h @@ -11,7 +11,7 @@ #ifndef NRF51_UART_H #define NRF51_UART_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "chardev/char-fe.h" #include "hw/core/registerfields.h" #include "qom/object.h" diff --git a/include/hw/char/pl011.h b/include/hw/char/pl011.h index 2d4ff01c81..ff735b5234 100644 --- a/include/hw/char/pl011.h +++ b/include/hw/char/pl011.h @@ -15,7 +15,7 @@ #ifndef HW_PL011_H #define HW_PL011_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "chardev/char-fe.h" #include "qom/object.h" diff --git a/include/hw/char/renesas_sci.h b/include/hw/char/renesas_sci.h index 90e784f36a..372e788be4 100644 --- a/include/hw/char/renesas_sci.h +++ b/include/hw/char/renesas_sci.h @@ -10,7 +10,7 @@ #define HW_CHAR_RENESAS_SCI_H #include "chardev/char-fe.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_RENESAS_SCI "renesas-sci" diff --git a/include/hw/char/serial-mm.h b/include/hw/char/serial-mm.h index 77abd098e0..0076bdc061 100644 --- a/include/hw/char/serial-mm.h +++ b/include/hw/char/serial-mm.h @@ -29,7 +29,7 @@ #include "hw/char/serial.h" #include "system/memory.h" #include "chardev/char.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_SERIAL_MM "serial-mm" diff --git a/include/hw/char/shakti_uart.h b/include/hw/char/shakti_uart.h index e5e775d7c9..e77553f2b5 100644 --- a/include/hw/char/shakti_uart.h +++ b/include/hw/char/shakti_uart.h @@ -25,7 +25,7 @@ #ifndef HW_SHAKTI_UART_H #define HW_SHAKTI_UART_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "chardev/char-fe.h" #define SHAKTI_UART_BAUD 0x00 diff --git a/include/hw/char/sifive_uart.h b/include/hw/char/sifive_uart.h index dea6055f87..414564b026 100644 --- a/include/hw/char/sifive_uart.h +++ b/include/hw/char/sifive_uart.h @@ -22,7 +22,7 @@ #include "chardev/char-fe.h" #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #include "qemu/fifo8.h" diff --git a/include/hw/char/stm32f2xx_usart.h b/include/hw/char/stm32f2xx_usart.h index f9018b8b8f..5bb5bb28c1 100644 --- a/include/hw/char/stm32f2xx_usart.h +++ b/include/hw/char/stm32f2xx_usart.h @@ -25,7 +25,7 @@ #ifndef HW_STM32F2XX_USART_H #define HW_STM32F2XX_USART_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "chardev/char-fe.h" #include "qom/object.h" diff --git a/include/hw/char/stm32l4x5_usart.h b/include/hw/char/stm32l4x5_usart.h index cdf7419f53..3bb59fd654 100644 --- a/include/hw/char/stm32l4x5_usart.h +++ b/include/hw/char/stm32l4x5_usart.h @@ -18,7 +18,7 @@ #ifndef HW_STM32L4X5_USART_H #define HW_STM32L4X5_USART_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "chardev/char-fe.h" #include "qom/object.h" diff --git a/include/hw/core/or-irq.h b/include/hw/core/or-irq.h index c0a42f3711..1123cc518f 100644 --- a/include/hw/core/or-irq.h +++ b/include/hw/core/or-irq.h @@ -25,7 +25,7 @@ #ifndef HW_OR_IRQ_H #define HW_OR_IRQ_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_OR_IRQ "or-irq" diff --git a/include/hw/core/platform-bus.h b/include/hw/core/platform-bus.h index 44f30c5353..45b9d8dbc7 100644 --- a/include/hw/core/platform-bus.h +++ b/include/hw/core/platform-bus.h @@ -22,7 +22,7 @@ * License along with this library; if not, see . */ -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" diff --git a/include/hw/core/split-irq.h b/include/hw/core/split-irq.h index ff8852f407..19e9830b76 100644 --- a/include/hw/core/split-irq.h +++ b/include/hw/core/split-irq.h @@ -35,7 +35,7 @@ #ifndef HW_SPLIT_IRQ_H #define HW_SPLIT_IRQ_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_SPLIT_IRQ "split-irq" diff --git a/include/hw/sysbus.h b/include/hw/core/sysbus.h similarity index 100% rename from include/hw/sysbus.h rename to include/hw/core/sysbus.h diff --git a/include/hw/cpu/a15mpcore.h b/include/hw/cpu/a15mpcore.h index 75d39e5458..138f491c22 100644 --- a/include/hw/cpu/a15mpcore.h +++ b/include/hw/cpu/a15mpcore.h @@ -20,7 +20,7 @@ #ifndef HW_CPU_A15MPCORE_H #define HW_CPU_A15MPCORE_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/intc/arm_gic.h" #include "qom/object.h" diff --git a/include/hw/cpu/a9mpcore.h b/include/hw/cpu/a9mpcore.h index e0396ab6af..6076599024 100644 --- a/include/hw/cpu/a9mpcore.h +++ b/include/hw/cpu/a9mpcore.h @@ -10,7 +10,7 @@ #ifndef HW_CPU_A9MPCORE_H #define HW_CPU_A9MPCORE_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/intc/arm_gic.h" #include "hw/misc/a9scu.h" #include "hw/timer/arm_mptimer.h" diff --git a/include/hw/cpu/arm11mpcore.h b/include/hw/cpu/arm11mpcore.h index 2cac8c1232..1a8fbc550a 100644 --- a/include/hw/cpu/arm11mpcore.h +++ b/include/hw/cpu/arm11mpcore.h @@ -10,7 +10,7 @@ #ifndef HW_CPU_ARM11MPCORE_H #define HW_CPU_ARM11MPCORE_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/misc/arm11scu.h" #include "hw/intc/arm_gic.h" #include "hw/timer/arm_mptimer.h" diff --git a/include/hw/display/bcm2835_fb.h b/include/hw/display/bcm2835_fb.h index acc9230b6a..f7ef076f1f 100644 --- a/include/hw/display/bcm2835_fb.h +++ b/include/hw/display/bcm2835_fb.h @@ -12,7 +12,7 @@ #ifndef BCM2835_FB_H #define BCM2835_FB_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define UPPER_RAM_BASE 0x40000000 diff --git a/include/hw/display/macfb.h b/include/hw/display/macfb.h index 356a03ce31..495dead44b 100644 --- a/include/hw/display/macfb.h +++ b/include/hw/display/macfb.h @@ -16,7 +16,7 @@ #include "system/memory.h" #include "hw/core/irq.h" #include "hw/nubus/nubus.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "ui/console.h" #include "qemu/timer.h" diff --git a/include/hw/display/xlnx_dp.h b/include/hw/display/xlnx_dp.h index 9ec5a90c34..b01c77fed6 100644 --- a/include/hw/display/xlnx_dp.h +++ b/include/hw/display/xlnx_dp.h @@ -24,7 +24,7 @@ #ifndef XLNX_DP_H #define XLNX_DP_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "ui/console.h" #include "hw/misc/auxbus.h" #include "hw/i2c/i2c.h" diff --git a/include/hw/dma/bcm2835_dma.h b/include/hw/dma/bcm2835_dma.h index 1d26b1d8d0..9c20652d4e 100644 --- a/include/hw/dma/bcm2835_dma.h +++ b/include/hw/dma/bcm2835_dma.h @@ -8,7 +8,7 @@ #ifndef BCM2835_DMA_H #define BCM2835_DMA_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" typedef struct { diff --git a/include/hw/dma/pl080.h b/include/hw/dma/pl080.h index 3c9659e438..6635cd8e93 100644 --- a/include/hw/dma/pl080.h +++ b/include/hw/dma/pl080.h @@ -29,7 +29,7 @@ #ifndef HW_DMA_PL080_H #define HW_DMA_PL080_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define PL080_MAX_CHANNELS 8 diff --git a/include/hw/dma/sifive_pdma.h b/include/hw/dma/sifive_pdma.h index 8c6cfa7f32..34494ec601 100644 --- a/include/hw/dma/sifive_pdma.h +++ b/include/hw/dma/sifive_pdma.h @@ -23,7 +23,7 @@ #ifndef SIFIVE_PDMA_H #define SIFIVE_PDMA_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" struct sifive_pdma_chan { uint32_t control; diff --git a/include/hw/dma/xlnx-zdma.h b/include/hw/dma/xlnx-zdma.h index 2d2d4aeefa..7d254c66e7 100644 --- a/include/hw/dma/xlnx-zdma.h +++ b/include/hw/dma/xlnx-zdma.h @@ -29,7 +29,7 @@ #ifndef XLNX_ZDMA_H #define XLNX_ZDMA_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #include "system/dma.h" #include "qom/object.h" diff --git a/include/hw/dma/xlnx-zynq-devcfg.h b/include/hw/dma/xlnx-zynq-devcfg.h index 8d10553c22..3e3cc7b98b 100644 --- a/include/hw/dma/xlnx-zynq-devcfg.h +++ b/include/hw/dma/xlnx-zynq-devcfg.h @@ -28,7 +28,7 @@ #define XLNX_ZYNQ_DEVCFG_H #include "hw/core/register.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_XLNX_ZYNQ_DEVCFG "xlnx.ps7-dev-cfg" diff --git a/include/hw/dma/xlnx_csu_dma.h b/include/hw/dma/xlnx_csu_dma.h index 4d6d18fb9b..ceb28f40ba 100644 --- a/include/hw/dma/xlnx_csu_dma.h +++ b/include/hw/dma/xlnx_csu_dma.h @@ -21,7 +21,7 @@ #ifndef XLNX_CSU_DMA_H #define XLNX_CSU_DMA_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #include "hw/core/ptimer.h" #include "hw/core/stream.h" diff --git a/include/hw/dma/xlnx_dpdma.h b/include/hw/dma/xlnx_dpdma.h index 484b2e377f..7cf67aef6e 100644 --- a/include/hw/dma/xlnx_dpdma.h +++ b/include/hw/dma/xlnx_dpdma.h @@ -25,7 +25,7 @@ #ifndef XLNX_DPDMA_H #define XLNX_DPDMA_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "system/dma.h" #include "qom/object.h" diff --git a/include/hw/fsi/aspeed_apb2opb.h b/include/hw/fsi/aspeed_apb2opb.h index 878619eafa..e42399185a 100644 --- a/include/hw/fsi/aspeed_apb2opb.h +++ b/include/hw/fsi/aspeed_apb2opb.h @@ -10,7 +10,7 @@ #include "system/memory.h" #include "hw/fsi/fsi-master.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #define TYPE_FSI_OPB "fsi.opb" diff --git a/include/hw/gpio/aspeed_gpio.h b/include/hw/gpio/aspeed_gpio.h index e6b2fe71b5..0ff4539cb2 100644 --- a/include/hw/gpio/aspeed_gpio.h +++ b/include/hw/gpio/aspeed_gpio.h @@ -10,7 +10,7 @@ #ifndef ASPEED_GPIO_H #define ASPEED_GPIO_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_ASPEED_GPIO "aspeed.gpio" diff --git a/include/hw/gpio/bcm2835_gpio.h b/include/hw/gpio/bcm2835_gpio.h index 1c53a05090..c1410ccbeb 100644 --- a/include/hw/gpio/bcm2835_gpio.h +++ b/include/hw/gpio/bcm2835_gpio.h @@ -15,7 +15,7 @@ #define BCM2835_GPIO_H #include "hw/sd/sd.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" struct BCM2835GpioState { diff --git a/include/hw/gpio/bcm2838_gpio.h b/include/hw/gpio/bcm2838_gpio.h index f2a57a697f..9324ebcbae 100644 --- a/include/hw/gpio/bcm2838_gpio.h +++ b/include/hw/gpio/bcm2838_gpio.h @@ -15,7 +15,7 @@ #define BCM2838_GPIO_H #include "hw/sd/sd.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_BCM2838_GPIO "bcm2838-gpio" diff --git a/include/hw/gpio/imx_gpio.h b/include/hw/gpio/imx_gpio.h index 227860b9f0..ae2afb3c0f 100644 --- a/include/hw/gpio/imx_gpio.h +++ b/include/hw/gpio/imx_gpio.h @@ -20,7 +20,7 @@ #ifndef IMX_GPIO_H #define IMX_GPIO_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_IMX_GPIO "imx.gpio" diff --git a/include/hw/gpio/npcm7xx_gpio.h b/include/hw/gpio/npcm7xx_gpio.h index 7c0bf61a96..9b2a3f27d3 100644 --- a/include/hw/gpio/npcm7xx_gpio.h +++ b/include/hw/gpio/npcm7xx_gpio.h @@ -16,7 +16,7 @@ #define NPCM7XX_GPIO_H #include "system/memory.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" /* Number of pins managed by each controller. */ #define NPCM7XX_GPIO_NR_PINS (32) diff --git a/include/hw/gpio/nrf51_gpio.h b/include/hw/gpio/nrf51_gpio.h index fcfa2bac17..661e79b921 100644 --- a/include/hw/gpio/nrf51_gpio.h +++ b/include/hw/gpio/nrf51_gpio.h @@ -26,7 +26,7 @@ #ifndef NRF51_GPIO_H #define NRF51_GPIO_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_NRF51_GPIO "nrf51_soc.gpio" OBJECT_DECLARE_SIMPLE_TYPE(NRF51GPIOState, NRF51_GPIO) diff --git a/include/hw/gpio/sifive_gpio.h b/include/hw/gpio/sifive_gpio.h index fc53785c9d..e96cf33df6 100644 --- a/include/hw/gpio/sifive_gpio.h +++ b/include/hw/gpio/sifive_gpio.h @@ -14,7 +14,7 @@ #ifndef SIFIVE_GPIO_H #define SIFIVE_GPIO_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_SIFIVE_GPIO "sifive_soc.gpio" diff --git a/include/hw/gpio/stm32l4x5_gpio.h b/include/hw/gpio/stm32l4x5_gpio.h index 878bd19fc9..6219754129 100644 --- a/include/hw/gpio/stm32l4x5_gpio.h +++ b/include/hw/gpio/stm32l4x5_gpio.h @@ -19,7 +19,7 @@ #ifndef HW_STM32L4X5_GPIO_H #define HW_STM32L4X5_GPIO_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_STM32L4X5_GPIO "stm32l4x5-gpio" diff --git a/include/hw/hyperv/vmbus-bridge.h b/include/hw/hyperv/vmbus-bridge.h index 1e5419574e..2cf73075c6 100644 --- a/include/hw/hyperv/vmbus-bridge.h +++ b/include/hw/hyperv/vmbus-bridge.h @@ -10,7 +10,7 @@ #ifndef HW_HYPERV_VMBUS_BRIDGE_H #define HW_HYPERV_VMBUS_BRIDGE_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/hyperv/vmbus.h" #include "qom/object.h" diff --git a/include/hw/i2c/allwinner-i2c.h b/include/hw/i2c/allwinner-i2c.h index 0e325d265e..72836cc101 100644 --- a/include/hw/i2c/allwinner-i2c.h +++ b/include/hw/i2c/allwinner-i2c.h @@ -24,7 +24,7 @@ #ifndef ALLWINNER_I2C_H #define ALLWINNER_I2C_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_AW_I2C "allwinner.i2c" diff --git a/include/hw/i2c/arm_sbcon_i2c.h b/include/hw/i2c/arm_sbcon_i2c.h index da9b5e8f83..39b99f57bf 100644 --- a/include/hw/i2c/arm_sbcon_i2c.h +++ b/include/hw/i2c/arm_sbcon_i2c.h @@ -13,7 +13,7 @@ #ifndef HW_I2C_ARM_SBCON_I2C_H #define HW_I2C_ARM_SBCON_I2C_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/i2c/bitbang_i2c.h" #include "qom/object.h" diff --git a/include/hw/i2c/aspeed_i2c.h b/include/hw/i2c/aspeed_i2c.h index c9c2620a8a..ffcff2580f 100644 --- a/include/hw/i2c/aspeed_i2c.h +++ b/include/hw/i2c/aspeed_i2c.h @@ -21,7 +21,7 @@ #define ASPEED_I2C_H #include "hw/i2c/i2c.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/registerfields.h" #include "qom/object.h" diff --git a/include/hw/i2c/bcm2835_i2c.h b/include/hw/i2c/bcm2835_i2c.h index 0a56df4720..45f876df22 100644 --- a/include/hw/i2c/bcm2835_i2c.h +++ b/include/hw/i2c/bcm2835_i2c.h @@ -24,7 +24,7 @@ * THE SOFTWARE. */ -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/i2c/i2c.h" #include "qom/object.h" diff --git a/include/hw/i2c/imx_i2c.h b/include/hw/i2c/imx_i2c.h index e4f91339f5..988a3e284f 100644 --- a/include/hw/i2c/imx_i2c.h +++ b/include/hw/i2c/imx_i2c.h @@ -21,7 +21,7 @@ #ifndef IMX_I2C_H #define IMX_I2C_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_IMX_I2C "imx.i2c" diff --git a/include/hw/i2c/microbit_i2c.h b/include/hw/i2c/microbit_i2c.h index 3c29e09bf3..a3ec27ff6c 100644 --- a/include/hw/i2c/microbit_i2c.h +++ b/include/hw/i2c/microbit_i2c.h @@ -11,7 +11,7 @@ #ifndef MICROBIT_I2C_H #define MICROBIT_I2C_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/arm/nrf51.h" #include "qom/object.h" diff --git a/include/hw/i2c/npcm7xx_smbus.h b/include/hw/i2c/npcm7xx_smbus.h index f5adb69c67..dff9bc2f6e 100644 --- a/include/hw/i2c/npcm7xx_smbus.h +++ b/include/hw/i2c/npcm7xx_smbus.h @@ -19,7 +19,7 @@ #include "system/memory.h" #include "hw/i2c/i2c.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" /* * Number of addresses this module contains. Do not change this without diff --git a/include/hw/i2c/ppc4xx_i2c.h b/include/hw/i2c/ppc4xx_i2c.h index 4e882fa3c8..5b875eedac 100644 --- a/include/hw/i2c/ppc4xx_i2c.h +++ b/include/hw/i2c/ppc4xx_i2c.h @@ -27,7 +27,7 @@ #ifndef PPC4XX_I2C_H #define PPC4XX_I2C_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/i2c/bitbang_i2c.h" #include "qom/object.h" diff --git a/include/hw/i386/x86-iommu.h b/include/hw/i386/x86-iommu.h index e89f55a5c2..c526a047ab 100644 --- a/include/hw/i386/x86-iommu.h +++ b/include/hw/i386/x86-iommu.h @@ -20,7 +20,7 @@ #ifndef HW_I386_X86_IOMMU_H #define HW_I386_X86_IOMMU_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/pci/msi.h" #include "qom/object.h" diff --git a/include/hw/ide/ahci-sysbus.h b/include/hw/ide/ahci-sysbus.h index 06eaac8cb6..34d0c8f55a 100644 --- a/include/hw/ide/ahci-sysbus.h +++ b/include/hw/ide/ahci-sysbus.h @@ -7,7 +7,7 @@ #define HW_IDE_AHCI_SYSBUS_H #include "qom/object.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/ide/ahci.h" #define TYPE_SYSBUS_AHCI "sysbus-ahci" diff --git a/include/hw/input/i8042.h b/include/hw/input/i8042.h index e90f008b66..07d749b3d0 100644 --- a/include/hw/input/i8042.h +++ b/include/hw/input/i8042.h @@ -9,7 +9,7 @@ #define HW_INPUT_I8042_H #include "hw/isa/isa.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/input/ps2.h" #include "qom/object.h" diff --git a/include/hw/input/lasips2.h b/include/hw/input/lasips2.h index fd74883073..2739f752c8 100644 --- a/include/hw/input/lasips2.h +++ b/include/hw/input/lasips2.h @@ -20,7 +20,7 @@ #define HW_INPUT_LASIPS2_H #include "exec/hwaddr.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/input/ps2.h" #define TYPE_LASIPS2_PORT "lasips2-port" diff --git a/include/hw/input/pl050.h b/include/hw/input/pl050.h index db662654c5..2cdfa74f73 100644 --- a/include/hw/input/pl050.h +++ b/include/hw/input/pl050.h @@ -10,7 +10,7 @@ #ifndef HW_PL050_H #define HW_PL050_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "migration/vmstate.h" #include "hw/input/ps2.h" #include "hw/core/irq.h" diff --git a/include/hw/input/ps2.h b/include/hw/input/ps2.h index cd61a634c3..058db3e089 100644 --- a/include/hw/input/ps2.h +++ b/include/hw/input/ps2.h @@ -25,7 +25,7 @@ #ifndef HW_PS2_H #define HW_PS2_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #define PS2_MOUSE_BUTTON_LEFT 0x01 #define PS2_MOUSE_BUTTON_RIGHT 0x02 diff --git a/include/hw/input/stellaris_gamepad.h b/include/hw/input/stellaris_gamepad.h index 51085e166c..e011482646 100644 --- a/include/hw/input/stellaris_gamepad.h +++ b/include/hw/input/stellaris_gamepad.h @@ -11,7 +11,7 @@ #ifndef HW_INPUT_STELLARIS_GAMEPAD_H #define HW_INPUT_STELLARIS_GAMEPAD_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" /* diff --git a/include/hw/intc/allwinner-a10-pic.h b/include/hw/intc/allwinner-a10-pic.h index b8364d3ed4..f22059ed85 100644 --- a/include/hw/intc/allwinner-a10-pic.h +++ b/include/hw/intc/allwinner-a10-pic.h @@ -1,7 +1,7 @@ #ifndef ALLWINNER_A10_PIC_H #define ALLWINNER_A10_PIC_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_AW_A10_PIC "allwinner-a10-pic" diff --git a/include/hw/intc/arm_gic_common.h b/include/hw/intc/arm_gic_common.h index 93a3cc2bf8..b169394e6c 100644 --- a/include/hw/intc/arm_gic_common.h +++ b/include/hw/intc/arm_gic_common.h @@ -21,7 +21,7 @@ #ifndef HW_ARM_GIC_COMMON_H #define HW_ARM_GIC_COMMON_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" /* Maximum number of possible interrupts, determined by the GIC architecture */ diff --git a/include/hw/intc/arm_gicv3_common.h b/include/hw/intc/arm_gicv3_common.h index 61d51915e0..3d24ad22d2 100644 --- a/include/hw/intc/arm_gicv3_common.h +++ b/include/hw/intc/arm_gicv3_common.h @@ -24,7 +24,7 @@ #ifndef HW_ARM_GICV3_COMMON_H #define HW_ARM_GICV3_COMMON_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/intc/arm_gic_common.h" #include "qom/object.h" #include "qemu/notify.h" diff --git a/include/hw/intc/arm_gicv3_its_common.h b/include/hw/intc/arm_gicv3_its_common.h index 3c7b543b01..05b438aa7a 100644 --- a/include/hw/intc/arm_gicv3_its_common.h +++ b/include/hw/intc/arm_gicv3_its_common.h @@ -21,7 +21,7 @@ #ifndef QEMU_ARM_GICV3_ITS_COMMON_H #define QEMU_ARM_GICV3_ITS_COMMON_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/intc/arm_gicv3_common.h" #include "qom/object.h" diff --git a/include/hw/intc/armv7m_nvic.h b/include/hw/intc/armv7m_nvic.h index 7b9964fe7e..e699546f6a 100644 --- a/include/hw/intc/armv7m_nvic.h +++ b/include/hw/intc/armv7m_nvic.h @@ -11,7 +11,7 @@ #define HW_ARM_ARMV7M_NVIC_H #include "target/arm/cpu-qom.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/timer/armv7m_systick.h" #include "qom/object.h" diff --git a/include/hw/intc/aspeed_intc.h b/include/hw/intc/aspeed_intc.h index 6dd8effcd8..5d10268fff 100644 --- a/include/hw/intc/aspeed_intc.h +++ b/include/hw/intc/aspeed_intc.h @@ -8,7 +8,7 @@ #ifndef ASPEED_INTC_H #define ASPEED_INTC_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #include "hw/core/or-irq.h" diff --git a/include/hw/intc/aspeed_vic.h b/include/hw/intc/aspeed_vic.h index 68d6ab997a..5172f5c913 100644 --- a/include/hw/intc/aspeed_vic.h +++ b/include/hw/intc/aspeed_vic.h @@ -13,7 +13,7 @@ #ifndef ASPEED_VIC_H #define ASPEED_VIC_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_ASPEED_VIC "aspeed.vic" diff --git a/include/hw/intc/bcm2835_ic.h b/include/hw/intc/bcm2835_ic.h index 588eb76c5c..f9ebaac8f9 100644 --- a/include/hw/intc/bcm2835_ic.h +++ b/include/hw/intc/bcm2835_ic.h @@ -8,7 +8,7 @@ #ifndef BCM2835_IC_H #define BCM2835_IC_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_BCM2835_IC "bcm2835-ic" diff --git a/include/hw/intc/bcm2836_control.h b/include/hw/intc/bcm2836_control.h index a410c817e8..05380f1b85 100644 --- a/include/hw/intc/bcm2836_control.h +++ b/include/hw/intc/bcm2836_control.h @@ -15,7 +15,7 @@ #ifndef BCM2836_CONTROL_H #define BCM2836_CONTROL_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/timer.h" #include "qom/object.h" diff --git a/include/hw/intc/exynos4210_combiner.h b/include/hw/intc/exynos4210_combiner.h index bd207a7e6e..b1db48cb88 100644 --- a/include/hw/intc/exynos4210_combiner.h +++ b/include/hw/intc/exynos4210_combiner.h @@ -23,7 +23,7 @@ #ifndef HW_INTC_EXYNOS4210_COMBINER_H #define HW_INTC_EXYNOS4210_COMBINER_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" /* * State for each output signal of internal combiner diff --git a/include/hw/intc/exynos4210_gic.h b/include/hw/intc/exynos4210_gic.h index f64c4069c6..6ffe57c230 100644 --- a/include/hw/intc/exynos4210_gic.h +++ b/include/hw/intc/exynos4210_gic.h @@ -22,7 +22,7 @@ #ifndef HW_INTC_EXYNOS4210_GIC_H #define HW_INTC_EXYNOS4210_GIC_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #define TYPE_EXYNOS4210_GIC "exynos4210.gic" OBJECT_DECLARE_SIMPLE_TYPE(Exynos4210GicState, EXYNOS4210_GIC) diff --git a/include/hw/intc/goldfish_pic.h b/include/hw/intc/goldfish_pic.h index 3e79580367..e61df599b0 100644 --- a/include/hw/intc/goldfish_pic.h +++ b/include/hw/intc/goldfish_pic.h @@ -10,7 +10,7 @@ #ifndef HW_INTC_GOLDFISH_PIC_H #define HW_INTC_GOLDFISH_PIC_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #define TYPE_GOLDFISH_PIC "goldfish_pic" OBJECT_DECLARE_SIMPLE_TYPE(GoldfishPICState, GOLDFISH_PIC) diff --git a/include/hw/intc/grlib_irqmp.h b/include/hw/intc/grlib_irqmp.h index a76acbf940..e39496ca5d 100644 --- a/include/hw/intc/grlib_irqmp.h +++ b/include/hw/intc/grlib_irqmp.h @@ -27,7 +27,7 @@ #ifndef GRLIB_IRQMP_H #define GRLIB_IRQMP_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" /* Emulation of GrLib device is base on the GRLIB IP Core User's Manual: * http://www.gaisler.com/products/grlib/grip.pdf diff --git a/include/hw/intc/heathrow_pic.h b/include/hw/intc/heathrow_pic.h index c0a7f6f546..cfd8a8df2b 100644 --- a/include/hw/intc/heathrow_pic.h +++ b/include/hw/intc/heathrow_pic.h @@ -26,7 +26,7 @@ #ifndef HW_INTC_HEATHROW_PIC_H #define HW_INTC_HEATHROW_PIC_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_HEATHROW "heathrow" diff --git a/include/hw/intc/imx_avic.h b/include/hw/intc/imx_avic.h index 75fbd1a89c..82ce9037ed 100644 --- a/include/hw/intc/imx_avic.h +++ b/include/hw/intc/imx_avic.h @@ -17,7 +17,7 @@ #ifndef IMX_AVIC_H #define IMX_AVIC_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_IMX_AVIC "imx.avic" diff --git a/include/hw/intc/imx_gpcv2.h b/include/hw/intc/imx_gpcv2.h index 7bdee7e80a..7a3441ac65 100644 --- a/include/hw/intc/imx_gpcv2.h +++ b/include/hw/intc/imx_gpcv2.h @@ -1,7 +1,7 @@ #ifndef IMX_GPCV2_H #define IMX_GPCV2_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" enum IMXGPCv2Registers { diff --git a/include/hw/intc/loongarch_dintc.h b/include/hw/intc/loongarch_dintc.h index 01bb1e465c..1f4f65705a 100644 --- a/include/hw/intc/loongarch_dintc.h +++ b/include/hw/intc/loongarch_dintc.h @@ -6,7 +6,7 @@ */ #include "qom/object.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/loongarch/virt.h" #include "system/memory.h" diff --git a/include/hw/intc/loongarch_extioi_common.h b/include/hw/intc/loongarch_extioi_common.h index 1bd2bfa07f..2dbc2563eb 100644 --- a/include/hw/intc/loongarch_extioi_common.h +++ b/include/hw/intc/loongarch_extioi_common.h @@ -8,7 +8,7 @@ #define LOONGARCH_EXTIOI_COMMON_H #include "qom/object.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/loongarch/virt.h" #include "system/memory.h" diff --git a/include/hw/intc/loongarch_pch_msi.h b/include/hw/intc/loongarch_pch_msi.h index ef4ec4fdeb..fec51187c2 100644 --- a/include/hw/intc/loongarch_pch_msi.h +++ b/include/hw/intc/loongarch_pch_msi.h @@ -5,7 +5,7 @@ * Copyright (C) 2021 Loongson Technology Corporation Limited */ -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "system/memory.h" #define TYPE_LOONGARCH_PCH_MSI "loongarch_pch_msi" diff --git a/include/hw/intc/loongarch_pic_common.h b/include/hw/intc/loongarch_pic_common.h index 179361eb56..1627ec0899 100644 --- a/include/hw/intc/loongarch_pic_common.h +++ b/include/hw/intc/loongarch_pic_common.h @@ -8,7 +8,7 @@ #define HW_LOONGARCH_PIC_COMMON_H #include "hw/loongarch/virt.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "system/memory.h" #define PCH_PIC_INT_ID 0x00 diff --git a/include/hw/intc/loongson_ipi.h b/include/hw/intc/loongson_ipi.h index 4e517cc8dc..afb8488725 100644 --- a/include/hw/intc/loongson_ipi.h +++ b/include/hw/intc/loongson_ipi.h @@ -10,7 +10,7 @@ #include "qom/object.h" #include "hw/intc/loongson_ipi_common.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #define TYPE_LOONGSON_IPI "loongson_ipi" OBJECT_DECLARE_TYPE(LoongsonIPIState, LoongsonIPIClass, LOONGSON_IPI) diff --git a/include/hw/intc/loongson_ipi_common.h b/include/hw/intc/loongson_ipi_common.h index 4fa03bc351..feb858780a 100644 --- a/include/hw/intc/loongson_ipi_common.h +++ b/include/hw/intc/loongson_ipi_common.h @@ -9,7 +9,7 @@ #define HW_LOONGSON_IPI_COMMON_H #include "qom/object.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "exec/memattrs.h" #include "system/memory.h" diff --git a/include/hw/intc/loongson_liointc.h b/include/hw/intc/loongson_liointc.h index 848e65eb35..f400f691b0 100644 --- a/include/hw/intc/loongson_liointc.h +++ b/include/hw/intc/loongson_liointc.h @@ -12,7 +12,7 @@ #define LOONGSON_LIOINTC_H #include "qemu/units.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_LOONGSON_LIOINTC "loongson.liointc" diff --git a/include/hw/intc/m68k_irqc.h b/include/hw/intc/m68k_irqc.h index 693e33b0aa..b2b184dbc9 100644 --- a/include/hw/intc/m68k_irqc.h +++ b/include/hw/intc/m68k_irqc.h @@ -10,7 +10,7 @@ #ifndef M68K_IRQC_H #define M68K_IRQC_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #define TYPE_M68K_IRQC "m68k-irq-controller" #define M68K_IRQC(obj) OBJECT_CHECK(M68KIRQCState, (obj), \ diff --git a/include/hw/intc/mips_gic.h b/include/hw/intc/mips_gic.h index 5e4c71edd4..e2e6f0a168 100644 --- a/include/hw/intc/mips_gic.h +++ b/include/hw/intc/mips_gic.h @@ -13,7 +13,7 @@ #include "qemu/units.h" #include "hw/timer/mips_gictimer.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "cpu.h" #include "qom/object.h" /* diff --git a/include/hw/intc/realview_gic.h b/include/hw/intc/realview_gic.h index f37339dc0b..6feaf1a605 100644 --- a/include/hw/intc/realview_gic.h +++ b/include/hw/intc/realview_gic.h @@ -10,7 +10,7 @@ #ifndef HW_INTC_REALVIEW_GIC_H #define HW_INTC_REALVIEW_GIC_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/intc/arm_gic.h" #include "qom/object.h" diff --git a/include/hw/intc/riscv_aclint.h b/include/hw/intc/riscv_aclint.h index 4b7406eec0..5310615cbf 100644 --- a/include/hw/intc/riscv_aclint.h +++ b/include/hw/intc/riscv_aclint.h @@ -21,7 +21,7 @@ #ifndef HW_RISCV_ACLINT_H #define HW_RISCV_ACLINT_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #define TYPE_RISCV_ACLINT_MTIMER "riscv.aclint.mtimer" diff --git a/include/hw/intc/riscv_aplic.h b/include/hw/intc/riscv_aplic.h index 489b9133c2..c7a4d4ad01 100644 --- a/include/hw/intc/riscv_aplic.h +++ b/include/hw/intc/riscv_aplic.h @@ -19,7 +19,7 @@ #ifndef HW_RISCV_APLIC_H #define HW_RISCV_APLIC_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_RISCV_APLIC "riscv.aplic" diff --git a/include/hw/intc/riscv_imsic.h b/include/hw/intc/riscv_imsic.h index 58c2aaa8dc..fae999731d 100644 --- a/include/hw/intc/riscv_imsic.h +++ b/include/hw/intc/riscv_imsic.h @@ -19,7 +19,7 @@ #ifndef HW_RISCV_IMSIC_H #define HW_RISCV_IMSIC_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_RISCV_IMSIC "riscv.imsic" diff --git a/include/hw/intc/rx_icu.h b/include/hw/intc/rx_icu.h index b23504f3dd..2f2746b868 100644 --- a/include/hw/intc/rx_icu.h +++ b/include/hw/intc/rx_icu.h @@ -21,7 +21,7 @@ #ifndef HW_INTC_RX_ICU_H #define HW_INTC_RX_ICU_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" enum TRG_MODE { diff --git a/include/hw/intc/sifive_plic.h b/include/hw/intc/sifive_plic.h index d3f45ec248..32973dbf28 100644 --- a/include/hw/intc/sifive_plic.h +++ b/include/hw/intc/sifive_plic.h @@ -21,7 +21,7 @@ #ifndef HW_SIFIVE_PLIC_H #define HW_SIFIVE_PLIC_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_SIFIVE_PLIC "riscv.sifive.plic" diff --git a/include/hw/intc/xlnx-pmu-iomod-intc.h b/include/hw/intc/xlnx-pmu-iomod-intc.h index e36b5e1762..1a1b0e813d 100644 --- a/include/hw/intc/xlnx-pmu-iomod-intc.h +++ b/include/hw/intc/xlnx-pmu-iomod-intc.h @@ -25,7 +25,7 @@ #ifndef HW_INTC_XLNX_PMU_IOMOD_INTC_H #define HW_INTC_XLNX_PMU_IOMOD_INTC_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #include "qom/object.h" diff --git a/include/hw/intc/xlnx-zynqmp-ipi.h b/include/hw/intc/xlnx-zynqmp-ipi.h index 53fc89084a..57ac6e6852 100644 --- a/include/hw/intc/xlnx-zynqmp-ipi.h +++ b/include/hw/intc/xlnx-zynqmp-ipi.h @@ -25,7 +25,7 @@ #ifndef XLNX_ZYNQMP_IPI_H #define XLNX_ZYNQMP_IPI_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #include "qom/object.h" diff --git a/include/hw/m68k/q800-glue.h b/include/hw/m68k/q800-glue.h index 04fac25f6c..ac3404d6db 100644 --- a/include/hw/m68k/q800-glue.h +++ b/include/hw/m68k/q800-glue.h @@ -23,7 +23,7 @@ #ifndef HW_Q800_GLUE_H #define HW_Q800_GLUE_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #define TYPE_GLUE "q800-glue" OBJECT_DECLARE_SIMPLE_TYPE(GLUEState, GLUE) diff --git a/include/hw/mem/npcm7xx_mc.h b/include/hw/mem/npcm7xx_mc.h index 568cc35fdd..9c724e83fd 100644 --- a/include/hw/mem/npcm7xx_mc.h +++ b/include/hw/mem/npcm7xx_mc.h @@ -17,7 +17,7 @@ #define NPCM7XX_MC_H #include "system/memory.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" /** * struct NPCM7xxMCState - Device state for the memory controller. diff --git a/include/hw/mips/cps.h b/include/hw/mips/cps.h index e7309841d0..878b4d819f 100644 --- a/include/hw/mips/cps.h +++ b/include/hw/mips/cps.h @@ -20,7 +20,7 @@ #ifndef MIPS_CPS_H #define MIPS_CPS_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/clock.h" #include "hw/misc/mips_cmgcr.h" #include "hw/intc/mips_gic.h" diff --git a/include/hw/misc/a9scu.h b/include/hw/misc/a9scu.h index c3759fb8c8..312fb29434 100644 --- a/include/hw/misc/a9scu.h +++ b/include/hw/misc/a9scu.h @@ -10,7 +10,7 @@ #ifndef HW_MISC_A9SCU_H #define HW_MISC_A9SCU_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" /* A9MP private memory region. */ diff --git a/include/hw/misc/allwinner-a10-ccm.h b/include/hw/misc/allwinner-a10-ccm.h index 7f22532efa..109b83f4df 100644 --- a/include/hw/misc/allwinner-a10-ccm.h +++ b/include/hw/misc/allwinner-a10-ccm.h @@ -24,7 +24,7 @@ #define HW_MISC_ALLWINNER_A10_CCM_H #include "qom/object.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" /** * @name Constants diff --git a/include/hw/misc/allwinner-a10-dramc.h b/include/hw/misc/allwinner-a10-dramc.h index a1ae621e21..44663dee44 100644 --- a/include/hw/misc/allwinner-a10-dramc.h +++ b/include/hw/misc/allwinner-a10-dramc.h @@ -24,7 +24,7 @@ #define HW_MISC_ALLWINNER_A10_DRAMC_H #include "qom/object.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" /** diff --git a/include/hw/misc/allwinner-cpucfg.h b/include/hw/misc/allwinner-cpucfg.h index a717b47299..0214f1fb77 100644 --- a/include/hw/misc/allwinner-cpucfg.h +++ b/include/hw/misc/allwinner-cpucfg.h @@ -21,7 +21,7 @@ #define HW_MISC_ALLWINNER_CPUCFG_H #include "qom/object.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" /** * Object model diff --git a/include/hw/misc/allwinner-h3-ccu.h b/include/hw/misc/allwinner-h3-ccu.h index a04875bfca..b8a1721686 100644 --- a/include/hw/misc/allwinner-h3-ccu.h +++ b/include/hw/misc/allwinner-h3-ccu.h @@ -21,7 +21,7 @@ #define HW_MISC_ALLWINNER_H3_CCU_H #include "qom/object.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" /** * @name Constants diff --git a/include/hw/misc/allwinner-h3-dramc.h b/include/hw/misc/allwinner-h3-dramc.h index 0b6c877ef7..0435120ff9 100644 --- a/include/hw/misc/allwinner-h3-dramc.h +++ b/include/hw/misc/allwinner-h3-dramc.h @@ -21,7 +21,7 @@ #define HW_MISC_ALLWINNER_H3_DRAMC_H #include "qom/object.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "exec/hwaddr.h" /** diff --git a/include/hw/misc/allwinner-h3-sysctrl.h b/include/hw/misc/allwinner-h3-sysctrl.h index ec1c220535..ff886450f3 100644 --- a/include/hw/misc/allwinner-h3-sysctrl.h +++ b/include/hw/misc/allwinner-h3-sysctrl.h @@ -21,7 +21,7 @@ #define HW_MISC_ALLWINNER_H3_SYSCTRL_H #include "qom/object.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" /** * @name Constants diff --git a/include/hw/misc/allwinner-r40-ccu.h b/include/hw/misc/allwinner-r40-ccu.h index ceb74eff92..4f1cc4fe11 100644 --- a/include/hw/misc/allwinner-r40-ccu.h +++ b/include/hw/misc/allwinner-r40-ccu.h @@ -21,7 +21,7 @@ #define HW_MISC_ALLWINNER_R40_CCU_H #include "qom/object.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" /** * @name Constants diff --git a/include/hw/misc/allwinner-r40-dramc.h b/include/hw/misc/allwinner-r40-dramc.h index 6a1a3a7893..b823e9eb52 100644 --- a/include/hw/misc/allwinner-r40-dramc.h +++ b/include/hw/misc/allwinner-r40-dramc.h @@ -21,7 +21,7 @@ #define HW_MISC_ALLWINNER_R40_DRAMC_H #include "qom/object.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "exec/hwaddr.h" /** diff --git a/include/hw/misc/allwinner-sid.h b/include/hw/misc/allwinner-sid.h index 3bfa887a96..cfa22a4d7f 100644 --- a/include/hw/misc/allwinner-sid.h +++ b/include/hw/misc/allwinner-sid.h @@ -21,7 +21,7 @@ #define HW_MISC_ALLWINNER_SID_H #include "qom/object.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/uuid.h" /** diff --git a/include/hw/misc/allwinner-sramc.h b/include/hw/misc/allwinner-sramc.h index 66b01b8d04..43fc338a58 100644 --- a/include/hw/misc/allwinner-sramc.h +++ b/include/hw/misc/allwinner-sramc.h @@ -21,7 +21,7 @@ #define HW_MISC_ALLWINNER_SRAMC_H #include "qom/object.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/uuid.h" /** diff --git a/include/hw/misc/arm11scu.h b/include/hw/misc/arm11scu.h index e5c0282aec..d7ce0446a9 100644 --- a/include/hw/misc/arm11scu.h +++ b/include/hw/misc/arm11scu.h @@ -11,7 +11,7 @@ #ifndef HW_MISC_ARM11SCU_H #define HW_MISC_ARM11SCU_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_ARM11_SCU "arm11-scu" diff --git a/include/hw/misc/armsse-cpu-pwrctrl.h b/include/hw/misc/armsse-cpu-pwrctrl.h index 51d45ede7d..1d9c50825b 100644 --- a/include/hw/misc/armsse-cpu-pwrctrl.h +++ b/include/hw/misc/armsse-cpu-pwrctrl.h @@ -21,7 +21,7 @@ #ifndef HW_MISC_ARMSSE_CPU_PWRCTRL_H #define HW_MISC_ARMSSE_CPU_PWRCTRL_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_ARMSSE_CPU_PWRCTRL "armsse-cpu-pwrctrl" diff --git a/include/hw/misc/armsse-cpuid.h b/include/hw/misc/armsse-cpuid.h index 9c0926322c..0daf466972 100644 --- a/include/hw/misc/armsse-cpuid.h +++ b/include/hw/misc/armsse-cpuid.h @@ -22,7 +22,7 @@ #ifndef HW_MISC_ARMSSE_CPUID_H #define HW_MISC_ARMSSE_CPUID_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_ARMSSE_CPUID "armsse-cpuid" diff --git a/include/hw/misc/armsse-mhu.h b/include/hw/misc/armsse-mhu.h index 41925ded89..e34d6c100b 100644 --- a/include/hw/misc/armsse-mhu.h +++ b/include/hw/misc/armsse-mhu.h @@ -23,7 +23,7 @@ #ifndef HW_MISC_ARMSSE_MHU_H #define HW_MISC_ARMSSE_MHU_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_ARMSSE_MHU "armsse-mhu" diff --git a/include/hw/misc/armv7m_ras.h b/include/hw/misc/armv7m_ras.h index ba6daccf3f..2b692fa5f9 100644 --- a/include/hw/misc/armv7m_ras.h +++ b/include/hw/misc/armv7m_ras.h @@ -21,7 +21,7 @@ #ifndef HW_MISC_ARMV7M_RAS_H #define HW_MISC_ARMV7M_RAS_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #define TYPE_ARMV7M_RAS "armv7m-ras" OBJECT_DECLARE_SIMPLE_TYPE(ARMv7MRAS, ARMV7M_RAS) diff --git a/include/hw/misc/aspeed_hace.h b/include/hw/misc/aspeed_hace.h index d5d07c6c02..b5416b0cb5 100644 --- a/include/hw/misc/aspeed_hace.h +++ b/include/hw/misc/aspeed_hace.h @@ -10,7 +10,7 @@ #ifndef ASPEED_HACE_H #define ASPEED_HACE_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "crypto/hash.h" #define TYPE_ASPEED_HACE "aspeed.hace" diff --git a/include/hw/misc/aspeed_i3c.h b/include/hw/misc/aspeed_i3c.h index 39679dfa1a..7a984e1f01 100644 --- a/include/hw/misc/aspeed_i3c.h +++ b/include/hw/misc/aspeed_i3c.h @@ -10,7 +10,7 @@ #ifndef ASPEED_I3C_H #define ASPEED_I3C_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #define TYPE_ASPEED_I3C "aspeed.i3c" #define TYPE_ASPEED_I3C_DEVICE "aspeed.i3c.device" diff --git a/include/hw/misc/aspeed_lpc.h b/include/hw/misc/aspeed_lpc.h index fa398959af..64c1039f9c 100644 --- a/include/hw/misc/aspeed_lpc.h +++ b/include/hw/misc/aspeed_lpc.h @@ -10,7 +10,7 @@ #ifndef ASPEED_LPC_H #define ASPEED_LPC_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #define TYPE_ASPEED_LPC "aspeed.lpc" #define ASPEED_LPC(obj) OBJECT_CHECK(AspeedLPCState, (obj), TYPE_ASPEED_LPC) diff --git a/include/hw/misc/aspeed_peci.h b/include/hw/misc/aspeed_peci.h index 8382707d9f..7680e5befb 100644 --- a/include/hw/misc/aspeed_peci.h +++ b/include/hw/misc/aspeed_peci.h @@ -10,7 +10,7 @@ #ifndef ASPEED_PECI_H #define ASPEED_PECI_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #define ASPEED_PECI_NR_REGS ((0xFC + 4) >> 2) #define TYPE_ASPEED_PECI "aspeed.peci" diff --git a/include/hw/misc/aspeed_sbc.h b/include/hw/misc/aspeed_sbc.h index 7d640a022e..07c7c22a86 100644 --- a/include/hw/misc/aspeed_sbc.h +++ b/include/hw/misc/aspeed_sbc.h @@ -9,7 +9,7 @@ #ifndef ASPEED_SBC_H #define ASPEED_SBC_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/nvram/aspeed_otp.h" #define TYPE_ASPEED_SBC "aspeed.sbc" diff --git a/include/hw/misc/aspeed_scu.h b/include/hw/misc/aspeed_scu.h index 684b48b722..35b841960a 100644 --- a/include/hw/misc/aspeed_scu.h +++ b/include/hw/misc/aspeed_scu.h @@ -11,7 +11,7 @@ #ifndef ASPEED_SCU_H #define ASPEED_SCU_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_ASPEED_SCU "aspeed.scu" diff --git a/include/hw/misc/aspeed_sdmc.h b/include/hw/misc/aspeed_sdmc.h index 61c979583a..806b1cbc58 100644 --- a/include/hw/misc/aspeed_sdmc.h +++ b/include/hw/misc/aspeed_sdmc.h @@ -9,7 +9,7 @@ #ifndef ASPEED_SDMC_H #define ASPEED_SDMC_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_ASPEED_SDMC "aspeed.sdmc" diff --git a/include/hw/misc/aspeed_sli.h b/include/hw/misc/aspeed_sli.h index 23f346ab93..fa8d9fbc53 100644 --- a/include/hw/misc/aspeed_sli.h +++ b/include/hw/misc/aspeed_sli.h @@ -8,7 +8,7 @@ #ifndef ASPEED_SLI_H #define ASPEED_SLI_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #define TYPE_ASPEED_SLI "aspeed.sli" #define TYPE_ASPEED_2700_SLI TYPE_ASPEED_SLI "-ast2700" diff --git a/include/hw/misc/aspeed_xdma.h b/include/hw/misc/aspeed_xdma.h index b1478fd1c6..0089da9f1f 100644 --- a/include/hw/misc/aspeed_xdma.h +++ b/include/hw/misc/aspeed_xdma.h @@ -9,7 +9,7 @@ #ifndef ASPEED_XDMA_H #define ASPEED_XDMA_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_ASPEED_XDMA "aspeed.xdma" diff --git a/include/hw/misc/avr_power.h b/include/hw/misc/avr_power.h index 388e421aa7..5de78c5125 100644 --- a/include/hw/misc/avr_power.h +++ b/include/hw/misc/avr_power.h @@ -25,7 +25,7 @@ #ifndef HW_MISC_AVR_POWER_H #define HW_MISC_AVR_POWER_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" diff --git a/include/hw/misc/bcm2835_cprman.h b/include/hw/misc/bcm2835_cprman.h index 7b2c0a5464..8146bca3ae 100644 --- a/include/hw/misc/bcm2835_cprman.h +++ b/include/hw/misc/bcm2835_cprman.h @@ -9,7 +9,7 @@ #ifndef HW_MISC_BCM2835_CPRMAN_H #define HW_MISC_BCM2835_CPRMAN_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/qdev-clock.h" #define TYPE_BCM2835_CPRMAN "bcm2835-cprman" diff --git a/include/hw/misc/bcm2835_mbox.h b/include/hw/misc/bcm2835_mbox.h index ade27af25d..571741c06e 100644 --- a/include/hw/misc/bcm2835_mbox.h +++ b/include/hw/misc/bcm2835_mbox.h @@ -9,7 +9,7 @@ #define BCM2835_MBOX_H #include "bcm2835_mbox_defs.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_BCM2835_MBOX "bcm2835-mbox" diff --git a/include/hw/misc/bcm2835_mphi.h b/include/hw/misc/bcm2835_mphi.h index 1a451685e8..4ddf8ba652 100644 --- a/include/hw/misc/bcm2835_mphi.h +++ b/include/hw/misc/bcm2835_mphi.h @@ -18,7 +18,7 @@ #define HW_MISC_BCM2835_MPHI_H #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define MPHI_MMIO_SIZE 0x1000 diff --git a/include/hw/misc/bcm2835_powermgt.h b/include/hw/misc/bcm2835_powermgt.h index 303b9a6f68..fb0740c01e 100644 --- a/include/hw/misc/bcm2835_powermgt.h +++ b/include/hw/misc/bcm2835_powermgt.h @@ -11,7 +11,7 @@ #ifndef BCM2835_POWERMGT_H #define BCM2835_POWERMGT_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_BCM2835_POWERMGT "bcm2835-powermgt" diff --git a/include/hw/misc/bcm2835_property.h b/include/hw/misc/bcm2835_property.h index 2f93fd0c75..53d2a92d17 100644 --- a/include/hw/misc/bcm2835_property.h +++ b/include/hw/misc/bcm2835_property.h @@ -8,7 +8,7 @@ #ifndef BCM2835_PROPERTY_H #define BCM2835_PROPERTY_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "net/net.h" #include "hw/display/bcm2835_fb.h" #include "hw/nvram/bcm2835_otp.h" diff --git a/include/hw/misc/bcm2835_rng.h b/include/hw/misc/bcm2835_rng.h index 7c1fb3ef40..eaf77f5103 100644 --- a/include/hw/misc/bcm2835_rng.h +++ b/include/hw/misc/bcm2835_rng.h @@ -10,7 +10,7 @@ #ifndef BCM2835_RNG_H #define BCM2835_RNG_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_BCM2835_RNG "bcm2835-rng" diff --git a/include/hw/misc/bcm2835_thermal.h b/include/hw/misc/bcm2835_thermal.h index f90f9e487c..13ffc61c1a 100644 --- a/include/hw/misc/bcm2835_thermal.h +++ b/include/hw/misc/bcm2835_thermal.h @@ -9,7 +9,7 @@ #ifndef HW_MISC_BCM2835_THERMAL_H #define HW_MISC_BCM2835_THERMAL_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_BCM2835_THERMAL "bcm2835-thermal" diff --git a/include/hw/misc/djmemc.h b/include/hw/misc/djmemc.h index 82d4e4a2fe..76d6b366ff 100644 --- a/include/hw/misc/djmemc.h +++ b/include/hw/misc/djmemc.h @@ -8,7 +8,7 @@ #ifndef HW_MISC_DJMEMC_H #define HW_MISC_DJMEMC_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #define DJMEMC_SIZE 0x2000 #define DJMEMC_NUM_REGS (0x38 / sizeof(uint32_t)) diff --git a/include/hw/misc/imx6_src.h b/include/hw/misc/imx6_src.h index f380da3810..801b5b6a66 100644 --- a/include/hw/misc/imx6_src.h +++ b/include/hw/misc/imx6_src.h @@ -11,7 +11,7 @@ #ifndef IMX6_SRC_H #define IMX6_SRC_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/bitops.h" #include "qom/object.h" diff --git a/include/hw/misc/imx7_gpr.h b/include/hw/misc/imx7_gpr.h index df364bd8f0..5cb7d50a69 100644 --- a/include/hw/misc/imx7_gpr.h +++ b/include/hw/misc/imx7_gpr.h @@ -13,7 +13,7 @@ #define IMX7_GPR_H #include "qemu/bitops.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_IMX7_GPR "imx7.gpr" diff --git a/include/hw/misc/imx7_snvs.h b/include/hw/misc/imx7_snvs.h index 1272076086..90f69a6dd6 100644 --- a/include/hw/misc/imx7_snvs.h +++ b/include/hw/misc/imx7_snvs.h @@ -13,7 +13,7 @@ #define IMX7_SNVS_H #include "qemu/bitops.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" diff --git a/include/hw/misc/imx7_src.h b/include/hw/misc/imx7_src.h index b4b97dcb1c..55b58a03bf 100644 --- a/include/hw/misc/imx7_src.h +++ b/include/hw/misc/imx7_src.h @@ -10,7 +10,7 @@ #ifndef IMX7_SRC_H #define IMX7_SRC_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/bitops.h" #include "qom/object.h" diff --git a/include/hw/misc/imx8mp_analog.h b/include/hw/misc/imx8mp_analog.h index 955f03215a..6996e53771 100644 --- a/include/hw/misc/imx8mp_analog.h +++ b/include/hw/misc/imx8mp_analog.h @@ -10,7 +10,7 @@ #define IMX8MP_ANALOG_H #include "qom/object.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" enum IMX8MPAnalogRegisters { ANALOG_AUDIO_PLL1_GEN_CTRL = 0x000 / 4, diff --git a/include/hw/misc/imx_ccm.h b/include/hw/misc/imx_ccm.h index 7e5678e972..c4212d04ea 100644 --- a/include/hw/misc/imx_ccm.h +++ b/include/hw/misc/imx_ccm.h @@ -11,7 +11,7 @@ #ifndef IMX_CCM_H #define IMX_CCM_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define CKIL_FREQ 32768 /* nominal 32khz clock */ diff --git a/include/hw/misc/imx_rngc.h b/include/hw/misc/imx_rngc.h index 34ad699225..5fb17551b0 100644 --- a/include/hw/misc/imx_rngc.h +++ b/include/hw/misc/imx_rngc.h @@ -10,7 +10,7 @@ #ifndef IMX_RNGC_H #define IMX_RNGC_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_IMX_RNGC "imx.rngc" diff --git a/include/hw/misc/iotkit-secctl.h b/include/hw/misc/iotkit-secctl.h index 79a3628320..1c189eb721 100644 --- a/include/hw/misc/iotkit-secctl.h +++ b/include/hw/misc/iotkit-secctl.h @@ -55,7 +55,7 @@ #ifndef IOTKIT_SECCTL_H #define IOTKIT_SECCTL_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_IOTKIT_SECCTL "iotkit-secctl" diff --git a/include/hw/misc/iotkit-sysctl.h b/include/hw/misc/iotkit-sysctl.h index 481e27f4db..ce72258a84 100644 --- a/include/hw/misc/iotkit-sysctl.h +++ b/include/hw/misc/iotkit-sysctl.h @@ -26,7 +26,7 @@ #ifndef HW_MISC_IOTKIT_SYSCTL_H #define HW_MISC_IOTKIT_SYSCTL_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_IOTKIT_SYSCTL "iotkit-sysctl" diff --git a/include/hw/misc/iotkit-sysinfo.h b/include/hw/misc/iotkit-sysinfo.h index 91c23f90d2..36dc702c53 100644 --- a/include/hw/misc/iotkit-sysinfo.h +++ b/include/hw/misc/iotkit-sysinfo.h @@ -22,7 +22,7 @@ #ifndef HW_MISC_IOTKIT_SYSINFO_H #define HW_MISC_IOTKIT_SYSINFO_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_IOTKIT_SYSINFO "iotkit-sysinfo" diff --git a/include/hw/misc/ivshmem-flat.h b/include/hw/misc/ivshmem-flat.h index d656e57808..4e7277f386 100644 --- a/include/hw/misc/ivshmem-flat.h +++ b/include/hw/misc/ivshmem-flat.h @@ -16,7 +16,7 @@ #include "chardev/char-fe.h" #include "system/memory.h" #include "qom/object.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #define IVSHMEM_MAX_VECTOR_NUM 64 diff --git a/include/hw/misc/lasi.h b/include/hw/misc/lasi.h index 5e40c6aebd..8bf7240403 100644 --- a/include/hw/misc/lasi.h +++ b/include/hw/misc/lasi.h @@ -14,7 +14,7 @@ #include "system/address-spaces.h" #include "hw/core/boards.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #define TYPE_LASI_CHIP "lasi-chip" OBJECT_DECLARE_SIMPLE_TYPE(LasiState, LASI_CHIP) diff --git a/include/hw/misc/mac_via.h b/include/hw/misc/mac_via.h index 6a15228150..114f41db4c 100644 --- a/include/hw/misc/mac_via.h +++ b/include/hw/misc/mac_via.h @@ -10,7 +10,7 @@ #define HW_MISC_MAC_VIA_H #include "system/memory.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/misc/mos6522.h" #include "hw/input/adb.h" #include "qom/object.h" diff --git a/include/hw/misc/macio/gpio.h b/include/hw/misc/macio/gpio.h index 7d2aa886c2..157ea0659b 100644 --- a/include/hw/misc/macio/gpio.h +++ b/include/hw/misc/macio/gpio.h @@ -27,7 +27,7 @@ #define MACIO_GPIO_H #include "hw/ppc/openpic.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_MACIO_GPIO "macio-gpio" diff --git a/include/hw/misc/max78000_aes.h b/include/hw/misc/max78000_aes.h index 407c45ef61..f68ab07696 100644 --- a/include/hw/misc/max78000_aes.h +++ b/include/hw/misc/max78000_aes.h @@ -8,7 +8,7 @@ #ifndef HW_MAX78000_AES_H #define HW_MAX78000_AES_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "crypto/aes.h" #include "qom/object.h" diff --git a/include/hw/misc/max78000_gcr.h b/include/hw/misc/max78000_gcr.h index d5858a40f3..c209766fa9 100644 --- a/include/hw/misc/max78000_gcr.h +++ b/include/hw/misc/max78000_gcr.h @@ -8,7 +8,7 @@ #ifndef HW_MAX78000_GCR_H #define HW_MAX78000_GCR_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_MAX78000_GCR "max78000-gcr" diff --git a/include/hw/misc/max78000_icc.h b/include/hw/misc/max78000_icc.h index 6fe2bb7a15..a8f1d451bd 100644 --- a/include/hw/misc/max78000_icc.h +++ b/include/hw/misc/max78000_icc.h @@ -9,7 +9,7 @@ #ifndef HW_MAX78000_ICC_H #define HW_MAX78000_ICC_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_MAX78000_ICC "max78000-icc" diff --git a/include/hw/misc/max78000_trng.h b/include/hw/misc/max78000_trng.h index c5a8129b6a..a027f4b62c 100644 --- a/include/hw/misc/max78000_trng.h +++ b/include/hw/misc/max78000_trng.h @@ -8,7 +8,7 @@ #ifndef HW_MAX78000_TRNG_H #define HW_MAX78000_TRNG_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_MAX78000_TRNG "max78000-trng" diff --git a/include/hw/misc/mchp_pfsoc_dmc.h b/include/hw/misc/mchp_pfsoc_dmc.h index 3bc1581e0f..2ed582fb8c 100644 --- a/include/hw/misc/mchp_pfsoc_dmc.h +++ b/include/hw/misc/mchp_pfsoc_dmc.h @@ -23,7 +23,7 @@ #ifndef MCHP_PFSOC_DMC_H #define MCHP_PFSOC_DMC_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" /* DDR SGMII PHY module */ diff --git a/include/hw/misc/mchp_pfsoc_ioscb.h b/include/hw/misc/mchp_pfsoc_ioscb.h index 3fd3e74966..eaaa2ac5d9 100644 --- a/include/hw/misc/mchp_pfsoc_ioscb.h +++ b/include/hw/misc/mchp_pfsoc_ioscb.h @@ -23,7 +23,7 @@ #ifndef MCHP_PFSOC_IOSCB_H #define MCHP_PFSOC_IOSCB_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" typedef struct MchpPfSoCIoscbState { SysBusDevice parent; diff --git a/include/hw/misc/mchp_pfsoc_sysreg.h b/include/hw/misc/mchp_pfsoc_sysreg.h index c2232bd28d..c2b3688a94 100644 --- a/include/hw/misc/mchp_pfsoc_sysreg.h +++ b/include/hw/misc/mchp_pfsoc_sysreg.h @@ -23,7 +23,7 @@ #ifndef MCHP_PFSOC_SYSREG_H #define MCHP_PFSOC_SYSREG_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #define MCHP_PFSOC_SYSREG_REG_SIZE 0x2000 diff --git a/include/hw/misc/mips_cmgcr.h b/include/hw/misc/mips_cmgcr.h index db4bf5f449..cec0edd620 100644 --- a/include/hw/misc/mips_cmgcr.h +++ b/include/hw/misc/mips_cmgcr.h @@ -10,7 +10,7 @@ #ifndef MIPS_CMGCR_H #define MIPS_CMGCR_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_MIPS_GCR "mips-gcr" diff --git a/include/hw/misc/mips_cpc.h b/include/hw/misc/mips_cpc.h index fcafbd5e00..73ed7597e8 100644 --- a/include/hw/misc/mips_cpc.h +++ b/include/hw/misc/mips_cpc.h @@ -20,7 +20,7 @@ #ifndef MIPS_CPC_H #define MIPS_CPC_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define CPC_ADDRSPACE_SZ 0x6000 diff --git a/include/hw/misc/mips_itu.h b/include/hw/misc/mips_itu.h index 27c9a1090d..0d1c9c419c 100644 --- a/include/hw/misc/mips_itu.h +++ b/include/hw/misc/mips_itu.h @@ -20,7 +20,7 @@ #ifndef MIPS_ITU_H #define MIPS_ITU_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_MIPS_ITU "mips-itu" diff --git a/include/hw/misc/mos6522.h b/include/hw/misc/mos6522.h index 920871a598..150e30a2c1 100644 --- a/include/hw/misc/mos6522.h +++ b/include/hw/misc/mos6522.h @@ -28,7 +28,7 @@ #define MOS6522_H #include "exec/hwaddr.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define MOS6522_NUM_REGS 16 diff --git a/include/hw/misc/mps2-fpgaio.h b/include/hw/misc/mps2-fpgaio.h index 7b8bd604de..edd9f23121 100644 --- a/include/hw/misc/mps2-fpgaio.h +++ b/include/hw/misc/mps2-fpgaio.h @@ -21,7 +21,7 @@ #ifndef MPS2_FPGAIO_H #define MPS2_FPGAIO_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/misc/led.h" #include "qom/object.h" diff --git a/include/hw/misc/mps2-scc.h b/include/hw/misc/mps2-scc.h index 8ff188c06b..989b2e057d 100644 --- a/include/hw/misc/mps2-scc.h +++ b/include/hw/misc/mps2-scc.h @@ -30,7 +30,7 @@ #ifndef MPS2_SCC_H #define MPS2_SCC_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/misc/led.h" #include "qom/object.h" diff --git a/include/hw/misc/msf2-sysreg.h b/include/hw/misc/msf2-sysreg.h index fc1890e710..e213aedfb7 100644 --- a/include/hw/misc/msf2-sysreg.h +++ b/include/hw/misc/msf2-sysreg.h @@ -25,7 +25,7 @@ #ifndef HW_MSF2_SYSREG_H #define HW_MSF2_SYSREG_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" enum { diff --git a/include/hw/misc/npcm7xx_mft.h b/include/hw/misc/npcm7xx_mft.h index 79855b6f25..406ec94443 100644 --- a/include/hw/misc/npcm7xx_mft.h +++ b/include/hw/misc/npcm7xx_mft.h @@ -19,7 +19,7 @@ #include "system/memory.h" #include "hw/core/clock.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" /* Max Fan input number. */ diff --git a/include/hw/misc/npcm7xx_pwm.h b/include/hw/misc/npcm7xx_pwm.h index 6a54b40005..b5ae933804 100644 --- a/include/hw/misc/npcm7xx_pwm.h +++ b/include/hw/misc/npcm7xx_pwm.h @@ -17,7 +17,7 @@ #define NPCM7XX_PWM_H #include "hw/core/clock.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" /* Each PWM module holds 4 PWM channels. */ diff --git a/include/hw/misc/npcm7xx_rng.h b/include/hw/misc/npcm7xx_rng.h index 650375dc2c..90858a71f5 100644 --- a/include/hw/misc/npcm7xx_rng.h +++ b/include/hw/misc/npcm7xx_rng.h @@ -16,7 +16,7 @@ #ifndef NPCM7XX_RNG_H #define NPCM7XX_RNG_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" struct NPCM7xxRNGState { SysBusDevice parent; diff --git a/include/hw/misc/npcm_clk.h b/include/hw/misc/npcm_clk.h index 50b93a0094..74c5c1634a 100644 --- a/include/hw/misc/npcm_clk.h +++ b/include/hw/misc/npcm_clk.h @@ -18,7 +18,7 @@ #include "system/memory.h" #include "hw/core/clock.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #define NPCM7XX_CLK_NR_REGS (0x70 / sizeof(uint32_t)) #define NPCM8XX_CLK_NR_REGS (0xc4 / sizeof(uint32_t)) diff --git a/include/hw/misc/npcm_gcr.h b/include/hw/misc/npcm_gcr.h index 702e7fddb1..97a6e531b8 100644 --- a/include/hw/misc/npcm_gcr.h +++ b/include/hw/misc/npcm_gcr.h @@ -17,7 +17,7 @@ #define NPCM_GCR_H #include "system/memory.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" /* diff --git a/include/hw/misc/nrf51_rng.h b/include/hw/misc/nrf51_rng.h index 9aff9a76f8..0c2f6d2257 100644 --- a/include/hw/misc/nrf51_rng.h +++ b/include/hw/misc/nrf51_rng.h @@ -34,7 +34,7 @@ #ifndef NRF51_RNG_H #define NRF51_RNG_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/timer.h" #include "qom/object.h" #define TYPE_NRF51_RNG "nrf51_soc.rng" diff --git a/include/hw/misc/sifive_e_aon.h b/include/hw/misc/sifive_e_aon.h index 2ae1c4139c..efa2c3023f 100644 --- a/include/hw/misc/sifive_e_aon.h +++ b/include/hw/misc/sifive_e_aon.h @@ -19,7 +19,7 @@ #ifndef HW_SIFIVE_AON_H #define HW_SIFIVE_AON_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_SIFIVE_E_AON "riscv.sifive.e.aon" diff --git a/include/hw/misc/sifive_e_prci.h b/include/hw/misc/sifive_e_prci.h index 6aa949e910..d0abd59f4b 100644 --- a/include/hw/misc/sifive_e_prci.h +++ b/include/hw/misc/sifive_e_prci.h @@ -19,7 +19,7 @@ #ifndef HW_SIFIVE_E_PRCI_H #define HW_SIFIVE_E_PRCI_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" enum { SIFIVE_E_PRCI_HFROSCCFG = 0x0, diff --git a/include/hw/misc/sifive_test.h b/include/hw/misc/sifive_test.h index 88a38d00c5..85afd35263 100644 --- a/include/hw/misc/sifive_test.h +++ b/include/hw/misc/sifive_test.h @@ -19,7 +19,7 @@ #ifndef HW_SIFIVE_TEST_H #define HW_SIFIVE_TEST_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_SIFIVE_TEST "riscv.sifive.test" diff --git a/include/hw/misc/sifive_u_otp.h b/include/hw/misc/sifive_u_otp.h index 170d2148f2..b3d2091a58 100644 --- a/include/hw/misc/sifive_u_otp.h +++ b/include/hw/misc/sifive_u_otp.h @@ -19,7 +19,7 @@ #ifndef HW_SIFIVE_U_OTP_H #define HW_SIFIVE_U_OTP_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #define SIFIVE_U_OTP_PA 0x00 #define SIFIVE_U_OTP_PAIO 0x04 diff --git a/include/hw/misc/sifive_u_prci.h b/include/hw/misc/sifive_u_prci.h index 4d2491ad46..c0cc755a26 100644 --- a/include/hw/misc/sifive_u_prci.h +++ b/include/hw/misc/sifive_u_prci.h @@ -19,7 +19,7 @@ #ifndef HW_SIFIVE_U_PRCI_H #define HW_SIFIVE_U_PRCI_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #define SIFIVE_U_PRCI_HFXOSCCFG 0x00 #define SIFIVE_U_PRCI_COREPLLCFG0 0x04 diff --git a/include/hw/misc/stm32_rcc.h b/include/hw/misc/stm32_rcc.h index ffbdf202ea..4dccacc2db 100644 --- a/include/hw/misc/stm32_rcc.h +++ b/include/hw/misc/stm32_rcc.h @@ -25,7 +25,7 @@ #ifndef HW_STM32_RCC_H #define HW_STM32_RCC_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define STM32_RCC_CR 0x00 diff --git a/include/hw/misc/stm32f2xx_syscfg.h b/include/hw/misc/stm32f2xx_syscfg.h index 8595a3b31b..89e47aa091 100644 --- a/include/hw/misc/stm32f2xx_syscfg.h +++ b/include/hw/misc/stm32f2xx_syscfg.h @@ -25,7 +25,7 @@ #ifndef HW_STM32F2XX_SYSCFG_H #define HW_STM32F2XX_SYSCFG_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define SYSCFG_MEMRMP 0x00 diff --git a/include/hw/misc/stm32f4xx_exti.h b/include/hw/misc/stm32f4xx_exti.h index fc11c595fa..a2d57ee345 100644 --- a/include/hw/misc/stm32f4xx_exti.h +++ b/include/hw/misc/stm32f4xx_exti.h @@ -25,7 +25,7 @@ #ifndef HW_STM32F4XX_EXTI_H #define HW_STM32F4XX_EXTI_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define EXTI_IMR 0x00 diff --git a/include/hw/misc/stm32f4xx_syscfg.h b/include/hw/misc/stm32f4xx_syscfg.h index 9fce67f4b4..e6d2bc1ff3 100644 --- a/include/hw/misc/stm32f4xx_syscfg.h +++ b/include/hw/misc/stm32f4xx_syscfg.h @@ -25,7 +25,7 @@ #ifndef HW_STM32F4XX_SYSCFG_H #define HW_STM32F4XX_SYSCFG_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define SYSCFG_MEMRMP 0x00 diff --git a/include/hw/misc/stm32l4x5_exti.h b/include/hw/misc/stm32l4x5_exti.h index 62f79362f2..543662c7b9 100644 --- a/include/hw/misc/stm32l4x5_exti.h +++ b/include/hw/misc/stm32l4x5_exti.h @@ -24,7 +24,7 @@ #ifndef HW_STM32L4X5_EXTI_H #define HW_STM32L4X5_EXTI_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_STM32L4X5_EXTI "stm32l4x5-exti" diff --git a/include/hw/misc/stm32l4x5_rcc.h b/include/hw/misc/stm32l4x5_rcc.h index 0fbfba5c40..64ead11b3d 100644 --- a/include/hw/misc/stm32l4x5_rcc.h +++ b/include/hw/misc/stm32l4x5_rcc.h @@ -18,7 +18,7 @@ #ifndef HW_STM32L4X5_RCC_H #define HW_STM32L4X5_RCC_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_STM32L4X5_RCC "stm32l4x5-rcc" diff --git a/include/hw/misc/stm32l4x5_syscfg.h b/include/hw/misc/stm32l4x5_syscfg.h index c450df2b9e..d83b4c0723 100644 --- a/include/hw/misc/stm32l4x5_syscfg.h +++ b/include/hw/misc/stm32l4x5_syscfg.h @@ -24,7 +24,7 @@ #ifndef HW_STM32L4X5_SYSCFG_H #define HW_STM32L4X5_SYSCFG_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #include "hw/gpio/stm32l4x5_gpio.h" diff --git a/include/hw/misc/tz-mpc.h b/include/hw/misc/tz-mpc.h index 74d5d822cf..bda4bc2ae3 100644 --- a/include/hw/misc/tz-mpc.h +++ b/include/hw/misc/tz-mpc.h @@ -31,7 +31,7 @@ #ifndef TZ_MPC_H #define TZ_MPC_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_TZ_MPC "tz-mpc" diff --git a/include/hw/misc/tz-msc.h b/include/hw/misc/tz-msc.h index 77cc7f2404..07112d8caa 100644 --- a/include/hw/misc/tz-msc.h +++ b/include/hw/misc/tz-msc.h @@ -50,7 +50,7 @@ #ifndef TZ_MSC_H #define TZ_MSC_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "target/arm/idau.h" #include "qom/object.h" diff --git a/include/hw/misc/tz-ppc.h b/include/hw/misc/tz-ppc.h index 021d671b29..3fb9401160 100644 --- a/include/hw/misc/tz-ppc.h +++ b/include/hw/misc/tz-ppc.h @@ -65,7 +65,7 @@ #ifndef TZ_PPC_H #define TZ_PPC_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_TZ_PPC "tz-ppc" diff --git a/include/hw/misc/unimp.h b/include/hw/misc/unimp.h index 904f502fab..77a5077511 100644 --- a/include/hw/misc/unimp.h +++ b/include/hw/misc/unimp.h @@ -9,7 +9,7 @@ #define HW_MISC_UNIMP_H #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qapi/error.h" #include "qom/object.h" diff --git a/include/hw/misc/virt_ctrl.h b/include/hw/misc/virt_ctrl.h index 81346cf017..ddce36f3b7 100644 --- a/include/hw/misc/virt_ctrl.h +++ b/include/hw/misc/virt_ctrl.h @@ -7,7 +7,7 @@ #ifndef VIRT_CTRL_H #define VIRT_CTRL_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #define TYPE_VIRT_CTRL "virt-ctrl" OBJECT_DECLARE_SIMPLE_TYPE(VirtCtrlState, VIRT_CTRL) diff --git a/include/hw/misc/xlnx-versal-cframe-reg.h b/include/hw/misc/xlnx-versal-cframe-reg.h index fe8788a745..8f5c2959a8 100644 --- a/include/hw/misc/xlnx-versal-cframe-reg.h +++ b/include/hw/misc/xlnx-versal-cframe-reg.h @@ -17,7 +17,7 @@ #ifndef HW_MISC_XLNX_VERSAL_CFRAME_REG_H #define HW_MISC_XLNX_VERSAL_CFRAME_REG_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #include "hw/misc/xlnx-cfi-if.h" #include "hw/misc/xlnx-versal-cfu.h" diff --git a/include/hw/misc/xlnx-versal-cfu.h b/include/hw/misc/xlnx-versal-cfu.h index 3d7ca506de..e4fefe43c0 100644 --- a/include/hw/misc/xlnx-versal-cfu.h +++ b/include/hw/misc/xlnx-versal-cfu.h @@ -17,7 +17,7 @@ #ifndef HW_MISC_XLNX_VERSAL_CFU_APB_H #define HW_MISC_XLNX_VERSAL_CFU_APB_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #include "hw/misc/xlnx-cfi-if.h" #include "qemu/fifo32.h" diff --git a/include/hw/misc/xlnx-versal-crl.h b/include/hw/misc/xlnx-versal-crl.h index ace3d198bd..fea7768642 100644 --- a/include/hw/misc/xlnx-versal-crl.h +++ b/include/hw/misc/xlnx-versal-crl.h @@ -10,7 +10,7 @@ #ifndef HW_MISC_XLNX_VERSAL_CRL_H #define HW_MISC_XLNX_VERSAL_CRL_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #include "target/arm/cpu-qom.h" #include "hw/arm/xlnx-versal-version.h" diff --git a/include/hw/misc/xlnx-versal-pmc-iou-slcr.h b/include/hw/misc/xlnx-versal-pmc-iou-slcr.h index d8f45bd94b..046f3e525c 100644 --- a/include/hw/misc/xlnx-versal-pmc-iou-slcr.h +++ b/include/hw/misc/xlnx-versal-pmc-iou-slcr.h @@ -54,7 +54,7 @@ #ifndef XLNX_VERSAL_PMC_IOU_SLCR_H #define XLNX_VERSAL_PMC_IOU_SLCR_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #define TYPE_XILINX_VERSAL_PMC_IOU_SLCR "xlnx.versal-pmc-iou-slcr" diff --git a/include/hw/misc/xlnx-versal-trng.h b/include/hw/misc/xlnx-versal-trng.h index 8de2910404..ea6e4cb2e1 100644 --- a/include/hw/misc/xlnx-versal-trng.h +++ b/include/hw/misc/xlnx-versal-trng.h @@ -27,7 +27,7 @@ #define XLNX_VERSAL_TRNG_H #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #define TYPE_XLNX_VERSAL_TRNG "xlnx.versal-trng" diff --git a/include/hw/misc/xlnx-versal-xramc.h b/include/hw/misc/xlnx-versal-xramc.h index e79941d886..e888a9f03d 100644 --- a/include/hw/misc/xlnx-versal-xramc.h +++ b/include/hw/misc/xlnx-versal-xramc.h @@ -9,7 +9,7 @@ #ifndef XLNX_VERSAL_XRAMC_H #define XLNX_VERSAL_XRAMC_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #define TYPE_XLNX_XRAM_CTRL "xlnx.versal-xramc" diff --git a/include/hw/misc/xlnx-zynqmp-apu-ctrl.h b/include/hw/misc/xlnx-zynqmp-apu-ctrl.h index c031572005..cc0a531c24 100644 --- a/include/hw/misc/xlnx-zynqmp-apu-ctrl.h +++ b/include/hw/misc/xlnx-zynqmp-apu-ctrl.h @@ -11,7 +11,7 @@ #ifndef HW_MISC_XLNX_ZYNQMP_APU_CTRL_H #define HW_MISC_XLNX_ZYNQMP_APU_CTRL_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #include "target/arm/cpu-qom.h" diff --git a/include/hw/misc/xlnx-zynqmp-crf.h b/include/hw/misc/xlnx-zynqmp-crf.h index df83034a98..933867a6e5 100644 --- a/include/hw/misc/xlnx-zynqmp-crf.h +++ b/include/hw/misc/xlnx-zynqmp-crf.h @@ -8,7 +8,7 @@ #ifndef HW_MISC_XLNX_ZYNQMP_CRF_H #define HW_MISC_XLNX_ZYNQMP_CRF_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #define TYPE_XLNX_ZYNQMP_CRF "xlnx.zynqmp_crf" diff --git a/include/hw/net/allwinner-sun8i-emac.h b/include/hw/net/allwinner-sun8i-emac.h index 185895f4e1..24662a24ac 100644 --- a/include/hw/net/allwinner-sun8i-emac.h +++ b/include/hw/net/allwinner-sun8i-emac.h @@ -22,7 +22,7 @@ #include "qom/object.h" #include "net/net.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" /** * Object model diff --git a/include/hw/net/allwinner_emac.h b/include/hw/net/allwinner_emac.h index 534e748982..b3482e137e 100644 --- a/include/hw/net/allwinner_emac.h +++ b/include/hw/net/allwinner_emac.h @@ -27,7 +27,7 @@ #include "net/net.h" #include "qemu/fifo8.h" #include "hw/net/mii.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_AW_EMAC "allwinner-emac" diff --git a/include/hw/net/cadence_gem.h b/include/hw/net/cadence_gem.h index e63941f18f..f5f1fa47c1 100644 --- a/include/hw/net/cadence_gem.h +++ b/include/hw/net/cadence_gem.h @@ -30,7 +30,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(CadenceGEMState, CADENCE_GEM) #include "net/net.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #define CADENCE_GEM_MAXREG (0x00000800 / 4) /* Last valid GEM address */ diff --git a/include/hw/net/dp8393x.h b/include/hw/net/dp8393x.h index 24273dc1f4..5fe02d5a3c 100644 --- a/include/hw/net/dp8393x.h +++ b/include/hw/net/dp8393x.h @@ -20,7 +20,7 @@ #ifndef HW_NET_DP8393X_H #define HW_NET_DP8393X_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "net/net.h" #include "system/memory.h" diff --git a/include/hw/net/ftgmac100.h b/include/hw/net/ftgmac100.h index 24ccdf0260..414963c5fb 100644 --- a/include/hw/net/ftgmac100.h +++ b/include/hw/net/ftgmac100.h @@ -19,7 +19,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(FTGMAC100State, FTGMAC100) #define FTGMAC100_REG_HIGH_MEM_SIZE 0x100 #define FTGMAC100_REG_HIGH_OFFSET 0x100 -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "net/net.h" /* diff --git a/include/hw/net/imx_fec.h b/include/hw/net/imx_fec.h index 99fc285402..f0ac7d60e1 100644 --- a/include/hw/net/imx_fec.h +++ b/include/hw/net/imx_fec.h @@ -30,7 +30,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(IMXFECState, IMX_FEC) #define TYPE_IMX_ENET "imx.enet" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/net/lan9118_phy.h" #include "hw/core/irq.h" #include "net/net.h" diff --git a/include/hw/net/lan9118_phy.h b/include/hw/net/lan9118_phy.h index af12fc33d5..1f9ad643c7 100644 --- a/include/hw/net/lan9118_phy.h +++ b/include/hw/net/lan9118_phy.h @@ -12,7 +12,7 @@ #define HW_NET_LAN9118_PHY_H #include "qom/object.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #define TYPE_LAN9118_PHY "lan9118-phy" OBJECT_DECLARE_SIMPLE_TYPE(Lan9118PhyState, LAN9118_PHY) diff --git a/include/hw/net/lance.h b/include/hw/net/lance.h index f645d6af67..be473e2eed 100644 --- a/include/hw/net/lance.h +++ b/include/hw/net/lance.h @@ -31,7 +31,7 @@ #include "net/net.h" #include "hw/net/pcnet.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_LANCE "lance" diff --git a/include/hw/net/lasi_82596.h b/include/hw/net/lasi_82596.h index c46a4a137e..ab31874a7c 100644 --- a/include/hw/net/lasi_82596.h +++ b/include/hw/net/lasi_82596.h @@ -10,7 +10,7 @@ #include "net/net.h" #include "hw/net/i82596.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #define TYPE_LASI_82596 "lasi_82596" typedef struct SysBusI82596State SysBusI82596State; diff --git a/include/hw/net/msf2-emac.h b/include/hw/net/msf2-emac.h index b5d9127e46..f018ab3ff3 100644 --- a/include/hw/net/msf2-emac.h +++ b/include/hw/net/msf2-emac.h @@ -22,7 +22,7 @@ * THE SOFTWARE. */ -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "system/memory.h" #include "net/net.h" #include "net/eth.h" diff --git a/include/hw/net/npcm7xx_emc.h b/include/hw/net/npcm7xx_emc.h index 03c9941d82..238507cadc 100644 --- a/include/hw/net/npcm7xx_emc.h +++ b/include/hw/net/npcm7xx_emc.h @@ -18,7 +18,7 @@ #define NPCM7XX_EMC_H #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "net/net.h" /* 32-bit register indices. */ diff --git a/include/hw/net/npcm_gmac.h b/include/hw/net/npcm_gmac.h index 44ee7b1bcb..d4fe49ada5 100644 --- a/include/hw/net/npcm_gmac.h +++ b/include/hw/net/npcm_gmac.h @@ -21,7 +21,7 @@ #define NPCM_GMAC_H #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "net/net.h" #define NPCM_GMAC_NR_REGS (0x1060 / sizeof(uint32_t)) diff --git a/include/hw/net/npcm_pcs.h b/include/hw/net/npcm_pcs.h index d5c481ad70..7f5aa76353 100644 --- a/include/hw/net/npcm_pcs.h +++ b/include/hw/net/npcm_pcs.h @@ -17,7 +17,7 @@ #ifndef NPCM_PCS_H #define NPCM_PCS_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #define NPCM_PCS_NR_SR_CTLS (0x12 / sizeof(uint16_t)) #define NPCM_PCS_NR_SR_MIIS (0x20 / sizeof(uint16_t)) diff --git a/include/hw/net/xlnx-zynqmp-can.h b/include/hw/net/xlnx-zynqmp-can.h index d23c1523ca..b43384a098 100644 --- a/include/hw/net/xlnx-zynqmp-can.h +++ b/include/hw/net/xlnx-zynqmp-can.h @@ -30,7 +30,7 @@ #ifndef XLNX_ZYNQMP_CAN_H #define XLNX_ZYNQMP_CAN_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #include "net/can_emu.h" #include "net/can_host.h" diff --git a/include/hw/nubus/nubus.h b/include/hw/nubus/nubus.h index 105ddddd0d..52d8797053 100644 --- a/include/hw/nubus/nubus.h +++ b/include/hw/nubus/nubus.h @@ -10,7 +10,7 @@ #define HW_NUBUS_NUBUS_H #include "hw/core/qdev-properties.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "system/address-spaces.h" #include "qom/object.h" #include "qemu/units.h" diff --git a/include/hw/nvram/bcm2835_otp.h b/include/hw/nvram/bcm2835_otp.h index 1df33700bd..dba92a41e8 100644 --- a/include/hw/nvram/bcm2835_otp.h +++ b/include/hw/nvram/bcm2835_otp.h @@ -9,7 +9,7 @@ #ifndef BCM2835_OTP_H #define BCM2835_OTP_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_BCM2835_OTP "bcm2835-otp" diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h index d41b9328fd..a29a5d55ea 100644 --- a/include/hw/nvram/fw_cfg.h +++ b/include/hw/nvram/fw_cfg.h @@ -3,7 +3,7 @@ #include "exec/hwaddr.h" #include "standard-headers/linux/qemu_fw_cfg.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "system/dma.h" #include "qom/object.h" diff --git a/include/hw/nvram/mac_nvram.h b/include/hw/nvram/mac_nvram.h index e9d8398f84..e023732822 100644 --- a/include/hw/nvram/mac_nvram.h +++ b/include/hw/nvram/mac_nvram.h @@ -27,7 +27,7 @@ #define MAC_NVRAM_H #include "system/memory.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #define MACIO_NVRAM_SIZE 0x2000 diff --git a/include/hw/nvram/npcm7xx_otp.h b/include/hw/nvram/npcm7xx_otp.h index 77b05f8b82..95118c64a7 100644 --- a/include/hw/nvram/npcm7xx_otp.h +++ b/include/hw/nvram/npcm7xx_otp.h @@ -17,7 +17,7 @@ #define NPCM7XX_OTP_H #include "system/memory.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" /* Each OTP module holds 8192 bits of one-time programmable storage */ #define NPCM7XX_OTP_ARRAY_BITS (8192) diff --git a/include/hw/nvram/nrf51_nvm.h b/include/hw/nvram/nrf51_nvm.h index d85e788df5..172e344a5d 100644 --- a/include/hw/nvram/nrf51_nvm.h +++ b/include/hw/nvram/nrf51_nvm.h @@ -22,7 +22,7 @@ #ifndef NRF51_NVM_H #define NRF51_NVM_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_NRF51_NVM "nrf51_soc.nvm" OBJECT_DECLARE_SIMPLE_TYPE(NRF51NVMState, NRF51_NVM) diff --git a/include/hw/nvram/xlnx-bbram.h b/include/hw/nvram/xlnx-bbram.h index 27423035d4..7a8dd85eff 100644 --- a/include/hw/nvram/xlnx-bbram.h +++ b/include/hw/nvram/xlnx-bbram.h @@ -29,7 +29,7 @@ #include "system/block-backend.h" #include "hw/core/qdev.h" #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #define RMAX_XLNX_BBRAM ((0x4c / 4) + 1) diff --git a/include/hw/nvram/xlnx-versal-efuse.h b/include/hw/nvram/xlnx-versal-efuse.h index 07f1000a85..b10d748317 100644 --- a/include/hw/nvram/xlnx-versal-efuse.h +++ b/include/hw/nvram/xlnx-versal-efuse.h @@ -23,7 +23,7 @@ #define XLNX_VERSAL_EFUSE_H #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/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 d488694386..b62f8181fd 100644 --- a/include/hw/nvram/xlnx-zynqmp-efuse.h +++ b/include/hw/nvram/xlnx-zynqmp-efuse.h @@ -23,7 +23,7 @@ #define XLNX_ZYNQMP_EFUSE_H #include "hw/core/irq.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/register.h" #include "hw/nvram/xlnx-efuse.h" diff --git a/include/hw/pci-host/aspeed_pcie.h b/include/hw/pci-host/aspeed_pcie.h index be53ea96b9..e660119a45 100644 --- a/include/hw/pci-host/aspeed_pcie.h +++ b/include/hw/pci-host/aspeed_pcie.h @@ -17,7 +17,7 @@ #ifndef ASPEED_PCIE_H #define ASPEED_PCIE_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/pci/pci_bridge.h" #include "hw/pci/pcie_host.h" #include "hw/pci/pcie_port.h" diff --git a/include/hw/pci-host/designware.h b/include/hw/pci-host/designware.h index a35a3bd06c..e82fdc5fe7 100644 --- a/include/hw/pci-host/designware.h +++ b/include/hw/pci-host/designware.h @@ -21,7 +21,7 @@ #ifndef DESIGNWARE_H #define DESIGNWARE_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/pci/pci_bridge.h" #include "qom/object.h" diff --git a/include/hw/pci-host/fsl_imx8m_phy.h b/include/hw/pci-host/fsl_imx8m_phy.h index 5f1b212fd9..5786534b0e 100644 --- a/include/hw/pci-host/fsl_imx8m_phy.h +++ b/include/hw/pci-host/fsl_imx8m_phy.h @@ -9,7 +9,7 @@ #ifndef HW_PCIHOST_FSLIMX8MPCIEPHY_H #define HW_PCIHOST_FSLIMX8MPCIEPHY_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #include "system/memory.h" diff --git a/include/hw/pci-host/gpex.h b/include/hw/pci-host/gpex.h index feaf827474..695886dedd 100644 --- a/include/hw/pci-host/gpex.h +++ b/include/hw/pci-host/gpex.h @@ -21,7 +21,7 @@ #define HW_GPEX_H #include "exec/hwaddr.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/pci/pci_device.h" #include "hw/pci/pcie_host.h" #include "qom/object.h" diff --git a/include/hw/pci-host/xilinx-pcie.h b/include/hw/pci-host/xilinx-pcie.h index e1b3c1c280..b7bab77c24 100644 --- a/include/hw/pci-host/xilinx-pcie.h +++ b/include/hw/pci-host/xilinx-pcie.h @@ -20,7 +20,7 @@ #ifndef HW_XILINX_PCIE_H #define HW_XILINX_PCIE_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/pci/pci_bridge.h" #include "hw/pci/pcie_host.h" #include "qom/object.h" diff --git a/include/hw/pci/pci_host.h b/include/hw/pci/pci_host.h index 954dd446fa..d8dec0ee04 100644 --- a/include/hw/pci/pci_host.h +++ b/include/hw/pci/pci_host.h @@ -28,7 +28,7 @@ #ifndef PCI_HOST_H #define PCI_HOST_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define PCI_HOST_BYPASS_IOMMU "bypass-iommu" diff --git a/include/hw/ppc/mac_dbdma.h b/include/hw/ppc/mac_dbdma.h index 7676488245..e42805144e 100644 --- a/include/hw/ppc/mac_dbdma.h +++ b/include/hw/ppc/mac_dbdma.h @@ -26,7 +26,7 @@ #include "system/memory.h" #include "qemu/iov.h" #include "system/dma.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" typedef struct DBDMA_io DBDMA_io; diff --git a/include/hw/ppc/openpic.h b/include/hw/ppc/openpic.h index 9c6af8e207..5856955af9 100644 --- a/include/hw/ppc/openpic.h +++ b/include/hw/ppc/openpic.h @@ -1,7 +1,7 @@ #ifndef OPENPIC_H #define OPENPIC_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/cpu.h" #include "qom/object.h" diff --git a/include/hw/ppc/pnv.h b/include/hw/ppc/pnv.h index a8c1968f28..24f8843a40 100644 --- a/include/hw/ppc/pnv.h +++ b/include/hw/ppc/pnv.h @@ -22,7 +22,7 @@ #include "cpu.h" #include "hw/core/boards.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/ipmi/ipmi.h" #include "hw/ppc/pnv_pnor.h" diff --git a/include/hw/ppc/pnv_chip.h b/include/hw/ppc/pnv_chip.h index a5b8c49680..ea47c97dd3 100644 --- a/include/hw/ppc/pnv_chip.h +++ b/include/hw/ppc/pnv_chip.h @@ -14,7 +14,7 @@ #include "hw/ppc/pnv_sbe.h" #include "hw/ppc/pnv_xive.h" #include "hw/ppc/pnv_i2c.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" OBJECT_DECLARE_TYPE(PnvChip, PnvChipClass, PNV_CHIP) diff --git a/include/hw/ppc/pnv_pnor.h b/include/hw/ppc/pnv_pnor.h index b44cafe918..7bf737d33b 100644 --- a/include/hw/ppc/pnv_pnor.h +++ b/include/hw/ppc/pnv_pnor.h @@ -10,7 +10,7 @@ #ifndef PPC_PNV_PNOR_H #define PPC_PNV_PNOR_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" /* * PNOR offset on the LPC FW address space. For now this should be 0 because diff --git a/include/hw/ppc/pnv_psi.h b/include/hw/ppc/pnv_psi.h index 8a04860aa8..e1e1ade0ce 100644 --- a/include/hw/ppc/pnv_psi.h +++ b/include/hw/ppc/pnv_psi.h @@ -20,7 +20,7 @@ #ifndef PPC_PNV_PSI_H #define PPC_PNV_PSI_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/ppc/xics.h" #include "hw/ppc/xive.h" #include "hw/core/qdev.h" diff --git a/include/hw/ppc/ppc4xx.h b/include/hw/ppc/ppc4xx.h index 2e94b00673..b76bf091cf 100644 --- a/include/hw/ppc/ppc4xx.h +++ b/include/hw/ppc/ppc4xx.h @@ -27,7 +27,7 @@ #include "hw/ppc/ppc.h" #include "system/memory.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" /* * Generic DCR device diff --git a/include/hw/ppc/xive.h b/include/hw/ppc/xive.h index b7ca8544e4..e98d011998 100644 --- a/include/hw/ppc/xive.h +++ b/include/hw/ppc/xive.h @@ -139,7 +139,7 @@ #define PPC_XIVE_H #include "system/kvm.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/ppc/xive_regs.h" #include "qom/object.h" diff --git a/include/hw/ppc/xive2.h b/include/hw/ppc/xive2.h index f4437e2c79..9e2af8d8b1 100644 --- a/include/hw/ppc/xive2.h +++ b/include/hw/ppc/xive2.h @@ -11,7 +11,7 @@ #include "hw/ppc/xive.h" #include "hw/ppc/xive2_regs.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" /* * XIVE2 Router (POWER10) diff --git a/include/hw/riscv/numa.h b/include/hw/riscv/numa.h index 2d9c41ba81..e68ce8e8af 100644 --- a/include/hw/riscv/numa.h +++ b/include/hw/riscv/numa.h @@ -20,7 +20,7 @@ #define RISCV_NUMA_H #include "hw/core/boards.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "system/numa.h" /** diff --git a/include/hw/riscv/riscv_hart.h b/include/hw/riscv/riscv_hart.h index a6ed73a195..197fa16231 100644 --- a/include/hw/riscv/riscv_hart.h +++ b/include/hw/riscv/riscv_hart.h @@ -21,7 +21,7 @@ #ifndef HW_RISCV_HART_H #define HW_RISCV_HART_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "target/riscv/cpu.h" #include "qom/object.h" diff --git a/include/hw/riscv/spike.h b/include/hw/riscv/spike.h index acd41e9058..6868976884 100644 --- a/include/hw/riscv/spike.h +++ b/include/hw/riscv/spike.h @@ -21,7 +21,7 @@ #include "hw/core/boards.h" #include "hw/riscv/riscv_hart.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #define SPIKE_CPUS_MAX 8 #define SPIKE_SOCKETS_MAX 8 diff --git a/include/hw/riscv/virt.h b/include/hw/riscv/virt.h index 806b78cc63..18a2a323a3 100644 --- a/include/hw/riscv/virt.h +++ b/include/hw/riscv/virt.h @@ -21,7 +21,7 @@ #include "hw/core/boards.h" #include "hw/riscv/riscv_hart.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/block/flash.h" #include "hw/intc/riscv_imsic.h" diff --git a/include/hw/rtc/allwinner-rtc.h b/include/hw/rtc/allwinner-rtc.h index bf415431cd..2b5ff06566 100644 --- a/include/hw/rtc/allwinner-rtc.h +++ b/include/hw/rtc/allwinner-rtc.h @@ -21,7 +21,7 @@ #define HW_MISC_ALLWINNER_RTC_H #include "qom/object.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" /** * Constants diff --git a/include/hw/rtc/aspeed_rtc.h b/include/hw/rtc/aspeed_rtc.h index 596dfebb46..ef37dd3d69 100644 --- a/include/hw/rtc/aspeed_rtc.h +++ b/include/hw/rtc/aspeed_rtc.h @@ -8,7 +8,7 @@ #ifndef HW_RTC_ASPEED_RTC_H #define HW_RTC_ASPEED_RTC_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" struct AspeedRtcState { diff --git a/include/hw/rtc/goldfish_rtc.h b/include/hw/rtc/goldfish_rtc.h index 162be33863..55ed9c4085 100644 --- a/include/hw/rtc/goldfish_rtc.h +++ b/include/hw/rtc/goldfish_rtc.h @@ -22,7 +22,7 @@ #ifndef HW_RTC_GOLDFISH_RTC_H #define HW_RTC_GOLDFISH_RTC_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_GOLDFISH_RTC "goldfish_rtc" diff --git a/include/hw/rtc/pl031.h b/include/hw/rtc/pl031.h index 9fd4be1abb..c8b26c2f00 100644 --- a/include/hw/rtc/pl031.h +++ b/include/hw/rtc/pl031.h @@ -14,7 +14,7 @@ #ifndef HW_RTC_PL031_H #define HW_RTC_PL031_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/timer.h" #include "qom/object.h" diff --git a/include/hw/rtc/xlnx-zynqmp-rtc.h b/include/hw/rtc/xlnx-zynqmp-rtc.h index a542b87cb8..7d8505ce39 100644 --- a/include/hw/rtc/xlnx-zynqmp-rtc.h +++ b/include/hw/rtc/xlnx-zynqmp-rtc.h @@ -28,7 +28,7 @@ #define HW_RTC_XLNX_ZYNQMP_RTC_H #include "hw/core/register.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_XLNX_ZYNQMP_RTC "xlnx-zynmp.rtc" diff --git a/include/hw/s390x/3270-ccw.h b/include/hw/s390x/3270-ccw.h index 1439882294..6b73c8b51f 100644 --- a/include/hw/s390x/3270-ccw.h +++ b/include/hw/s390x/3270-ccw.h @@ -13,7 +13,7 @@ #ifndef HW_S390X_3270_CCW_H #define HW_S390X_3270_CCW_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/s390x/css.h" #include "hw/s390x/ccw-device.h" #include "qom/object.h" diff --git a/include/hw/s390x/css-bridge.h b/include/hw/s390x/css-bridge.h index 4f874ed781..1a29d3a542 100644 --- a/include/hw/s390x/css-bridge.h +++ b/include/hw/s390x/css-bridge.h @@ -14,7 +14,7 @@ #define HW_S390X_CSS_BRIDGE_H #include "qom/object.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" /* virtual css bridge */ struct VirtualCssBridge { diff --git a/include/hw/s390x/s390_flic.h b/include/hw/s390x/s390_flic.h index 91edaaca40..c9db5279e3 100644 --- a/include/hw/s390x/s390_flic.h +++ b/include/hw/s390x/s390_flic.h @@ -13,7 +13,7 @@ #ifndef HW_S390_FLIC_H #define HW_S390_FLIC_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/s390x/adapter.h" #include "hw/virtio/virtio.h" #include "qemu/queue.h" diff --git a/include/hw/s390x/sclp.h b/include/hw/s390x/sclp.h index 33f01f85bb..ddc61f1c21 100644 --- a/include/hw/s390x/sclp.h +++ b/include/hw/s390x/sclp.h @@ -14,7 +14,7 @@ #ifndef HW_S390_SCLP_H #define HW_S390_SCLP_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "target/s390x/cpu-qom.h" #include "qom/object.h" diff --git a/include/hw/scsi/esp.h b/include/hw/scsi/esp.h index 3526bad746..8887ba8512 100644 --- a/include/hw/scsi/esp.h +++ b/include/hw/scsi/esp.h @@ -2,7 +2,7 @@ #define QEMU_HW_ESP_H #include "hw/scsi/scsi.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/fifo8.h" #include "qom/object.h" diff --git a/include/hw/sd/allwinner-sdhost.h b/include/hw/sd/allwinner-sdhost.h index 1b951177dd..d154d81d24 100644 --- a/include/hw/sd/allwinner-sdhost.h +++ b/include/hw/sd/allwinner-sdhost.h @@ -21,7 +21,7 @@ #define HW_SD_ALLWINNER_SDHOST_H #include "qom/object.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/sd/sd.h" /** diff --git a/include/hw/sd/bcm2835_sdhost.h b/include/hw/sd/bcm2835_sdhost.h index f6bca5c397..8ba220d89e 100644 --- a/include/hw/sd/bcm2835_sdhost.h +++ b/include/hw/sd/bcm2835_sdhost.h @@ -14,7 +14,7 @@ #ifndef BCM2835_SDHOST_H #define BCM2835_SDHOST_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/sd/sd.h" #include "qom/object.h" diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h index 51fb30ea52..32962c210d 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -26,7 +26,7 @@ #define SDHCI_H #include "hw/pci/pci_device.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/sd/sd.h" #include "qom/object.h" diff --git a/include/hw/sparc/sparc32_dma.h b/include/hw/sparc/sparc32_dma.h index cde8ec02cb..3181c17043 100644 --- a/include/hw/sparc/sparc32_dma.h +++ b/include/hw/sparc/sparc32_dma.h @@ -1,7 +1,7 @@ #ifndef SPARC32_DMA_H #define SPARC32_DMA_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/scsi/esp.h" #include "hw/net/lance.h" #include "qom/object.h" diff --git a/include/hw/sparc/sun4m_iommu.h b/include/hw/sparc/sun4m_iommu.h index 4e2ab34cde..ccefafedbc 100644 --- a/include/hw/sparc/sun4m_iommu.h +++ b/include/hw/sparc/sun4m_iommu.h @@ -25,7 +25,7 @@ #ifndef SUN4M_IOMMU_H #define SUN4M_IOMMU_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define IOMMU_NREGS (4 * 4096 / 4) diff --git a/include/hw/sparc/sun4u_iommu.h b/include/hw/sparc/sun4u_iommu.h index f94566a72c..3ae81a2406 100644 --- a/include/hw/sparc/sun4u_iommu.h +++ b/include/hw/sparc/sun4u_iommu.h @@ -27,7 +27,7 @@ #ifndef SUN4U_IOMMU_H #define SUN4U_IOMMU_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define IOMMU_NREGS 3 diff --git a/include/hw/ssi/allwinner-a10-spi.h b/include/hw/ssi/allwinner-a10-spi.h index da46e29a27..6e0e299361 100644 --- a/include/hw/ssi/allwinner-a10-spi.h +++ b/include/hw/ssi/allwinner-a10-spi.h @@ -23,7 +23,7 @@ #define ALLWINNER_A10_SPI_H #include "hw/ssi/ssi.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/fifo8.h" #include "qom/object.h" diff --git a/include/hw/ssi/aspeed_smc.h b/include/hw/ssi/aspeed_smc.h index 25b95e7406..76831422c6 100644 --- a/include/hw/ssi/aspeed_smc.h +++ b/include/hw/ssi/aspeed_smc.h @@ -26,7 +26,7 @@ #define ASPEED_SMC_H #include "hw/ssi/ssi.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" struct AspeedSMCState; diff --git a/include/hw/ssi/bcm2835_spi.h b/include/hw/ssi/bcm2835_spi.h index d3f8cec111..d5891fd925 100644 --- a/include/hw/ssi/bcm2835_spi.h +++ b/include/hw/ssi/bcm2835_spi.h @@ -22,7 +22,7 @@ * THE SOFTWARE. */ -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/ssi/ssi.h" #include "qom/object.h" #include "qemu/fifo8.h" diff --git a/include/hw/ssi/ibex_spi_host.h b/include/hw/ssi/ibex_spi_host.h index 5bd5557b9a..2aac6ee920 100644 --- a/include/hw/ssi/ibex_spi_host.h +++ b/include/hw/ssi/ibex_spi_host.h @@ -27,7 +27,7 @@ #ifndef IBEX_SPI_HOST_H #define IBEX_SPI_HOST_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/ssi/ssi.h" #include "qemu/fifo8.h" #include "qom/object.h" diff --git a/include/hw/ssi/imx_spi.h b/include/hw/ssi/imx_spi.h index eeaf49bbac..9a95127755 100644 --- a/include/hw/ssi/imx_spi.h +++ b/include/hw/ssi/imx_spi.h @@ -10,7 +10,7 @@ #ifndef IMX_SPI_H #define IMX_SPI_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/ssi/ssi.h" #include "qemu/bitops.h" #include "qemu/fifo32.h" diff --git a/include/hw/ssi/mss-spi.h b/include/hw/ssi/mss-spi.h index ce6279c431..85e11f7266 100644 --- a/include/hw/ssi/mss-spi.h +++ b/include/hw/ssi/mss-spi.h @@ -25,7 +25,7 @@ #ifndef HW_MSS_SPI_H #define HW_MSS_SPI_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/ssi/ssi.h" #include "qemu/fifo32.h" #include "qom/object.h" diff --git a/include/hw/ssi/npcm7xx_fiu.h b/include/hw/ssi/npcm7xx_fiu.h index 7ebd422ca6..530d8e2f44 100644 --- a/include/hw/ssi/npcm7xx_fiu.h +++ b/include/hw/ssi/npcm7xx_fiu.h @@ -17,7 +17,7 @@ #define NPCM7XX_FIU_H #include "hw/ssi/ssi.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" /* * Number of registers in our device state structure. Don't change this without diff --git a/include/hw/ssi/npcm_pspi.h b/include/hw/ssi/npcm_pspi.h index 37cc784d96..dbf40710f3 100644 --- a/include/hw/ssi/npcm_pspi.h +++ b/include/hw/ssi/npcm_pspi.h @@ -17,7 +17,7 @@ #define NPCM_PSPI_H #include "hw/ssi/ssi.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" /* * Number of registers in our device state structure. Don't change this without diff --git a/include/hw/ssi/pl022.h b/include/hw/ssi/pl022.h index 25d58db5f3..afddc314c7 100644 --- a/include/hw/ssi/pl022.h +++ b/include/hw/ssi/pl022.h @@ -22,7 +22,7 @@ #ifndef HW_SSI_PL022_H #define HW_SSI_PL022_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_PL022 "pl022" diff --git a/include/hw/ssi/pnv_spi.h b/include/hw/ssi/pnv_spi.h index c591a0663d..31a690854b 100644 --- a/include/hw/ssi/pnv_spi.h +++ b/include/hw/ssi/pnv_spi.h @@ -22,7 +22,7 @@ #define PPC_PNV_SPI_H #include "hw/ssi/ssi.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/fifo8.h" #define TYPE_PNV_SPI "pnv-spi" diff --git a/include/hw/ssi/sifive_spi.h b/include/hw/ssi/sifive_spi.h index d0c40cdb11..e45becb8c5 100644 --- a/include/hw/ssi/sifive_spi.h +++ b/include/hw/ssi/sifive_spi.h @@ -23,7 +23,7 @@ #define HW_SIFIVE_SPI_H #include "qemu/fifo8.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #define SIFIVE_SPI_REG_NUM (0x78 / 4) diff --git a/include/hw/ssi/stm32f2xx_spi.h b/include/hw/ssi/stm32f2xx_spi.h index 3683b4ad32..26b02429aa 100644 --- a/include/hw/ssi/stm32f2xx_spi.h +++ b/include/hw/ssi/stm32f2xx_spi.h @@ -25,7 +25,7 @@ #ifndef HW_STM32F2XX_SPI_H #define HW_STM32F2XX_SPI_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/ssi/ssi.h" #include "qom/object.h" diff --git a/include/hw/ssi/xilinx_spips.h b/include/hw/ssi/xilinx_spips.h index 56cf69a37d..c8f6c5053c 100644 --- a/include/hw/ssi/xilinx_spips.h +++ b/include/hw/ssi/xilinx_spips.h @@ -28,7 +28,7 @@ #include "hw/ssi/ssi.h" #include "qemu/fifo32.h" #include "hw/core/stream.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" typedef struct XilinxSPIPS XilinxSPIPS; diff --git a/include/hw/timer/a9gtimer.h b/include/hw/timer/a9gtimer.h index 6ae9122e4b..5c9b048b95 100644 --- a/include/hw/timer/a9gtimer.h +++ b/include/hw/timer/a9gtimer.h @@ -23,7 +23,7 @@ #ifndef A9GTIMER_H #define A9GTIMER_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define A9_GTIMER_MAX_CPUS 4 diff --git a/include/hw/timer/allwinner-a10-pit.h b/include/hw/timer/allwinner-a10-pit.h index 623a1fec21..fe6a408022 100644 --- a/include/hw/timer/allwinner-a10-pit.h +++ b/include/hw/timer/allwinner-a10-pit.h @@ -2,7 +2,7 @@ #define ALLWINNER_A10_PIT_H #include "hw/core/ptimer.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_AW_A10_PIT "allwinner-A10-timer" diff --git a/include/hw/timer/arm_mptimer.h b/include/hw/timer/arm_mptimer.h index 65a96e2a0d..4c6f569631 100644 --- a/include/hw/timer/arm_mptimer.h +++ b/include/hw/timer/arm_mptimer.h @@ -21,7 +21,7 @@ #ifndef HW_TIMER_ARM_MPTIMER_H #define HW_TIMER_ARM_MPTIMER_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define ARM_MPTIMER_MAX_CPUS 4 diff --git a/include/hw/timer/armv7m_systick.h b/include/hw/timer/armv7m_systick.h index fb73f78a7b..637dbf35c5 100644 --- a/include/hw/timer/armv7m_systick.h +++ b/include/hw/timer/armv7m_systick.h @@ -12,7 +12,7 @@ #ifndef HW_TIMER_ARMV7M_SYSTICK_H #define HW_TIMER_ARMV7M_SYSTICK_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #include "hw/core/ptimer.h" #include "hw/core/clock.h" diff --git a/include/hw/timer/avr_timer16.h b/include/hw/timer/avr_timer16.h index a1a032a24d..5c9dca134a 100644 --- a/include/hw/timer/avr_timer16.h +++ b/include/hw/timer/avr_timer16.h @@ -28,7 +28,7 @@ #ifndef HW_TIMER_AVR_TIMER16_H #define HW_TIMER_AVR_TIMER16_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/timer.h" #include "qom/object.h" diff --git a/include/hw/timer/bcm2835_systmr.h b/include/hw/timer/bcm2835_systmr.h index 93cb3415a6..0674a18f12 100644 --- a/include/hw/timer/bcm2835_systmr.h +++ b/include/hw/timer/bcm2835_systmr.h @@ -9,7 +9,7 @@ #ifndef BCM2835_SYSTMR_H #define BCM2835_SYSTMR_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "qemu/timer.h" #include "qom/object.h" diff --git a/include/hw/timer/cadence_ttc.h b/include/hw/timer/cadence_ttc.h index e1251383f2..27b555e96a 100644 --- a/include/hw/timer/cadence_ttc.h +++ b/include/hw/timer/cadence_ttc.h @@ -18,7 +18,7 @@ #ifndef HW_TIMER_CADENCE_TTC_H #define HW_TIMER_CADENCE_TTC_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/timer.h" typedef struct { diff --git a/include/hw/timer/cmsdk-apb-dualtimer.h b/include/hw/timer/cmsdk-apb-dualtimer.h index 103ac22881..7e238f04df 100644 --- a/include/hw/timer/cmsdk-apb-dualtimer.h +++ b/include/hw/timer/cmsdk-apb-dualtimer.h @@ -26,7 +26,7 @@ #ifndef CMSDK_APB_DUALTIMER_H #define CMSDK_APB_DUALTIMER_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/ptimer.h" #include "hw/core/clock.h" #include "qom/object.h" diff --git a/include/hw/timer/cmsdk-apb-timer.h b/include/hw/timer/cmsdk-apb-timer.h index f8c8fb8ce5..5ecda01776 100644 --- a/include/hw/timer/cmsdk-apb-timer.h +++ b/include/hw/timer/cmsdk-apb-timer.h @@ -12,7 +12,7 @@ #ifndef CMSDK_APB_TIMER_H #define CMSDK_APB_TIMER_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/ptimer.h" #include "hw/core/clock.h" #include "qom/object.h" diff --git a/include/hw/timer/digic-timer.h b/include/hw/timer/digic-timer.h index f62242eaad..bcd80108a2 100644 --- a/include/hw/timer/digic-timer.h +++ b/include/hw/timer/digic-timer.h @@ -18,7 +18,7 @@ #ifndef HW_TIMER_DIGIC_TIMER_H #define HW_TIMER_DIGIC_TIMER_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/ptimer.h" #include "qom/object.h" diff --git a/include/hw/timer/ibex_timer.h b/include/hw/timer/ibex_timer.h index 41f5c82a92..53055f3351 100644 --- a/include/hw/timer/ibex_timer.h +++ b/include/hw/timer/ibex_timer.h @@ -25,7 +25,7 @@ #ifndef HW_IBEX_TIMER_H #define HW_IBEX_TIMER_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #define TYPE_IBEX_TIMER "ibex-timer" OBJECT_DECLARE_SIMPLE_TYPE(IbexTimerState, IBEX_TIMER) diff --git a/include/hw/timer/imx_epit.h b/include/hw/timer/imx_epit.h index 2947fad106..18d41ec139 100644 --- a/include/hw/timer/imx_epit.h +++ b/include/hw/timer/imx_epit.h @@ -29,7 +29,7 @@ #ifndef IMX_EPIT_H #define IMX_EPIT_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/ptimer.h" #include "hw/misc/imx_ccm.h" #include "qom/object.h" diff --git a/include/hw/timer/imx_gpt.h b/include/hw/timer/imx_gpt.h index 5c12f686e1..7f0d55b349 100644 --- a/include/hw/timer/imx_gpt.h +++ b/include/hw/timer/imx_gpt.h @@ -29,7 +29,7 @@ #ifndef IMX_GPT_H #define IMX_GPT_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/ptimer.h" #include "hw/misc/imx_ccm.h" #include "qom/object.h" diff --git a/include/hw/timer/mss-timer.h b/include/hw/timer/mss-timer.h index 0cc376f945..93a73fae72 100644 --- a/include/hw/timer/mss-timer.h +++ b/include/hw/timer/mss-timer.h @@ -25,7 +25,7 @@ #ifndef HW_MSS_TIMER_H #define HW_MSS_TIMER_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/ptimer.h" #include "qom/object.h" diff --git a/include/hw/timer/npcm7xx_timer.h b/include/hw/timer/npcm7xx_timer.h index e287375dce..9ad42c65a8 100644 --- a/include/hw/timer/npcm7xx_timer.h +++ b/include/hw/timer/npcm7xx_timer.h @@ -17,7 +17,7 @@ #define NPCM7XX_TIMER_H #include "system/memory.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/timer.h" /* Each Timer Module (TIM) instance holds five 25 MHz timers. */ diff --git a/include/hw/timer/nrf51_timer.h b/include/hw/timer/nrf51_timer.h index 76827c11dc..fe282ff78f 100644 --- a/include/hw/timer/nrf51_timer.h +++ b/include/hw/timer/nrf51_timer.h @@ -13,7 +13,7 @@ #ifndef NRF51_TIMER_H #define NRF51_TIMER_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/timer.h" #include "qom/object.h" #define TYPE_NRF51_TIMER "nrf51_soc.timer" diff --git a/include/hw/timer/renesas_cmt.h b/include/hw/timer/renesas_cmt.h index 1c0b65c1d5..e2aa6d47af 100644 --- a/include/hw/timer/renesas_cmt.h +++ b/include/hw/timer/renesas_cmt.h @@ -10,7 +10,7 @@ #define HW_TIMER_RENESAS_CMT_H #include "qemu/timer.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_RENESAS_CMT "renesas-cmt" diff --git a/include/hw/timer/renesas_tmr.h b/include/hw/timer/renesas_tmr.h index caf7eec0dc..061b8f2900 100644 --- a/include/hw/timer/renesas_tmr.h +++ b/include/hw/timer/renesas_tmr.h @@ -10,7 +10,7 @@ #define HW_TIMER_RENESAS_TMR_H #include "qemu/timer.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_RENESAS_TMR "renesas-tmr" diff --git a/include/hw/timer/sifive_pwm.h b/include/hw/timer/sifive_pwm.h index 6a8cf7b29e..d3a49be6b6 100644 --- a/include/hw/timer/sifive_pwm.h +++ b/include/hw/timer/sifive_pwm.h @@ -27,7 +27,7 @@ #ifndef HW_SIFIVE_PWM_H #define HW_SIFIVE_PWM_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/timer.h" #include "qom/object.h" diff --git a/include/hw/timer/sse-counter.h b/include/hw/timer/sse-counter.h index b433e58d37..15bd1a5104 100644 --- a/include/hw/timer/sse-counter.h +++ b/include/hw/timer/sse-counter.h @@ -30,7 +30,7 @@ #ifndef SSE_COUNTER_H #define SSE_COUNTER_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #include "qemu/notify.h" diff --git a/include/hw/timer/sse-timer.h b/include/hw/timer/sse-timer.h index 265ad32400..c9ad2225a6 100644 --- a/include/hw/timer/sse-timer.h +++ b/include/hw/timer/sse-timer.h @@ -24,7 +24,7 @@ #ifndef SSE_TIMER_H #define SSE_TIMER_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/timer.h" #include "qom/object.h" #include "hw/timer/sse-counter.h" diff --git a/include/hw/timer/stellaris-gptm.h b/include/hw/timer/stellaris-gptm.h index 9d663b58df..824723b273 100644 --- a/include/hw/timer/stellaris-gptm.h +++ b/include/hw/timer/stellaris-gptm.h @@ -11,7 +11,7 @@ #define HW_TIMER_STELLARIS_GPTM_H #include "qom/object.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "hw/core/clock.h" diff --git a/include/hw/timer/stm32f2xx_timer.h b/include/hw/timer/stm32f2xx_timer.h index 90f40f1746..040e64d499 100644 --- a/include/hw/timer/stm32f2xx_timer.h +++ b/include/hw/timer/stm32f2xx_timer.h @@ -25,7 +25,7 @@ #ifndef HW_STM32F2XX_TIMER_H #define HW_STM32F2XX_TIMER_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/timer.h" #include "qom/object.h" diff --git a/include/hw/tricore/tc27x_soc.h b/include/hw/tricore/tc27x_soc.h index dd3a7485c8..2d2bdca3fd 100644 --- a/include/hw/tricore/tc27x_soc.h +++ b/include/hw/tricore/tc27x_soc.h @@ -21,7 +21,7 @@ #ifndef TC27X_SOC_H #define TC27X_SOC_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "target/tricore/cpu.h" #include "qom/object.h" diff --git a/include/hw/tricore/tricore_testdevice.h b/include/hw/tricore/tricore_testdevice.h index 2c57b62f22..98c87ba76b 100644 --- a/include/hw/tricore/tricore_testdevice.h +++ b/include/hw/tricore/tricore_testdevice.h @@ -18,7 +18,7 @@ #ifndef HW_TRICORE_TESTDEVICE_H #define HW_TRICORE_TESTDEVICE_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #define TYPE_TRICORE_TESTDEVICE "tricore_testdevice" #define TRICORE_TESTDEVICE(obj) \ diff --git a/include/hw/usb/imx-usb-phy.h b/include/hw/usb/imx-usb-phy.h index d1e867b77a..1b45b6e62a 100644 --- a/include/hw/usb/imx-usb-phy.h +++ b/include/hw/usb/imx-usb-phy.h @@ -1,7 +1,7 @@ #ifndef IMX_USB_PHY_H #define IMX_USB_PHY_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qemu/bitops.h" #include "qom/object.h" diff --git a/include/hw/usb/xlnx-usb-subsystem.h b/include/hw/usb/xlnx-usb-subsystem.h index b22e5d065b..e78ca743d3 100644 --- a/include/hw/usb/xlnx-usb-subsystem.h +++ b/include/hw/usb/xlnx-usb-subsystem.h @@ -26,7 +26,7 @@ #define XLNX_USB_SUBSYSTEM_H #include "hw/core/register.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/usb/xlnx-versal-usb2-ctrl-regs.h" #include "hw/usb/hcd-dwc3.h" diff --git a/include/hw/usb/xlnx-versal-usb2-ctrl-regs.h b/include/hw/usb/xlnx-versal-usb2-ctrl-regs.h index c1470da475..a8575ad669 100644 --- a/include/hw/usb/xlnx-versal-usb2-ctrl-regs.h +++ b/include/hw/usb/xlnx-versal-usb2-ctrl-regs.h @@ -27,7 +27,7 @@ #define XLNX_VERSAL_USB2_CTRL_REGS_H #include "hw/core/register.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #define TYPE_XILINX_VERSAL_USB2_CTRL_REGS "xlnx.versal-usb2-ctrl-regs" diff --git a/include/hw/virtio/virtio-mmio.h b/include/hw/virtio/virtio-mmio.h index aa49262022..1eab3c0dec 100644 --- a/include/hw/virtio/virtio-mmio.h +++ b/include/hw/virtio/virtio-mmio.h @@ -22,7 +22,7 @@ #ifndef HW_VIRTIO_MMIO_H #define HW_VIRTIO_MMIO_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/virtio/virtio-bus.h" /* QOM macros */ diff --git a/include/hw/watchdog/allwinner-wdt.h b/include/hw/watchdog/allwinner-wdt.h index 6f84dbd1a7..e6da42a9f7 100644 --- a/include/hw/watchdog/allwinner-wdt.h +++ b/include/hw/watchdog/allwinner-wdt.h @@ -25,7 +25,7 @@ #include "qom/object.h" #include "hw/core/ptimer.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" /* * This is a model of the Allwinner watchdog. diff --git a/include/hw/watchdog/cmsdk-apb-watchdog.h b/include/hw/watchdog/cmsdk-apb-watchdog.h index 9bf95ba06d..1c7de63999 100644 --- a/include/hw/watchdog/cmsdk-apb-watchdog.h +++ b/include/hw/watchdog/cmsdk-apb-watchdog.h @@ -31,7 +31,7 @@ #ifndef CMSDK_APB_WATCHDOG_H #define CMSDK_APB_WATCHDOG_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/ptimer.h" #include "hw/core/clock.h" #include "qom/object.h" diff --git a/include/hw/watchdog/sbsa_gwdt.h b/include/hw/watchdog/sbsa_gwdt.h index ace8fe04c8..307a4f291a 100644 --- a/include/hw/watchdog/sbsa_gwdt.h +++ b/include/hw/watchdog/sbsa_gwdt.h @@ -13,7 +13,7 @@ #define WDT_SBSA_GWDT_H #include "qemu/bitops.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #define TYPE_WDT_SBSA "sbsa_gwdt" diff --git a/include/hw/watchdog/wdt_aspeed.h b/include/hw/watchdog/wdt_aspeed.h index 830b0a7936..ecf20fbb4e 100644 --- a/include/hw/watchdog/wdt_aspeed.h +++ b/include/hw/watchdog/wdt_aspeed.h @@ -11,7 +11,7 @@ #define WDT_ASPEED_H #include "hw/misc/aspeed_scu.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "qom/object.h" #define TYPE_ASPEED_WDT "aspeed.wdt" diff --git a/include/hw/watchdog/wdt_imx2.h b/include/hw/watchdog/wdt_imx2.h index 53a8360e90..ad36b8820d 100644 --- a/include/hw/watchdog/wdt_imx2.h +++ b/include/hw/watchdog/wdt_imx2.h @@ -13,7 +13,7 @@ #define WDT_IMX2_H #include "qemu/bitops.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/irq.h" #include "hw/core/ptimer.h" #include "qom/object.h" diff --git a/include/hw/xen/xen_pvdev.h b/include/hw/xen/xen_pvdev.h index 629bec90d0..232c496008 100644 --- a/include/hw/xen/xen_pvdev.h +++ b/include/hw/xen/xen_pvdev.h @@ -1,7 +1,7 @@ #ifndef QEMU_HW_XEN_PVDEV_H #define QEMU_HW_XEN_PVDEV_H -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/xen/xen_backend_ops.h" /* ------------------------------------------------------------- */ diff --git a/rust/hw/core/wrapper.h b/rust/hw/core/wrapper.h index f6b34161a6..8278738f3d 100644 --- a/rust/hw/core/wrapper.h +++ b/rust/hw/core/wrapper.h @@ -24,7 +24,7 @@ typedef enum memory_order { #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "hw/core/clock.h" #include "hw/core/qdev-clock.h" #include "hw/core/qdev-properties.h" diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c index 8e74e24c19..0bf514cb09 100644 --- a/system/qdev-monitor.c +++ b/system/qdev-monitor.c @@ -18,7 +18,7 @@ */ #include "qemu/osdep.h" -#include "hw/sysbus.h" +#include "hw/core/sysbus.h" #include "monitor/hmp.h" #include "monitor/monitor.h" #include "monitor/qdev.h"