diff options
| -rw-r--r-- | arch_init.c | 8 | ||||
| -rw-r--r-- | block/iscsi.c | 4 | ||||
| -rw-r--r-- | blockdev-nbd.c | 2 | ||||
| -rw-r--r-- | blockdev.c | 2 | ||||
| -rw-r--r-- | exec.c | 2 | ||||
| -rw-r--r-- | gdbstub.c | 2 | ||||
| -rw-r--r-- | hw/9pfs/virtio-9p-device.c | 4 | ||||
| -rw-r--r-- | hw/9pfs/virtio-9p-handle.c | 2 | ||||
| -rw-r--r-- | hw/9pfs/virtio-9p-local.c | 2 | ||||
| -rw-r--r-- | hw/9pfs/virtio-9p-posix-acl.c | 2 | ||||
| -rw-r--r-- | hw/9pfs/virtio-9p-proxy.c | 2 | ||||
| -rw-r--r-- | hw/9pfs/virtio-9p-synth.c | 2 | ||||
| -rw-r--r-- | hw/9pfs/virtio-9p-xattr-user.c | 2 | ||||
| -rw-r--r-- | hw/9pfs/virtio-9p-xattr.c | 2 | ||||
| -rw-r--r-- | hw/9pfs/virtio-9p.c | 4 | ||||
| -rw-r--r-- | hw/9pfs/virtio-9p.h | 2 | ||||
| -rw-r--r-- | hw/ac97.c | 2 | ||||
| -rw-r--r-- | hw/acpi.c | 4 | ||||
| -rw-r--r-- | hw/acpi_ich9.c | 6 | ||||
| -rw-r--r-- | hw/acpi_piix4.c | 10 | ||||
| -rw-r--r-- | hw/adb.c | 2 | ||||
| -rw-r--r-- | hw/adlib.c | 4 | ||||
| -rw-r--r-- | hw/alpha/dp264.c | 6 | ||||
| -rw-r--r-- | hw/alpha_sys.h | 2 | ||||
| -rw-r--r-- | hw/alpha_typhoon.c | 2 | ||||
| -rw-r--r-- | hw/apb_pci.c | 2 | ||||
| -rw-r--r-- | hw/apic.c | 10 | ||||
| -rw-r--r-- | hw/apic_common.c | 4 | ||||
| -rw-r--r-- | hw/apm.c | 2 | ||||
| -rw-r--r-- | hw/applesmc.c | 2 | ||||
| -rw-r--r-- | hw/arm/armv7m.c | 2 | ||||
| -rw-r--r-- | hw/arm/boot.c | 2 | ||||
| -rw-r--r-- | hw/arm/collie.c | 6 | ||||
| -rw-r--r-- | hw/arm/exynos4210.c | 4 | ||||
| -rw-r--r-- | hw/arm/exynos4_boards.c | 4 | ||||
| -rw-r--r-- | hw/arm/gumstix.c | 6 | ||||
| -rw-r--r-- | hw/arm/highbank.c | 4 | ||||
| -rw-r--r-- | hw/arm/integratorcp.c | 4 | ||||
| -rw-r--r-- | hw/arm/kzm.c | 8 | ||||
| -rw-r--r-- | hw/arm/mainstone.c | 8 | ||||
| -rw-r--r-- | hw/arm/musicpal.c | 10 | ||||
| -rw-r--r-- | hw/arm/nseries.c | 10 | ||||
| -rw-r--r-- | hw/arm/omap1.c | 6 | ||||
| -rw-r--r-- | hw/arm/omap2.c | 8 | ||||
| -rw-r--r-- | hw/arm/omap_sx1.c | 6 | ||||
| -rw-r--r-- | hw/arm/palm.c | 6 | ||||
| -rw-r--r-- | hw/arm/pic_cpu.c | 2 | ||||
| -rw-r--r-- | hw/arm/pxa2xx.c | 6 | ||||
| -rw-r--r-- | hw/arm/pxa2xx_gpio.c | 2 | ||||
| -rw-r--r-- | hw/arm/pxa2xx_pic.c | 2 | ||||
| -rw-r--r-- | hw/arm/realview.c | 8 | ||||
| -rw-r--r-- | hw/arm/spitz.c | 12 | ||||
| -rw-r--r-- | hw/arm/stellaris.c | 6 | ||||
| -rw-r--r-- | hw/arm/tosa.c | 10 | ||||
| -rw-r--r-- | hw/arm/versatilepb.c | 8 | ||||
| -rw-r--r-- | hw/arm/vexpress.c | 8 | ||||
| -rw-r--r-- | hw/arm/xilinx_zynq.c | 4 | ||||
| -rw-r--r-- | hw/arm/z2.c | 10 | ||||
| -rw-r--r-- | hw/arm_sysctl.c | 2 | ||||
| -rw-r--r-- | hw/armv7m_nvic.c | 2 | ||||
| -rw-r--r-- | hw/bitbang_i2c.h | 2 | ||||
| -rw-r--r-- | hw/blizzard.c | 2 | ||||
| -rw-r--r-- | hw/block-common.c | 2 | ||||
| -rw-r--r-- | hw/bonito.c | 4 | ||||
| -rw-r--r-- | hw/bt-hid.c | 2 | ||||
| -rw-r--r-- | hw/cbus.c | 2 | ||||
| -rw-r--r-- | hw/cdrom.c | 2 | ||||
| -rw-r--r-- | hw/cris/axis_dev88.c | 4 | ||||
| -rw-r--r-- | hw/cris/pic_cpu.c | 2 | ||||
| -rw-r--r-- | hw/cs4231a.c | 4 | ||||
| -rw-r--r-- | hw/cuda.c | 2 | ||||
| -rw-r--r-- | hw/dataplane/hostmem.c | 2 | ||||
| -rw-r--r-- | hw/dataplane/virtio-blk.c | 6 | ||||
| -rw-r--r-- | hw/dataplane/virtio-blk.h | 2 | ||||
| -rw-r--r-- | hw/dataplane/vring.c | 2 | ||||
| -rw-r--r-- | hw/debugcon.c | 4 | ||||
| -rw-r--r-- | hw/debugexit.c | 2 | ||||
| -rw-r--r-- | hw/dma.c | 2 | ||||
| -rw-r--r-- | hw/dp8393x.c | 2 | ||||
| -rw-r--r-- | hw/ds1338.c | 2 | ||||
| -rw-r--r-- | hw/ecc.c | 2 | ||||
| -rw-r--r-- | hw/eepro100.c | 2 | ||||
| -rw-r--r-- | hw/eeprom93xx.c | 2 | ||||
| -rw-r--r-- | hw/es1370.c | 2 | ||||
| -rw-r--r-- | hw/escc.c | 2 | ||||
| -rw-r--r-- | hw/esp-pci.c | 4 | ||||
| -rw-r--r-- | hw/esp.c | 2 | ||||
| -rw-r--r-- | hw/etraxfs_dma.c | 2 | ||||
| -rw-r--r-- | hw/etraxfs_eth.c | 2 | ||||
| -rw-r--r-- | hw/exynos4210_combiner.c | 2 | ||||
| -rw-r--r-- | hw/exynos4210_gic.c | 2 | ||||
| -rw-r--r-- | hw/exynos4210_i2c.c | 2 | ||||
| -rw-r--r-- | hw/exynos4210_mct.c | 2 | ||||
| -rw-r--r-- | hw/exynos4210_pwm.c | 2 | ||||
| -rw-r--r-- | hw/exynos4210_rtc.c | 2 | ||||
| -rw-r--r-- | hw/exynos4210_uart.c | 2 | ||||
| -rw-r--r-- | hw/fdc.c | 4 | ||||
| -rw-r--r-- | hw/fw_cfg.c | 4 | ||||
| -rw-r--r-- | hw/grlib_irqmp.c | 2 | ||||
| -rw-r--r-- | hw/gt64xxx.c | 4 | ||||
| -rw-r--r-- | hw/gus.c | 4 | ||||
| -rw-r--r-- | hw/hd-geometry.c | 2 | ||||
| -rw-r--r-- | hw/hid.c | 2 | ||||
| -rw-r--r-- | hw/hpet.c | 8 | ||||
| -rw-r--r-- | hw/i2c.c | 2 | ||||
| -rw-r--r-- | hw/i386/kvmvapic.c | 2 | ||||
| -rw-r--r-- | hw/i386/multiboot.c | 2 | ||||
| -rw-r--r-- | hw/i386/pc.c | 24 | ||||
| -rw-r--r-- | hw/i386/pc_piix.c | 8 | ||||
| -rw-r--r-- | hw/i386/pc_q35.c | 10 | ||||
| -rw-r--r-- | hw/i386/smbios.c | 2 | ||||
| -rw-r--r-- | hw/i386/xen_domainbuild.c | 2 | ||||
| -rw-r--r-- | hw/i386/xen_machine_pv.c | 4 | ||||
| -rw-r--r-- | hw/i82374.c | 2 | ||||
| -rw-r--r-- | hw/i82378.c | 6 | ||||
| -rw-r--r-- | hw/i8254.c | 8 | ||||
| -rw-r--r-- | hw/i8254_common.c | 8 | ||||
| -rw-r--r-- | hw/i8259.c | 6 | ||||
| -rw-r--r-- | hw/i8259_common.c | 4 | ||||
| -rw-r--r-- | hw/i82801b11.c | 2 | ||||
| -rw-r--r-- | hw/ide/ahci.c | 2 | ||||
| -rw-r--r-- | hw/ide/atapi.c | 2 | ||||
| -rw-r--r-- | hw/ide/cmd646.c | 4 | ||||
| -rw-r--r-- | hw/ide/core.c | 6 | ||||
| -rw-r--r-- | hw/ide/ich.c | 4 | ||||
| -rw-r--r-- | hw/ide/internal.h | 6 | ||||
| -rw-r--r-- | hw/ide/isa.c | 4 | ||||
| -rw-r--r-- | hw/ide/macio.c | 2 | ||||
| -rw-r--r-- | hw/ide/microdrive.c | 2 | ||||
| -rw-r--r-- | hw/ide/pci.c | 4 | ||||
| -rw-r--r-- | hw/ide/piix.c | 4 | ||||
| -rw-r--r-- | hw/ide/qdev.c | 2 | ||||
| -rw-r--r-- | hw/ide/via.c | 4 | ||||
| -rw-r--r-- | hw/imx_ccm.c | 2 | ||||
| -rw-r--r-- | hw/imx_serial.c | 2 | ||||
| -rw-r--r-- | hw/imx_timer.c | 2 | ||||
| -rw-r--r-- | hw/intel-hda.c | 2 | ||||
| -rw-r--r-- | hw/ioapic.c | 8 | ||||
| -rw-r--r-- | hw/ioapic_common.c | 4 | ||||
| -rw-r--r-- | hw/isa-bus.c | 2 | ||||
| -rw-r--r-- | hw/isa_mmio.c | 2 | ||||
| -rw-r--r-- | hw/ivshmem.c | 2 | ||||
| -rw-r--r-- | hw/kvm/apic.c | 2 | ||||
| -rw-r--r-- | hw/kvm/i8254.c | 4 | ||||
| -rw-r--r-- | hw/kvm/i8259.c | 4 | ||||
| -rw-r--r-- | hw/kvm/ioapic.c | 6 | ||||
| -rw-r--r-- | hw/kvm/pci-assign.c | 2 | ||||
| -rw-r--r-- | hw/lan9118.c | 2 | ||||
| -rw-r--r-- | hw/lance.c | 2 | ||||
| -rw-r--r-- | hw/lm32/lm32_boards.c | 4 | ||||
| -rw-r--r-- | hw/lm32/milkymist.c | 4 | ||||
| -rw-r--r-- | hw/lm32_juart.c | 2 | ||||
| -rw-r--r-- | hw/lm32_pic.c | 4 | ||||
| -rw-r--r-- | hw/lm832x.c | 2 | ||||
| -rw-r--r-- | hw/loader.c | 2 | ||||
| -rw-r--r-- | hw/lpc_ich9.c | 15 | ||||
| -rw-r--r-- | hw/lsi53c895a.c | 2 | ||||
| -rw-r--r-- | hw/m25p80.c | 2 | ||||
| -rw-r--r-- | hw/m48t59.c | 4 | ||||
| -rw-r--r-- | hw/m68k/an5206.c | 2 | ||||
| -rw-r--r-- | hw/m68k/mcf5206.c | 2 | ||||
| -rw-r--r-- | hw/m68k/mcf5208.c | 2 | ||||
| -rw-r--r-- | hw/m68k/mcf_intc.c | 2 | ||||
| -rw-r--r-- | hw/mac_dbdma.c | 4 | ||||
| -rw-r--r-- | hw/mac_nvram.c | 2 | ||||
| -rw-r--r-- | hw/macio.c | 4 | ||||
| -rw-r--r-- | hw/marvell_88w8618_audio.c | 2 | ||||
| -rw-r--r-- | hw/max7310.c | 2 | ||||
| -rw-r--r-- | hw/mc146818rtc.c | 4 | ||||
| -rw-r--r-- | hw/mcf_fec.c | 2 | ||||
| -rw-r--r-- | hw/mcf_uart.c | 2 | ||||
| -rw-r--r-- | hw/megasas.c | 4 | ||||
| -rw-r--r-- | hw/microblaze/petalogix_ml605_mmu.c | 6 | ||||
| -rw-r--r-- | hw/microblaze/petalogix_s3adsp1800_mmu.c | 4 | ||||
| -rw-r--r-- | hw/milkymist-softusb.c | 2 | ||||
| -rw-r--r-- | hw/mips/addr.c | 2 | ||||
| -rw-r--r-- | hw/mips/cputimer.c | 2 | ||||
| -rw-r--r-- | hw/mips/mips_fulong2e.c | 22 | ||||
| -rw-r--r-- | hw/mips/mips_int.c | 2 | ||||
| -rw-r--r-- | hw/mips/mips_jazz.c | 22 | ||||
| -rw-r--r-- | hw/mips/mips_malta.c | 20 | ||||
| -rw-r--r-- | hw/mips/mips_mipssim.c | 10 | ||||
| -rw-r--r-- | hw/mips/mips_r4k.c | 18 | ||||
| -rw-r--r-- | hw/moxie/moxiesim.c | 6 | ||||
| -rw-r--r-- | hw/nand.c | 2 | ||||
| -rw-r--r-- | hw/ne2000-isa.c | 4 | ||||
| -rw-r--r-- | hw/omap_clk.c | 2 | ||||
| -rw-r--r-- | hw/omap_dma.c | 4 | ||||
| -rw-r--r-- | hw/omap_dss.c | 2 | ||||
| -rw-r--r-- | hw/omap_gpio.c | 2 | ||||
| -rw-r--r-- | hw/omap_gpmc.c | 4 | ||||
| -rw-r--r-- | hw/omap_gptimer.c | 2 | ||||
| -rw-r--r-- | hw/omap_i2c.c | 4 | ||||
| -rw-r--r-- | hw/omap_intc.c | 2 | ||||
| -rw-r--r-- | hw/omap_l4.c | 2 | ||||
| -rw-r--r-- | hw/omap_lcdc.c | 2 | ||||
| -rw-r--r-- | hw/omap_mmc.c | 2 | ||||
| -rw-r--r-- | hw/omap_sdrc.c | 2 | ||||
| -rw-r--r-- | hw/omap_spi.c | 2 | ||||
| -rw-r--r-- | hw/omap_synctimer.c | 2 | ||||
| -rw-r--r-- | hw/omap_tap.c | 2 | ||||
| -rw-r--r-- | hw/omap_uart.c | 4 | ||||
| -rw-r--r-- | hw/onenand.c | 2 | ||||
| -rw-r--r-- | hw/openpic.c | 4 | ||||
| -rw-r--r-- | hw/openrisc/openrisc_sim.c | 2 | ||||
| -rw-r--r-- | hw/pam.c | 2 | ||||
| -rw-r--r-- | hw/parallel.c | 4 | ||||
| -rw-r--r-- | hw/pc-testdev.c | 2 | ||||
| -rw-r--r-- | hw/pc87312.c | 2 | ||||
| -rw-r--r-- | hw/pc_sysfw.c | 4 | ||||
| -rw-r--r-- | hw/pci/pci-hotplug.c | 6 | ||||
| -rw-r--r-- | hw/pckbd.c | 6 | ||||
| -rw-r--r-- | hw/pcspk.c | 8 | ||||
| -rw-r--r-- | hw/pflash_cfi01.c | 2 | ||||
| -rw-r--r-- | hw/pflash_cfi02.c | 2 | ||||
| -rw-r--r-- | hw/piix4.c | 4 | ||||
| -rw-r--r-- | hw/piix_pci.c | 8 | ||||
| -rw-r--r-- | hw/pl050.c | 2 | ||||
| -rw-r--r-- | hw/pl330.c | 2 | ||||
| -rw-r--r-- | hw/pm_smbus.c | 6 | ||||
| -rw-r--r-- | hw/ppc/e500.c | 8 | ||||
| -rw-r--r-- | hw/ppc/e500plat.c | 2 | ||||
| -rw-r--r-- | hw/ppc/mac.h | 2 | ||||
| -rw-r--r-- | hw/ppc/mac_newworld.c | 14 | ||||
| -rw-r--r-- | hw/ppc/mac_oldworld.c | 12 | ||||
| -rw-r--r-- | hw/ppc/mpc8544ds.c | 2 | ||||
| -rw-r--r-- | hw/ppc/ppc.c | 4 | ||||
| -rw-r--r-- | hw/ppc/ppc405_boards.c | 6 | ||||
| -rw-r--r-- | hw/ppc/ppc405_uc.c | 4 | ||||
| -rw-r--r-- | hw/ppc/ppc440_bamboo.c | 4 | ||||
| -rw-r--r-- | hw/ppc/ppc4xx_devs.c | 4 | ||||
| -rw-r--r-- | hw/ppc/ppc_booke.c | 4 | ||||
| -rw-r--r-- | hw/ppc/prep.c | 16 | ||||
| -rw-r--r-- | hw/ppc/spapr.c | 10 | ||||
| -rw-r--r-- | hw/ppc/spapr_events.c | 4 | ||||
| -rw-r--r-- | hw/ppc/spapr_hcall.c | 2 | ||||
| -rw-r--r-- | hw/ppc/spapr_iommu.c | 2 | ||||
| -rw-r--r-- | hw/ppc/spapr_rtas.c | 4 | ||||
| -rw-r--r-- | hw/ppc/spapr_vio.c | 6 | ||||
| -rw-r--r-- | hw/ppc/virtex_ml507.c | 10 | ||||
| -rw-r--r-- | hw/ppc/xics.c | 4 | ||||
| -rw-r--r-- | hw/ppc405.h | 2 | ||||
| -rw-r--r-- | hw/ppc4xx_pci.c | 4 | ||||
| -rw-r--r-- | hw/ppce500_pci.c | 2 | ||||
| -rw-r--r-- | hw/prep_pci.c | 2 | ||||
| -rw-r--r-- | hw/ps2.c | 2 | ||||
| -rw-r--r-- | hw/puv3_dma.c | 2 | ||||
| -rw-r--r-- | hw/puv3_gpio.c | 2 | ||||
| -rw-r--r-- | hw/puv3_intc.c | 2 | ||||
| -rw-r--r-- | hw/puv3_ost.c | 2 | ||||
| -rw-r--r-- | hw/puv3_pm.c | 2 | ||||
| -rw-r--r-- | hw/pxa2xx_dma.c | 2 | ||||
| -rw-r--r-- | hw/pxa2xx_keypad.c | 2 | ||||
| -rw-r--r-- | hw/pxa2xx_lcd.c | 2 | ||||
| -rw-r--r-- | hw/pxa2xx_mmci.c | 2 | ||||
| -rw-r--r-- | hw/pxa2xx_pcmcia.c | 2 | ||||
| -rw-r--r-- | hw/pxa2xx_timer.c | 2 | ||||
| -rw-r--r-- | hw/q35.c | 2 | ||||
| -rw-r--r-- | hw/qdev-properties-system.c | 2 | ||||
| -rw-r--r-- | hw/qdev-properties.c | 2 | ||||
| -rw-r--r-- | hw/rc4030.c | 2 | ||||
| -rw-r--r-- | hw/s390x/s390-virtio-bus.c | 10 | ||||
| -rw-r--r-- | hw/s390x/s390-virtio-bus.h | 12 | ||||
| -rw-r--r-- | hw/s390x/s390-virtio.c | 2 | ||||
| -rw-r--r-- | hw/s390x/virtio-ccw.c | 8 | ||||
| -rw-r--r-- | hw/s390x/virtio-ccw.h | 14 | ||||
| -rw-r--r-- | hw/sb16.c | 4 | ||||
| -rw-r--r-- | hw/scsi-bus.c | 4 | ||||
| -rw-r--r-- | hw/scsi-disk.c | 6 | ||||
| -rw-r--r-- | hw/scsi-generic.c | 4 | ||||
| -rw-r--r-- | hw/serial-isa.c | 4 | ||||
| -rw-r--r-- | hw/serial-pci.c | 2 | ||||
| -rw-r--r-- | hw/serial.c | 2 | ||||
| -rw-r--r-- | hw/sga.c | 2 | ||||
| -rw-r--r-- | hw/sh4/r2d.c | 6 | ||||
| -rw-r--r-- | hw/sh4/sh7750.c | 4 | ||||
| -rw-r--r-- | hw/sh4/sh7750_regnames.c | 2 | ||||
| -rw-r--r-- | hw/sh4/shix.c | 2 | ||||
| -rw-r--r-- | hw/sh_intc.c | 4 | ||||
| -rw-r--r-- | hw/sh_pci.c | 2 | ||||
| -rw-r--r-- | hw/sh_serial.c | 2 | ||||
| -rw-r--r-- | hw/sh_timer.c | 2 | ||||
| -rw-r--r-- | hw/slavio_intctl.c | 2 | ||||
| -rw-r--r-- | hw/slavio_timer.c | 2 | ||||
| -rw-r--r-- | hw/sm501.c | 4 | ||||
| -rw-r--r-- | hw/smbus.c | 4 | ||||
| -rw-r--r-- | hw/smbus_eeprom.c | 4 | ||||
| -rw-r--r-- | hw/smbus_ich9.c | 10 | ||||
| -rw-r--r-- | hw/smc91c111.c | 2 | ||||
| -rw-r--r-- | hw/soc_dma.c | 2 | ||||
| -rw-r--r-- | hw/spapr_llan.c | 4 | ||||
| -rw-r--r-- | hw/spapr_nvram.c | 4 | ||||
| -rw-r--r-- | hw/spapr_pci.c | 4 | ||||
| -rw-r--r-- | hw/spapr_vscsi.c | 8 | ||||
| -rw-r--r-- | hw/spapr_vty.c | 4 | ||||
| -rw-r--r-- | hw/sparc/leon3.c | 2 | ||||
| -rw-r--r-- | hw/sparc/sun4m.c | 20 | ||||
| -rw-r--r-- | hw/sparc32_dma.c | 4 | ||||
| -rw-r--r-- | hw/sparc64/sun4u.c | 14 | ||||
| -rw-r--r-- | hw/ssd0303.c | 2 | ||||
| -rw-r--r-- | hw/stellaris_input.c | 2 | ||||
| -rw-r--r-- | hw/strongarm.c | 2 | ||||
| -rw-r--r-- | hw/sun4c_intctl.c | 2 | ||||
| -rw-r--r-- | hw/sun4m_iommu.c | 2 | ||||
| -rw-r--r-- | hw/tc58128.c | 2 | ||||
| -rw-r--r-- | hw/tc6393xb.c | 4 | ||||
| -rw-r--r-- | hw/tmp105.c | 2 | ||||
| -rw-r--r-- | hw/tmp105.h | 4 | ||||
| -rw-r--r-- | hw/tsc2005.c | 2 | ||||
| -rw-r--r-- | hw/tsc210x.c | 4 | ||||
| -rw-r--r-- | hw/tusb6010.c | 4 | ||||
| -rw-r--r-- | hw/twl92230.c | 2 | ||||
| -rw-r--r-- | hw/unicore32/puv3.c | 4 | ||||
| -rw-r--r-- | hw/usb/dev-audio.c | 2 | ||||
| -rw-r--r-- | hw/usb/dev-hid.c | 2 | ||||
| -rw-r--r-- | hw/usb/dev-storage.c | 2 | ||||
| -rw-r--r-- | hw/usb/dev-uas.c | 4 | ||||
| -rw-r--r-- | hw/vga-isa-mm.c | 2 | ||||
| -rw-r--r-- | hw/vga-isa.c | 2 | ||||
| -rw-r--r-- | hw/vga.c | 4 | ||||
| -rw-r--r-- | hw/vhost.c | 2 | ||||
| -rw-r--r-- | hw/vhost_net.c | 6 | ||||
| -rw-r--r-- | hw/virtio-balloon.c | 8 | ||||
| -rw-r--r-- | hw/virtio-blk.c | 11 | ||||
| -rw-r--r-- | hw/virtio-bus.c | 4 | ||||
| -rw-r--r-- | hw/virtio-console.c | 2 | ||||
| -rw-r--r-- | hw/virtio-net.c | 6 | ||||
| -rw-r--r-- | hw/virtio-pci.c | 14 | ||||
| -rw-r--r-- | hw/virtio-pci.h | 16 | ||||
| -rw-r--r-- | hw/virtio-rng.c | 4 | ||||
| -rw-r--r-- | hw/virtio-scsi.c | 8 | ||||
| -rw-r--r-- | hw/virtio-serial-bus.c | 2 | ||||
| -rw-r--r-- | hw/virtio.c | 4 | ||||
| -rw-r--r-- | hw/vmmouse.c | 4 | ||||
| -rw-r--r-- | hw/vmport.c | 4 | ||||
| -rw-r--r-- | hw/vmxnet3.c | 9 | ||||
| -rw-r--r-- | hw/vt82c686.c | 18 | ||||
| -rw-r--r-- | hw/watchdog.c | 2 | ||||
| -rw-r--r-- | hw/wdt_i6300esb.c | 2 | ||||
| -rw-r--r-- | hw/wdt_ib700.c | 6 | ||||
| -rw-r--r-- | hw/wm8750.c | 2 | ||||
| -rw-r--r-- | hw/xen_apic.c | 4 | ||||
| -rw-r--r-- | hw/xen_backend.c | 2 | ||||
| -rw-r--r-- | hw/xen_console.c | 2 | ||||
| -rw-r--r-- | hw/xen_devconfig.c | 2 | ||||
| -rw-r--r-- | hw/xen_disk.c | 2 | ||||
| -rw-r--r-- | hw/xen_domainbuild.h | 2 | ||||
| -rw-r--r-- | hw/xen_nic.c | 2 | ||||
| -rw-r--r-- | hw/xen_platform.c | 6 | ||||
| -rw-r--r-- | hw/xen_pt.c | 4 | ||||
| -rw-r--r-- | hw/xen_pt.h | 2 | ||||
| -rw-r--r-- | hw/xen_pt_config_init.c | 2 | ||||
| -rw-r--r-- | hw/xen_pt_msi.c | 4 | ||||
| -rw-r--r-- | hw/xenfb.c | 2 | ||||
| -rw-r--r-- | hw/xtensa/xtensa_lx60.c | 4 | ||||
| -rw-r--r-- | hw/zaurus.c | 2 | ||||
| -rw-r--r-- | include/block/scsi.h (renamed from hw/scsi-defs.h) | 0 | ||||
| -rw-r--r-- | include/exec/memory-internal.h | 2 | ||||
| -rw-r--r-- | include/hw/acpi/acpi.h (renamed from hw/acpi.h) | 0 | ||||
| -rw-r--r-- | include/hw/acpi/ich9.h (renamed from hw/acpi_ich9.h) | 2 | ||||
| -rw-r--r-- | include/hw/arm.h (renamed from hw/arm-misc.h) | 0 | ||||
| -rw-r--r-- | include/hw/arm/devices.h (renamed from hw/devices.h) | 0 | ||||
| -rw-r--r-- | include/hw/arm/exynos4210.h (renamed from hw/exynos4210.h) | 0 | ||||
| -rw-r--r-- | include/hw/arm/imx.h (renamed from hw/imx.h) | 0 | ||||
| -rw-r--r-- | include/hw/arm/omap.h (renamed from hw/omap.h) | 0 | ||||
| -rw-r--r-- | include/hw/arm/primecell.h (renamed from hw/primecell.h) | 0 | ||||
| -rw-r--r-- | include/hw/arm/pxa.h (renamed from hw/pxa.h) | 0 | ||||
| -rw-r--r-- | include/hw/arm/sharpsl.h (renamed from hw/sharpsl.h) | 0 | ||||
| -rw-r--r-- | include/hw/arm/soc_dma.h (renamed from hw/soc_dma.h) | 0 | ||||
| -rw-r--r-- | include/hw/audio/audio.h (renamed from hw/audiodev.h) | 0 | ||||
| -rw-r--r-- | include/hw/audio/pcspk.h (renamed from hw/pcspk.h) | 2 | ||||
| -rw-r--r-- | include/hw/block/block.h (renamed from hw/block-common.h) | 0 | ||||
| -rw-r--r-- | include/hw/block/fdc.h (renamed from hw/fdc.h) | 0 | ||||
| -rw-r--r-- | include/hw/block/flash.h (renamed from hw/flash.h) | 0 | ||||
| -rw-r--r-- | include/hw/boards.h (renamed from hw/boards.h) | 0 | ||||
| -rw-r--r-- | include/hw/bt.h (renamed from hw/bt.h) | 0 | ||||
| -rw-r--r-- | include/hw/char/escc.h (renamed from hw/escc.h) | 0 | ||||
| -rw-r--r-- | include/hw/char/serial.h (renamed from hw/serial.h) | 0 | ||||
| -rw-r--r-- | include/hw/cris/etraxfs.h (renamed from hw/etraxfs.h) | 2 | ||||
| -rw-r--r-- | include/hw/cris/etraxfs_dma.h (renamed from hw/etraxfs_dma.h) | 0 | ||||
| -rw-r--r-- | include/hw/elf_ops.h (renamed from hw/elf_ops.h) | 0 | ||||
| -rw-r--r-- | include/hw/empty_slot.h (renamed from hw/empty_slot.h) | 0 | ||||
| -rw-r--r-- | include/hw/hw.h (renamed from hw/hw.h) | 0 | ||||
| -rw-r--r-- | include/hw/i2c/i2c.h (renamed from hw/i2c.h) | 0 | ||||
| -rw-r--r-- | include/hw/i2c/pm_smbus.h (renamed from hw/pm_smbus.h) | 0 | ||||
| -rw-r--r-- | include/hw/i2c/smbus.h (renamed from hw/smbus.h) | 2 | ||||
| -rw-r--r-- | include/hw/i386/apic-msidef.h (renamed from hw/apic-msidef.h) | 0 | ||||
| -rw-r--r-- | include/hw/i386/apic.h (renamed from hw/apic.h) | 0 | ||||
| -rw-r--r-- | include/hw/i386/apic_internal.h (renamed from hw/apic_internal.h) | 0 | ||||
| -rw-r--r-- | include/hw/i386/ich9.h (renamed from hw/ich9.h) | 13 | ||||
| -rw-r--r-- | include/hw/i386/ioapic.h (renamed from hw/ioapic.h) | 0 | ||||
| -rw-r--r-- | include/hw/i386/ioapic_internal.h (renamed from hw/ioapic_internal.h) | 0 | ||||
| -rw-r--r-- | include/hw/i386/pc.h (renamed from hw/pc.h) | 6 | ||||
| -rw-r--r-- | include/hw/i386/smbios.h (renamed from hw/smbios.h) | 0 | ||||
| -rw-r--r-- | include/hw/ide.h (renamed from hw/ide.h) | 2 | ||||
| -rw-r--r-- | include/hw/input/adb.h (renamed from hw/adb.h) | 0 | ||||
| -rw-r--r-- | include/hw/input/hid.h (renamed from hw/hid.h) | 0 | ||||
| -rw-r--r-- | include/hw/input/ps2.h (renamed from hw/ps2.h) | 0 | ||||
| -rw-r--r-- | include/hw/irq.h (renamed from hw/irq.h) | 0 | ||||
| -rw-r--r-- | include/hw/isa/apm.h (renamed from hw/apm.h) | 0 | ||||
| -rw-r--r-- | include/hw/isa/i8259_internal.h (renamed from hw/i8259_internal.h) | 4 | ||||
| -rw-r--r-- | include/hw/isa/isa.h (renamed from hw/isa.h) | 0 | ||||
| -rw-r--r-- | include/hw/isa/pc87312.h (renamed from hw/pc87312.h) | 2 | ||||
| -rw-r--r-- | include/hw/isa/vt82c686.h (renamed from hw/vt82c686.h) | 0 | ||||
| -rw-r--r-- | include/hw/kvm/clock.h (renamed from hw/kvm/clock.h) | 0 | ||||
| -rw-r--r-- | include/hw/lm32/lm32_juart.h (renamed from hw/lm32_juart.h) | 0 | ||||
| -rw-r--r-- | include/hw/lm32/lm32_pic.h (renamed from hw/lm32_pic.h) | 0 | ||||
| -rw-r--r-- | include/hw/loader.h (renamed from hw/loader.h) | 0 | ||||
| -rw-r--r-- | include/hw/m68k/mcf.h (renamed from hw/mcf.h) | 0 | ||||
| -rw-r--r-- | include/hw/mips/bios.h (renamed from hw/mips-bios.h) | 0 | ||||
| -rw-r--r-- | include/hw/mips/cpudevs.h (renamed from hw/mips_cpudevs.h) | 0 | ||||
| -rw-r--r-- | include/hw/mips/mips.h (renamed from hw/mips.h) | 0 | ||||
| -rw-r--r-- | include/hw/misc/tmp105_regs.h (renamed from hw/tmp105_regs.h) | 0 | ||||
| -rw-r--r-- | include/hw/nvram/eeprom93xx.h (renamed from hw/eeprom93xx.h) | 0 | ||||
| -rw-r--r-- | include/hw/nvram/fw_cfg.h (renamed from hw/fw_cfg.h) | 0 | ||||
| -rw-r--r-- | include/hw/pci-host/apb.h (renamed from hw/apb_pci.h) | 0 | ||||
| -rw-r--r-- | include/hw/pci-host/pam.h (renamed from hw/pam.h) | 0 | ||||
| -rw-r--r-- | include/hw/pci-host/ppce500.h (renamed from hw/ppce500_pci.h) | 0 | ||||
| -rw-r--r-- | include/hw/pci-host/q35.h (renamed from hw/q35.h) | 14 | ||||
| -rw-r--r-- | include/hw/pci-host/spapr.h (renamed from hw/spapr_pci.h) | 2 | ||||
| -rw-r--r-- | include/hw/pci/msi.h (renamed from hw/pci/msi.h) | 0 | ||||
| -rw-r--r-- | include/hw/pci/msix.h (renamed from hw/pci/msix.h) | 0 | ||||
| -rw-r--r-- | include/hw/pci/pci.h (renamed from hw/pci/pci.h) | 2 | ||||
| -rw-r--r-- | include/hw/pci/pci_bridge.h (renamed from hw/pci/pci_bridge.h) | 0 | ||||
| -rw-r--r-- | include/hw/pci/pci_bus.h (renamed from hw/pci/pci_bus.h) | 0 | ||||
| -rw-r--r-- | include/hw/pci/pci_host.h (renamed from hw/pci/pci_host.h) | 0 | ||||
| -rw-r--r-- | include/hw/pci/pci_ids.h (renamed from hw/pci/pci_ids.h) | 0 | ||||
| -rw-r--r-- | include/hw/pci/pci_regs.h (renamed from hw/pci/pci_regs.h) | 0 | ||||
| -rw-r--r-- | include/hw/pci/pcie.h (renamed from hw/pci/pcie.h) | 0 | ||||
| -rw-r--r-- | include/hw/pci/pcie_aer.h (renamed from hw/pci/pcie_aer.h) | 0 | ||||
| -rw-r--r-- | include/hw/pci/pcie_host.h (renamed from hw/pci/pcie_host.h) | 0 | ||||
| -rw-r--r-- | include/hw/pci/pcie_port.h (renamed from hw/pci/pcie_port.h) | 0 | ||||
| -rw-r--r-- | include/hw/pci/pcie_regs.h (renamed from hw/pci/pcie_regs.h) | 0 | ||||
| -rw-r--r-- | include/hw/pci/shpc.h (renamed from hw/pci/shpc.h) | 0 | ||||
| -rw-r--r-- | include/hw/pci/slotid_cap.h (renamed from hw/pci/slotid_cap.h) | 0 | ||||
| -rw-r--r-- | include/hw/pcmcia.h (renamed from hw/pcmcia.h) | 0 | ||||
| -rw-r--r-- | include/hw/ppc/mac_dbdma.h (renamed from hw/mac_dbdma.h) | 0 | ||||
| -rw-r--r-- | include/hw/ppc/openpic.h (renamed from hw/openpic.h) | 0 | ||||
| -rw-r--r-- | include/hw/ppc/ppc.h (renamed from hw/ppc.h) | 0 | ||||
| -rw-r--r-- | include/hw/ppc/ppc4xx.h (renamed from hw/ppc4xx.h) | 0 | ||||
| -rw-r--r-- | include/hw/ppc/spapr.h (renamed from hw/spapr.h) | 2 | ||||
| -rw-r--r-- | include/hw/ppc/spapr_vio.h (renamed from hw/spapr_vio.h) | 0 | ||||
| -rw-r--r-- | include/hw/ppc/xics.h (renamed from hw/xics.h) | 0 | ||||
| -rw-r--r-- | include/hw/ptimer.h (renamed from hw/ptimer.h) | 0 | ||||
| -rw-r--r-- | include/hw/qdev-addr.h (renamed from hw/qdev-addr.h) | 0 | ||||
| -rw-r--r-- | include/hw/qdev-core.h (renamed from hw/qdev-core.h) | 0 | ||||
| -rw-r--r-- | include/hw/qdev-dma.h (renamed from hw/qdev-dma.h) | 0 | ||||
| -rw-r--r-- | include/hw/qdev-properties.h (renamed from hw/qdev-properties.h) | 0 | ||||
| -rw-r--r-- | include/hw/qdev.h (renamed from hw/qdev.h) | 0 | ||||
| -rw-r--r-- | include/hw/s390x/event-facility.h (renamed from hw/s390x/event-facility.h) | 0 | ||||
| -rw-r--r-- | include/hw/s390x/sclp.h (renamed from hw/s390x/sclp.h) | 0 | ||||
| -rw-r--r-- | include/hw/scsi/esp.h (renamed from hw/esp.h) | 2 | ||||
| -rw-r--r-- | include/hw/scsi/scsi.h (renamed from hw/scsi.h) | 2 | ||||
| -rw-r--r-- | include/hw/sd.h (renamed from hw/sd.h) | 0 | ||||
| -rw-r--r-- | include/hw/sh4/sh.h (renamed from hw/sh.h) | 2 | ||||
| -rw-r--r-- | include/hw/sh4/sh_intc.h (renamed from hw/sh_intc.h) | 0 | ||||
| -rw-r--r-- | include/hw/sparc/firmware_abi.h (renamed from hw/firmware_abi.h) | 0 | ||||
| -rw-r--r-- | include/hw/sparc/grlib.h (renamed from hw/grlib.h) | 0 | ||||
| -rw-r--r-- | include/hw/sparc/sparc32_dma.h (renamed from hw/sparc32_dma.h) | 0 | ||||
| -rw-r--r-- | include/hw/sparc/sun4m.h (renamed from hw/sun4m.h) | 2 | ||||
| -rw-r--r-- | include/hw/ssi.h (renamed from hw/ssi.h) | 0 | ||||
| -rw-r--r-- | include/hw/stream.h (renamed from hw/stream.h) | 0 | ||||
| -rw-r--r-- | include/hw/sysbus.h (renamed from hw/sysbus.h) | 0 | ||||
| -rw-r--r-- | include/hw/timer/hpet.h (renamed from hw/hpet_emul.h) | 0 | ||||
| -rw-r--r-- | include/hw/timer/i8254.h (renamed from hw/i8254.h) | 2 | ||||
| -rw-r--r-- | include/hw/timer/i8254_internal.h (renamed from hw/i8254_internal.h) | 4 | ||||
| -rw-r--r-- | include/hw/timer/m48t59.h (renamed from hw/nvram.h) | 0 | ||||
| -rw-r--r-- | include/hw/timer/mc146818rtc.h (renamed from hw/mc146818rtc.h) | 4 | ||||
| -rw-r--r-- | include/hw/timer/mc146818rtc_regs.h (renamed from hw/mc146818rtc_regs.h) | 0 | ||||
| -rw-r--r-- | include/hw/unicore32/puv3.h (renamed from hw/puv3.h) | 0 | ||||
| -rw-r--r-- | include/hw/usb.h (renamed from hw/usb.h) | 0 | ||||
| -rw-r--r-- | include/hw/virtio/dataplane/hostmem.h (renamed from hw/dataplane/hostmem.h) | 0 | ||||
| -rw-r--r-- | include/hw/virtio/dataplane/vring.h (renamed from hw/dataplane/vring.h) | 2 | ||||
| -rw-r--r-- | include/hw/virtio/vhost.h (renamed from hw/vhost.h) | 2 | ||||
| -rw-r--r-- | include/hw/virtio/virtio-9p.h (renamed from hw/9pfs/virtio-9p-device.h) | 0 | ||||
| -rw-r--r-- | include/hw/virtio/virtio-balloon.h (renamed from hw/virtio-balloon.h) | 2 | ||||
| -rw-r--r-- | include/hw/virtio/virtio-blk.h (renamed from hw/virtio-blk.h) | 11 | ||||
| -rw-r--r-- | include/hw/virtio/virtio-bus.h (renamed from hw/virtio-bus.h) | 2 | ||||
| -rw-r--r-- | include/hw/virtio/virtio-net.h (renamed from hw/virtio-net.h) | 2 | ||||
| -rw-r--r-- | include/hw/virtio/virtio-rng.h (renamed from hw/virtio-rng.h) | 0 | ||||
| -rw-r--r-- | include/hw/virtio/virtio-scsi.h (renamed from hw/virtio-scsi.h) | 4 | ||||
| -rw-r--r-- | include/hw/virtio/virtio-serial.h (renamed from hw/virtio-serial.h) | 2 | ||||
| -rw-r--r-- | include/hw/virtio/virtio.h (renamed from hw/virtio.h) | 2 | ||||
| -rw-r--r-- | include/hw/xen/xen.h (renamed from hw/xen.h) | 0 | ||||
| -rw-r--r-- | include/hw/xen/xen_backend.h (renamed from hw/xen_backend.h) | 2 | ||||
| -rw-r--r-- | include/hw/xen/xen_common.h (renamed from hw/xen_common.h) | 2 | ||||
| -rw-r--r-- | include/hw/xilinx.h (renamed from hw/xilinx.h) | 0 | ||||
| -rw-r--r-- | include/net/vhost_net.h (renamed from hw/vhost_net.h) | 0 | ||||
| -rw-r--r-- | include/sysemu/watchdog.h (renamed from hw/watchdog.h) | 0 | ||||
| -rw-r--r-- | monitor.c | 8 | ||||
| -rw-r--r-- | net/tap.c | 2 | ||||
| -rw-r--r-- | pc-bios/optionrom/optionrom.h | 2 | ||||
| -rw-r--r-- | target-arm/arm-semi.c | 2 | ||||
| -rw-r--r-- | target-arm/kvm.c | 2 | ||||
| -rw-r--r-- | target-i386/cpu.c | 4 | ||||
| -rw-r--r-- | target-i386/cpu.h | 2 | ||||
| -rw-r--r-- | target-i386/kvm.c | 4 | ||||
| -rw-r--r-- | target-i386/machine.c | 4 | ||||
| -rw-r--r-- | target-lm32/op_helper.c | 4 | ||||
| -rw-r--r-- | target-lm32/translate.c | 2 | ||||
| -rw-r--r-- | target-ppc/kvm.c | 6 | ||||
| -rw-r--r-- | target-sh4/helper.c | 2 | ||||
| -rw-r--r-- | tests/rtc-test.c | 2 | ||||
| -rw-r--r-- | tests/tmp105-test.c | 2 | ||||
| -rw-r--r-- | tpm/tpm_passthrough.c | 2 | ||||
| -rw-r--r-- | tpm/tpm_tis.c | 2 | ||||
| -rw-r--r-- | tpm/tpm_tis.h | 2 | ||||
| -rw-r--r-- | vl.c | 12 | ||||
| -rw-r--r-- | xen-all.c | 6 | ||||
| -rw-r--r-- | xen-mapcache.c | 2 | ||||
| -rw-r--r-- | xen-stub.c | 2 |
511 files changed, 829 insertions, 830 deletions
diff --git a/arch_init.c b/arch_init.c index c2cbc71..769ce77 100644 --- a/arch_init.c +++ b/arch_init.c @@ -35,15 +35,15 @@ #include "qemu/bitmap.h" #include "sysemu/arch_init.h" #include "audio/audio.h" -#include "hw/pc.h" +#include "hw/i386/pc.h" #include "hw/pci/pci.h" -#include "hw/audiodev.h" +#include "hw/audio/audio.h" #include "sysemu/kvm.h" #include "migration/migration.h" #include "exec/gdbstub.h" -#include "hw/smbios.h" +#include "hw/i386/smbios.h" #include "exec/address-spaces.h" -#include "hw/pcspk.h" +#include "hw/audio/pcspk.h" #include "migration/page_cache.h" #include "qemu/config-file.h" #include "qmp-commands.h" diff --git a/block/iscsi.c b/block/iscsi.c index 51a2889..92d6eae 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -31,14 +31,14 @@ #include "qemu/error-report.h" #include "block/block_int.h" #include "trace.h" -#include "hw/scsi-defs.h" +#include "block/scsi.h" #include <iscsi/iscsi.h> #include <iscsi/scsi-lowlevel.h> #ifdef __linux__ #include <scsi/sg.h> -#include <hw/scsi-defs.h> +#include <block/scsi.h> #endif typedef struct IscsiLun { diff --git a/blockdev-nbd.c b/blockdev-nbd.c index dc4e9a2..95f10c8 100644 --- a/blockdev-nbd.c +++ b/blockdev-nbd.c @@ -10,7 +10,7 @@ */ #include "sysemu/blockdev.h" -#include "hw/block-common.h" +#include "hw/block/block.h" #include "monitor/monitor.h" #include "qapi/qmp/qerror.h" #include "sysemu/sysemu.h" @@ -31,7 +31,7 @@ */ #include "sysemu/blockdev.h" -#include "hw/block-common.h" +#include "hw/block/block.h" #include "block/blockjob.h" #include "monitor/monitor.h" #include "qapi/qmp/qerror.h" @@ -31,7 +31,7 @@ #include "hw/qdev.h" #include "qemu/osdep.h" #include "sysemu/kvm.h" -#include "hw/xen.h" +#include "hw/xen/xen.h" #include "qemu/timer.h" #include "qemu/config-file.h" #include "exec/memory.h" @@ -1607,7 +1607,7 @@ static int cpu_gdb_write_register(CPUS390XState *env, uint8_t *mem_buf, int n) } #elif defined (TARGET_LM32) -#include "hw/lm32_pic.h" +#include "hw/lm32/lm32_pic.h" #define NUM_CORE_REGS (32 + 7) static int cpu_gdb_read_register(CPULM32State *env, uint8_t *mem_buf, int n) diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c index d321c80..43f930e 100644 --- a/hw/9pfs/virtio-9p-device.c +++ b/hw/9pfs/virtio-9p-device.c @@ -11,8 +11,8 @@ * */ -#include "hw/virtio.h" -#include "hw/pc.h" +#include "hw/virtio/virtio.h" +#include "hw/i386/pc.h" #include "qemu/sockets.h" #include "virtio-9p.h" #include "fsdev/qemu-fsdev.h" diff --git a/hw/9pfs/virtio-9p-handle.c b/hw/9pfs/virtio-9p-handle.c index e30fdb6..fe8e0ed 100644 --- a/hw/9pfs/virtio-9p-handle.c +++ b/hw/9pfs/virtio-9p-handle.c @@ -11,7 +11,7 @@ * */ -#include "hw/virtio.h" +#include "hw/virtio/virtio.h" #include "virtio-9p.h" #include "virtio-9p-xattr.h" #include <arpa/inet.h> diff --git a/hw/9pfs/virtio-9p-local.c b/hw/9pfs/virtio-9p-local.c index f1b1c83..be898ec 100644 --- a/hw/9pfs/virtio-9p-local.c +++ b/hw/9pfs/virtio-9p-local.c @@ -11,7 +11,7 @@ * */ -#include "hw/virtio.h" +#include "hw/virtio/virtio.h" #include "virtio-9p.h" #include "virtio-9p-xattr.h" #include <arpa/inet.h> diff --git a/hw/9pfs/virtio-9p-posix-acl.c b/hw/9pfs/virtio-9p-posix-acl.c index 08bb0e8..339c5ec 100644 --- a/hw/9pfs/virtio-9p-posix-acl.c +++ b/hw/9pfs/virtio-9p-posix-acl.c @@ -13,7 +13,7 @@ #include <sys/types.h> #include "qemu/xattr.h" -#include "hw/virtio.h" +#include "hw/virtio/virtio.h" #include "virtio-9p.h" #include "fsdev/file-op-9p.h" #include "virtio-9p-xattr.h" diff --git a/hw/9pfs/virtio-9p-proxy.c b/hw/9pfs/virtio-9p-proxy.c index 7300279..8ba2959 100644 --- a/hw/9pfs/virtio-9p-proxy.c +++ b/hw/9pfs/virtio-9p-proxy.c @@ -11,7 +11,7 @@ */ #include <sys/socket.h> #include <sys/un.h> -#include "hw/virtio.h" +#include "hw/virtio/virtio.h" #include "virtio-9p.h" #include "qemu/error-report.h" #include "fsdev/qemu-fsdev.h" diff --git a/hw/9pfs/virtio-9p-synth.c b/hw/9pfs/virtio-9p-synth.c index e95a856..840e4eb 100644 --- a/hw/9pfs/virtio-9p-synth.c +++ b/hw/9pfs/virtio-9p-synth.c @@ -12,7 +12,7 @@ * */ -#include "hw/virtio.h" +#include "hw/virtio/virtio.h" #include "virtio-9p.h" #include "virtio-9p-xattr.h" #include "fsdev/qemu-fsdev.h" diff --git a/hw/9pfs/virtio-9p-xattr-user.c b/hw/9pfs/virtio-9p-xattr-user.c index 5bb6020..e0c92eb 100644 --- a/hw/9pfs/virtio-9p-xattr-user.c +++ b/hw/9pfs/virtio-9p-xattr-user.c @@ -12,7 +12,7 @@ */ #include <sys/types.h> -#include "hw/virtio.h" +#include "hw/virtio/virtio.h" #include "virtio-9p.h" #include "fsdev/file-op-9p.h" #include "virtio-9p-xattr.h" diff --git a/hw/9pfs/virtio-9p-xattr.c b/hw/9pfs/virtio-9p-xattr.c index a839606..90ae565 100644 --- a/hw/9pfs/virtio-9p-xattr.c +++ b/hw/9pfs/virtio-9p-xattr.c @@ -11,7 +11,7 @@ * */ -#include "hw/virtio.h" +#include "hw/virtio/virtio.h" #include "virtio-9p.h" #include "fsdev/file-op-9p.h" #include "virtio-9p-xattr.h" diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c index 5cc4c92..db2ae32 100644 --- a/hw/9pfs/virtio-9p.c +++ b/hw/9pfs/virtio-9p.c @@ -11,8 +11,8 @@ * */ -#include "hw/virtio.h" -#include "hw/pc.h" +#include "hw/virtio/virtio.h" +#include "hw/i386/pc.h" #include "qemu/sockets.h" #include "virtio-9p.h" #include "fsdev/qemu-fsdev.h" diff --git a/hw/9pfs/virtio-9p.h b/hw/9pfs/virtio-9p.h index 52b1c69..95a8ec3 100644 --- a/hw/9pfs/virtio-9p.h +++ b/hw/9pfs/virtio-9p.h @@ -6,7 +6,7 @@ #include <sys/time.h> #include <utime.h> #include <sys/resource.h> -#include "hw/virtio.h" +#include "hw/virtio/virtio.h" #include "fsdev/file-op-9p.h" #include "fsdev/virtio-9p-marshal.h" #include "qemu/thread.h" @@ -18,7 +18,7 @@ */ #include "hw/hw.h" -#include "hw/audiodev.h" +#include "hw/audio/audio.h" #include "audio/audio.h" #include "hw/pci/pci.h" #include "sysemu/dma.h" @@ -20,8 +20,8 @@ */ #include "sysemu/sysemu.h" #include "hw/hw.h" -#include "hw/pc.h" -#include "hw/acpi.h" +#include "hw/i386/pc.h" +#include "hw/acpi/acpi.h" #include "monitor/monitor.h" #include "qemu/config-file.h" #include "qapi/opts-visitor.h" diff --git a/hw/acpi_ich9.c b/hw/acpi_ich9.c index 7b34a03..e663d29 100644 --- a/hw/acpi_ich9.c +++ b/hw/acpi_ich9.c @@ -24,15 +24,15 @@ * GNU GPL, version 2 or (at your option) any later version. */ #include "hw/hw.h" -#include "hw/pc.h" +#include "hw/i386/pc.h" #include "hw/pci/pci.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" -#include "hw/acpi.h" +#include "hw/acpi/acpi.h" #include "sysemu/kvm.h" #include "exec/address-spaces.h" -#include "hw/ich9.h" +#include "hw/i386/ich9.h" //#define DEBUG diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c index 48a32b5..88386d7 100644 --- a/hw/acpi_piix4.c +++ b/hw/acpi_piix4.c @@ -19,15 +19,15 @@ * GNU GPL, version 2 or (at your option) any later version. */ #include "hw/hw.h" -#include "hw/pc.h" -#include "hw/apm.h" -#include "hw/pm_smbus.h" +#include "hw/i386/pc.h" +#include "hw/isa/apm.h" +#include "hw/i2c/pm_smbus.h" #include "hw/pci/pci.h" -#include "hw/acpi.h" +#include "hw/acpi/acpi.h" #include "sysemu/sysemu.h" #include "qemu/range.h" #include "exec/ioport.h" -#include "hw/fw_cfg.h" +#include "hw/nvram/fw_cfg.h" #include "exec/address-spaces.h" //#define DEBUG @@ -22,7 +22,7 @@ * THE SOFTWARE. */ #include "hw/hw.h" -#include "hw/adb.h" +#include "hw/input/adb.h" #include "ui/console.h" /* debug ADB */ @@ -23,9 +23,9 @@ */ #include "hw/hw.h" -#include "hw/audiodev.h" +#include "hw/audio/audio.h" #include "audio/audio.h" -#include "hw/isa.h" +#include "hw/isa/isa.h" //#define DEBUG diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c index 13aaa57..a0dd12c 100644 --- a/hw/alpha/dp264.c +++ b/hw/alpha/dp264.c @@ -12,10 +12,10 @@ #include "hw/boards.h" #include "hw/alpha_sys.h" #include "sysemu/sysemu.h" -#include "hw/mc146818rtc.h" +#include "hw/timer/mc146818rtc.h" #include "hw/ide.h" -#include "hw/i8254.h" -#include "hw/serial.h" +#include "hw/timer/i8254.h" +#include "hw/char/serial.h" #define MAX_IDE_BUS 2 diff --git a/hw/alpha_sys.h b/hw/alpha_sys.h index b4ebd2a..50e7730 100644 --- a/hw/alpha_sys.h +++ b/hw/alpha_sys.h @@ -6,7 +6,7 @@ #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" #include "hw/ide.h" -#include "hw/pc.h" +#include "hw/i386/pc.h" #include "hw/irq.h" diff --git a/hw/alpha_typhoon.c b/hw/alpha_typhoon.c index b1e0044..41a0ebc 100644 --- a/hw/alpha_typhoon.c +++ b/hw/alpha_typhoon.c @@ -9,7 +9,7 @@ #include "cpu.h" #include "exec/exec-all.h" #include "hw/hw.h" -#include "hw/devices.h" +#include "hw/arm/devices.h" #include "sysemu/sysemu.h" #include "hw/alpha_sys.h" #include "exec/address-spaces.h" diff --git a/hw/apb_pci.c b/hw/apb_pci.c index 754ca6c..fe15ae8 100644 --- a/hw/apb_pci.c +++ b/hw/apb_pci.c @@ -31,7 +31,7 @@ #include "hw/pci/pci_host.h" #include "hw/pci/pci_bridge.h" #include "hw/pci/pci_bus.h" -#include "hw/apb_pci.h" +#include "hw/pci-host/apb.h" #include "sysemu/sysemu.h" #include "exec/address-spaces.h" @@ -17,14 +17,14 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/> */ #include "qemu/thread.h" -#include "hw/apic_internal.h" -#include "hw/apic.h" -#include "hw/ioapic.h" +#include "hw/i386/apic_internal.h" +#include "hw/i386/apic.h" +#include "hw/i386/ioapic.h" #include "hw/pci/msi.h" #include "qemu/host-utils.h" #include "trace.h" -#include "hw/pc.h" -#include "hw/apic-msidef.h" +#include "hw/i386/pc.h" +#include "hw/i386/apic-msidef.h" #define MAX_APIC_WORDS 8 diff --git a/hw/apic_common.c b/hw/apic_common.c index 3798509..e0ae07a 100644 --- a/hw/apic_common.c +++ b/hw/apic_common.c @@ -17,8 +17,8 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see <http://www.gnu.org/licenses/> */ -#include "hw/apic.h" -#include "hw/apic_internal.h" +#include "hw/i386/apic.h" +#include "hw/i386/apic_internal.h" #include "trace.h" #include "sysemu/kvm.h" @@ -20,7 +20,7 @@ * GNU GPL, version 2 or (at your option) any later version. */ -#include "hw/apm.h" +#include "hw/isa/apm.h" #include "hw/hw.h" #include "hw/pci/pci.h" diff --git a/hw/applesmc.c b/hw/applesmc.c index 44b9bac..c29558b 100644 --- a/hw/applesmc.c +++ b/hw/applesmc.c @@ -31,7 +31,7 @@ */ #include "hw/hw.h" -#include "hw/isa.h" +#include "hw/isa/isa.h" #include "ui/console.h" #include "qemu/timer.h" diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c index 1d5bb59..a4bdd5f 100644 --- a/hw/arm/armv7m.c +++ b/hw/arm/armv7m.c @@ -8,7 +8,7 @@ */ #include "hw/sysbus.h" -#include "hw/arm-misc.h" +#include "hw/arm.h" #include "hw/loader.h" #include "elf.h" diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 43253fd..c79c590 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -9,7 +9,7 @@ #include "config.h" #include "hw/hw.h" -#include "hw/arm-misc.h" +#include "hw/arm.h" #include "sysemu/sysemu.h" #include "hw/boards.h" #include "hw/loader.h" diff --git a/hw/arm/collie.c b/hw/arm/collie.c index 17fddc8..76eda8e 100644 --- a/hw/arm/collie.c +++ b/hw/arm/collie.c @@ -11,10 +11,10 @@ #include "hw/hw.h" #include "hw/sysbus.h" #include "hw/boards.h" -#include "hw/devices.h" +#include "hw/arm/devices.h" #include "hw/strongarm.h" -#include "hw/arm-misc.h" -#include "hw/flash.h" +#include "hw/arm.h" +#include "hw/block/flash.h" #include "sysemu/blockdev.h" #include "exec/address-spaces.h" diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c index 4592514..78b8b74 100644 --- a/hw/arm/exynos4210.c +++ b/hw/arm/exynos4210.c @@ -24,9 +24,9 @@ #include "hw/boards.h" #include "sysemu/sysemu.h" #include "hw/sysbus.h" -#include "hw/arm-misc.h" +#include "hw/arm.h" #include "hw/loader.h" -#include "hw/exynos4210.h" +#include "hw/arm/exynos4210.h" #include "hw/usb/hcd-ehci.h" #define EXYNOS4210_CHIPID_ADDR 0x10000000 diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c index 473da34..ba14a1f 100644 --- a/hw/arm/exynos4_boards.c +++ b/hw/arm/exynos4_boards.c @@ -24,9 +24,9 @@ #include "sysemu/sysemu.h" #include "hw/sysbus.h" #include "net/net.h" -#include "hw/arm-misc.h" +#include "hw/arm.h" #include "exec/address-spaces.h" -#include "hw/exynos4210.h" +#include "hw/arm/exynos4210.h" #include "hw/boards.h" #undef DEBUG diff --git a/hw/arm/gumstix.c b/hw/arm/gumstix.c index 8859b73..4d800c9 100644 --- a/hw/arm/gumstix.c +++ b/hw/arm/gumstix.c @@ -35,10 +35,10 @@ */ #include "hw/hw.h" -#include "hw/pxa.h" +#include "hw/arm/pxa.h" #include "net/net.h" -#include "hw/flash.h" -#include "hw/devices.h" +#include "hw/block/flash.h" +#include "hw/arm/devices.h" #include "hw/boards.h" #include "sysemu/blockdev.h" #include "exec/address-spaces.h" diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c index a622224..58f73c1 100644 --- a/hw/arm/highbank.c +++ b/hw/arm/highbank.c @@ -18,8 +18,8 @@ */ #include "hw/sysbus.h" -#include "hw/arm-misc.h" -#include "hw/devices.h" +#include "hw/arm.h" +#include "hw/arm/devices.h" #include "hw/loader.h" #include "net/net.h" #include "sysemu/sysemu.h" diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index e0ba327..8d0fb75 100644 --- a/hw/arm/integratorcp.c +++ b/hw/arm/integratorcp.c @@ -8,9 +8,9 @@ */ #include "hw/sysbus.h" -#include "hw/devices.h" +#include "hw/arm/devices.h" #include "hw/boards.h" -#include "hw/arm-misc.h" +#include "hw/arm.h" #include "net/net.h" #include "exec/address-spaces.h" #include "sysemu/sysemu.h" diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c index ec50a31..46264cd 100644 --- a/hw/arm/kzm.c +++ b/hw/arm/kzm.c @@ -16,13 +16,13 @@ #include "hw/sysbus.h" #include "exec/address-spaces.h" #include "hw/hw.h" -#include "hw/arm-misc.h" -#include "hw/devices.h" +#include "hw/arm.h" +#include "hw/arm/devices.h" #include "net/net.h" #include "sysemu/sysemu.h" #include "hw/boards.h" -#include "hw/serial.h" -#include "hw/imx.h" +#include "hw/char/serial.h" +#include "hw/arm/imx.h" /* Memory map for Kzm Emulation Baseboard: * 0x00000000-0x00003fff 16k secure ROM IGNORED diff --git a/hw/arm/mainstone.c b/hw/arm/mainstone.c index aea908f..b78e6f0 100644 --- a/hw/arm/mainstone.c +++ b/hw/arm/mainstone.c @@ -12,12 +12,12 @@ * GNU GPL, version 2 or (at your option) any later version. */ #include "hw/hw.h" -#include "hw/pxa.h" -#include "hw/arm-misc.h" +#include "hw/arm/pxa.h" +#include "hw/arm.h" #include "net/net.h" -#include "hw/devices.h" +#include "hw/arm/devices.h" #include "hw/boards.h" -#include "hw/flash.h" +#include "hw/block/flash.h" #include "sysemu/blockdev.h" #include "hw/sysbus.h" #include "exec/address-spaces.h" diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index ea8473d..97b1340 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -10,18 +10,18 @@ */ #include "hw/sysbus.h" -#include "hw/arm-misc.h" -#include "hw/devices.h" +#include "hw/arm.h" +#include "hw/arm/devices.h" #include "net/net.h" #include "sysemu/sysemu.h" #include "hw/boards.h" -#include "hw/serial.h" +#include "hw/char/serial.h" #include "qemu/timer.h" #include "hw/ptimer.h" #include "block/block.h" -#include "hw/flash.h" +#include "hw/block/flash.h" #include "ui/console.h" -#include "hw/i2c.h" +#include "hw/i2c/i2c.h" #include "sysemu/blockdev.h" #include "exec/address-spaces.h" #include "ui/pixel_ops.h" diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c index b28e7d3..ba8dc3e 100644 --- a/hw/arm/nseries.c +++ b/hw/arm/nseries.c @@ -20,14 +20,14 @@ #include "qemu-common.h" #include "sysemu/sysemu.h" -#include "hw/omap.h" -#include "hw/arm-misc.h" +#include "hw/arm/omap.h" +#include "hw/arm.h" #include "hw/irq.h" #include "ui/console.h" #include "hw/boards.h" -#include "hw/i2c.h" -#include "hw/devices.h" -#include "hw/flash.h" +#include "hw/i2c/i2c.h" +#include "hw/arm/devices.h" +#include "hw/block/flash.h" #include "hw/hw.h" #include "hw/bt.h" #include "hw/loader.h" diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c index 3245c62..17caa61 100644 --- a/hw/arm/omap1.c +++ b/hw/arm/omap1.c @@ -17,10 +17,10 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "hw/hw.h" -#include "hw/arm-misc.h" -#include "hw/omap.h" +#include "hw/arm.h" +#include "hw/arm/omap.h" #include "sysemu/sysemu.h" -#include "hw/soc_dma.h" +#include "hw/arm/soc_dma.h" #include "sysemu/blockdev.h" #include "qemu/range.h" #include "hw/sysbus.h" diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c index 0a2cd7b..010c483 100644 --- a/hw/arm/omap2.c +++ b/hw/arm/omap2.c @@ -20,13 +20,13 @@ #include "sysemu/blockdev.h" #include "hw/hw.h" -#include "hw/arm-misc.h" -#include "hw/omap.h" +#include "hw/arm.h" +#include "hw/arm/omap.h" #include "sysemu/sysemu.h" #include "qemu/timer.h" #include "char/char.h" -#include "hw/flash.h" -#include "hw/soc_dma.h" +#include "hw/block/flash.h" +#include "hw/arm/soc_dma.h" #include "hw/sysbus.h" #include "audio/audio.h" diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c index 8598233..aa85602 100644 --- a/hw/arm/omap_sx1.c +++ b/hw/arm/omap_sx1.c @@ -27,10 +27,10 @@ */ #include "hw/hw.h" #include "ui/console.h" -#include "hw/omap.h" +#include "hw/arm/omap.h" #include "hw/boards.h" -#include "hw/arm-misc.h" -#include "hw/flash.h" +#include "hw/arm.h" +#include "hw/block/flash.h" #include "sysemu/blockdev.h" #include "exec/address-spaces.h" diff --git a/hw/arm/palm.c b/hw/arm/palm.c index baeb585..0bc11ae 100644 --- a/hw/arm/palm.c +++ b/hw/arm/palm.c @@ -20,10 +20,10 @@ #include "audio/audio.h" #include "sysemu/sysemu.h" #include "ui/console.h" -#include "hw/omap.h" +#include "hw/arm/omap.h" #include "hw/boards.h" -#include "hw/arm-misc.h" -#include "hw/devices.h" +#include "hw/arm.h" +#include "hw/arm/devices.h" #include "hw/loader.h" #include "exec/address-spaces.h" diff --git a/hw/arm/pic_cpu.c b/hw/arm/pic_cpu.c index 3a3f065..787767f 100644 --- a/hw/arm/pic_cpu.c +++ b/hw/arm/pic_cpu.c @@ -8,7 +8,7 @@ */ #include "hw/hw.h" -#include "hw/arm-misc.h" +#include "hw/arm.h" #include "sysemu/kvm.h" /* Input 0 is IRQ and input 1 is FIQ. */ diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c index b7ca511..bbecc77 100644 --- a/hw/arm/pxa2xx.c +++ b/hw/arm/pxa2xx.c @@ -8,10 +8,10 @@ */ #include "hw/sysbus.h" -#include "hw/pxa.h" +#include "hw/arm/pxa.h" #include "sysemu/sysemu.h" -#include "hw/serial.h" -#include "hw/i2c.h" +#include "hw/char/serial.h" +#include "hw/i2c/i2c.h" #include "hw/ssi.h" #include "char/char.h" #include "sysemu/blockdev.h" diff --git a/hw/arm/pxa2xx_gpio.c b/hw/arm/pxa2xx_gpio.c index 55ebcd7..fa31575 100644 --- a/hw/arm/pxa2xx_gpio.c +++ b/hw/arm/pxa2xx_gpio.c @@ -9,7 +9,7 @@ #include "hw/hw.h" #include "hw/sysbus.h" -#include "hw/pxa.h" +#include "hw/arm/pxa.h" #define PXA2XX_GPIO_BANKS 4 diff --git a/hw/arm/pxa2xx_pic.c b/hw/arm/pxa2xx_pic.c index 25e9089..835d07c 100644 --- a/hw/arm/pxa2xx_pic.c +++ b/hw/arm/pxa2xx_pic.c @@ -9,7 +9,7 @@ */ #include "hw/hw.h" -#include "hw/pxa.h" +#include "hw/arm/pxa.h" #include "hw/sysbus.h" #define ICIP 0x00 /* Interrupt Controller IRQ Pending register */ diff --git a/hw/arm/realview.c b/hw/arm/realview.c index 5fb490c..afd52d3 100644 --- a/hw/arm/realview.c +++ b/hw/arm/realview.c @@ -8,14 +8,14 @@ */ #include "hw/sysbus.h" -#include "hw/arm-misc.h" -#include "hw/primecell.h" -#include "hw/devices.h" +#include "hw/arm.h" +#include "hw/arm/primecell.h" +#include "hw/arm/devices.h" #include "hw/pci/pci.h" #include "net/net.h" #include "sysemu/sysemu.h" #include "hw/boards.h" -#include "hw/i2c.h" +#include "hw/i2c/i2c.h" #include "sysemu/blockdev.h" #include "exec/address-spaces.h" diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c index f5832be..fa434dc 100644 --- a/hw/arm/spitz.c +++ b/hw/arm/spitz.c @@ -11,16 +11,16 @@ */ #include "hw/hw.h" -#include "hw/pxa.h" -#include "hw/arm-misc.h" +#include "hw/arm/pxa.h" +#include "hw/arm.h" #include "sysemu/sysemu.h" #include "hw/pcmcia.h" -#include "hw/i2c.h" +#include "hw/i2c/i2c.h" #include "hw/ssi.h" -#include "hw/flash.h" +#include "hw/block/flash.h" #include "qemu/timer.h" -#include "hw/devices.h" -#include "hw/sharpsl.h" +#include "hw/arm/devices.h" +#include "hw/arm/sharpsl.h" #include "ui/console.h" #include "block/block.h" #include "audio/audio.h" diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c index f4ce794..952087c 100644 --- a/hw/arm/stellaris.c +++ b/hw/arm/stellaris.c @@ -9,10 +9,10 @@ #include "hw/sysbus.h" #include "hw/ssi.h" -#include "hw/arm-misc.h" -#include "hw/devices.h" +#include "hw/arm.h" +#include "hw/arm/devices.h" #include "qemu/timer.h" -#include "hw/i2c.h" +#include "hw/i2c/i2c.h" #include "net/net.h" #include "hw/boards.h" #include "exec/address-spaces.h" diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c index 747888c..c4362d4 100644 --- a/hw/arm/tosa.c +++ b/hw/arm/tosa.c @@ -12,14 +12,14 @@ */ #include "hw/hw.h" -#include "hw/pxa.h" -#include "hw/arm-misc.h" -#include "hw/devices.h" -#include "hw/sharpsl.h" +#include "hw/arm/pxa.h" +#include "hw/arm.h" +#include "hw/arm/devices.h" +#include "hw/arm/sharpsl.h" #include "hw/pcmcia.h" #include "block/block.h" #include "hw/boards.h" -#include "hw/i2c.h" +#include "hw/i2c/i2c.h" #include "hw/ssi.h" #include "sysemu/blockdev.h" #include "hw/sysbus.h" diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c index baaa265..d9be604 100644 --- a/hw/arm/versatilepb.c +++ b/hw/arm/versatilepb.c @@ -8,16 +8,16 @@ */ #include "hw/sysbus.h" -#include "hw/arm-misc.h" -#include "hw/devices.h" +#include "hw/arm.h" +#include "hw/arm/devices.h" #include "net/net.h" #include "sysemu/sysemu.h" #include "hw/pci/pci.h" -#include "hw/i2c.h" +#include "hw/i2c/i2c.h" #include "hw/boards.h" #include "sysemu/blockdev.h" #include "exec/address-spaces.h" -#include "hw/flash.h" +#include "hw/block/flash.h" #define VERSATILE_FLASH_ADDR 0x34000000 #define VERSATILE_FLASH_SIZE (64 * 1024 * 1024) diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index 2e1a5d0..96e0985 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -22,15 +22,15 @@ */ #include "hw/sysbus.h" -#include "hw/arm-misc.h" -#include "hw/primecell.h" -#include "hw/devices.h" +#include "hw/arm.h" +#include "hw/arm/primecell.h" +#include "hw/arm/devices.h" #include "net/net.h" #include "sysemu/sysemu.h" #include "hw/boards.h" #include "exec/address-spaces.h" #include "sysemu/blockdev.h" -#include "hw/flash.h" +#include "hw/block/flash.h" #define VEXPRESS_BOARD_ID 0x8e0 #define VEXPRESS_FLASH_SIZE (64 * 1024 * 1024) diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index 5b9257a..8d65f79 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -16,12 +16,12 @@ */ #include "hw/sysbus.h" -#include "hw/arm-misc.h" +#include "hw/arm.h" #include "net/net.h" #include "exec/address-spaces.h" #include "sysemu/sysemu.h" #include "hw/boards.h" -#include "hw/flash.h" +#include "hw/block/flash.h" #include "sysemu/blockdev.h" #include "hw/loader.h" #include "hw/ssi.h" diff --git a/hw/arm/z2.c b/hw/arm/z2.c index cbb6d80..3e27208 100644 --- a/hw/arm/z2.c +++ b/hw/arm/z2.c @@ -12,14 +12,14 @@ */ #include "hw/hw.h" -#include "hw/pxa.h" -#include "hw/arm-misc.h" -#include "hw/devices.h" -#include "hw/i2c.h" +#include "hw/arm/pxa.h" +#include "hw/arm.h" +#include "hw/arm/devices.h" +#include "hw/i2c/i2c.h" #include "hw/ssi.h" #include "hw/boards.h" #include "sysemu/sysemu.h" -#include "hw/flash.h" +#include "hw/block/flash.h" #include "sysemu/blockdev.h" #include "ui/console.h" #include "audio/audio.h" diff --git a/hw/arm_sysctl.c b/hw/arm_sysctl.c index 25fc6ea..c8b55a8 100644 --- a/hw/arm_sysctl.c +++ b/hw/arm_sysctl.c @@ -11,7 +11,7 @@ #include "qemu/timer.h" #include "qemu/bitops.h" #include "hw/sysbus.h" -#include "hw/primecell.h" +#include "hw/arm/primecell.h" #include "sysemu/sysemu.h" #define LOCK_VALUE 0xa05f diff --git a/hw/armv7m_nvic.c b/hw/armv7m_nvic.c index 2351200..7574260 100644 --- a/hw/armv7m_nvic.c +++ b/hw/armv7m_nvic.c @@ -12,7 +12,7 @@ #include "hw/sysbus.h" #include "qemu/timer.h" -#include "hw/arm-misc.h" +#include "hw/arm.h" #include "exec/address-spaces.h" #include "hw/arm_gic_internal.h" diff --git a/hw/bitbang_i2c.h b/hw/bitbang_i2c.h index e860627..2866ac3 100644 --- a/hw/bitbang_i2c.h +++ b/hw/bitbang_i2c.h @@ -1,7 +1,7 @@ #ifndef BITBANG_I2C_H #define BITBANG_I2C_H -#include "hw/i2c.h" +#include "hw/i2c/i2c.h" typedef struct bitbang_i2c_interface bitbang_i2c_interface; diff --git a/hw/blizzard.c b/hw/blizzard.c index 020d3de..bdb0b15 100644 --- a/hw/blizzard.c +++ b/hw/blizzard.c @@ -20,7 +20,7 @@ #include "qemu-common.h" #include "ui/console.h" -#include "hw/devices.h" +#include "hw/arm/devices.h" #include "hw/vga_int.h" #include "ui/pixel_ops.h" diff --git a/hw/block-common.c b/hw/block-common.c index d21ec3a..33dd3f3 100644 --- a/hw/block-common.c +++ b/hw/block-common.c @@ -8,7 +8,7 @@ */ #include "sysemu/blockdev.h" -#include "hw/block-common.h" +#include "hw/block/block.h" #include "qemu/error-report.h" void blkconf_serial(BlockConf *conf, char **serial) diff --git a/hw/bonito.c b/hw/bonito.c index e58655a..974150b 100644 --- a/hw/bonito.c +++ b/hw/bonito.c @@ -41,8 +41,8 @@ #include "hw/hw.h" #include "hw/pci/pci.h" -#include "hw/pc.h" -#include "hw/mips.h" +#include "hw/i386/pc.h" +#include "hw/mips/mips.h" #include "hw/pci/pci_host.h" #include "sysemu/sysemu.h" #include "exec/address-spaces.h" diff --git a/hw/bt-hid.c b/hw/bt-hid.c index 69ccf9b..af494e1 100644 --- a/hw/bt-hid.c +++ b/hw/bt-hid.c @@ -21,7 +21,7 @@ #include "qemu-common.h" #include "qemu/timer.h" #include "ui/console.h" -#include "hw/hid.h" +#include "hw/input/hid.h" #include "hw/bt.h" enum hid_transaction_req { @@ -22,7 +22,7 @@ #include "qemu-common.h" #include "hw/irq.h" -#include "hw/devices.h" +#include "hw/arm/devices.h" #include "sysemu/sysemu.h" //#define DEBUG @@ -26,7 +26,7 @@ here. */ #include "qemu-common.h" -#include "hw/scsi.h" +#include "hw/scsi/scsi.h" static void lba_to_msf(uint8_t *buf, int lba) { diff --git a/hw/cris/axis_dev88.c b/hw/cris/axis_dev88.c index eccd423..00daceb 100644 --- a/hw/cris/axis_dev88.c +++ b/hw/cris/axis_dev88.c @@ -24,9 +24,9 @@ #include "hw/sysbus.h" #include "net/net.h" -#include "hw/flash.h" +#include "hw/block/flash.h" #include "hw/boards.h" -#include "hw/etraxfs.h" +#include "hw/cris/etraxfs.h" #include "hw/loader.h" #include "elf.h" #include "hw/cris-boot.h" diff --git a/hw/cris/pic_cpu.c b/hw/cris/pic_cpu.c index 85c68c0..bd47bf1 100644 --- a/hw/cris/pic_cpu.c +++ b/hw/cris/pic_cpu.c @@ -24,7 +24,7 @@ #include "hw/sysbus.h" #include "hw/hw.h" -#include "hw/etraxfs.h" +#include "hw/cris/etraxfs.h" #define D(x) diff --git a/hw/cs4231a.c b/hw/cs4231a.c index f005f25..5711b62 100644 --- a/hw/cs4231a.c +++ b/hw/cs4231a.c @@ -22,9 +22,9 @@ * THE SOFTWARE. */ #include "hw/hw.h" -#include "hw/audiodev.h" +#include "hw/audio/audio.h" #include "audio/audio.h" -#include "hw/isa.h" +#include "hw/isa/isa.h" #include "hw/qdev.h" #include "qemu/timer.h" @@ -24,7 +24,7 @@ */ #include "hw/hw.h" #include "hw/ppc/mac.h" -#include "hw/adb.h" +#include "hw/input/adb.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" diff --git a/hw/dataplane/hostmem.c b/hw/dataplane/hostmem.c index 380537e..37292ff 100644 --- a/hw/dataplane/hostmem.c +++ b/hw/dataplane/hostmem.c @@ -12,7 +12,7 @@ */ #include "exec/address-spaces.h" -#include "hostmem.h" +#include "hw/virtio/dataplane/hostmem.h" static int hostmem_lookup_cmp(const void *phys_, const void *region_) { diff --git a/hw/dataplane/virtio-blk.c b/hw/dataplane/virtio-blk.c index 1242d61..5baef23 100644 --- a/hw/dataplane/virtio-blk.c +++ b/hw/dataplane/virtio-blk.c @@ -16,12 +16,12 @@ #include "qemu/iov.h" #include "qemu/thread.h" #include "qemu/error-report.h" -#include "vring.h" +#include "hw/virtio/dataplane/vring.h" #include "ioq.h" #include "migration/migration.h" #include "block/block.h" -#include "hw/virtio-blk.h" -#include "hw/dataplane/virtio-blk.h" +#include "hw/virtio/virtio-blk.h" +#include "virtio-blk.h" #include "block/aio.h" enum { diff --git a/hw/dataplane/virtio-blk.h b/hw/dataplane/virtio-blk.h index 1e8fdfe..c90e99f 100644 --- a/hw/dataplane/virtio-blk.h +++ b/hw/dataplane/virtio-blk.h @@ -15,7 +15,7 @@ #ifndef HW_DATAPLANE_VIRTIO_BLK_H #define HW_DATAPLANE_VIRTIO_BLK_H -#include "hw/virtio.h" +#include "hw/virtio/virtio.h" typedef struct VirtIOBlockDataPlane VirtIOBlockDataPlane; diff --git a/hw/dataplane/vring.c b/hw/dataplane/vring.c index e3b2253..e0d6e83 100644 --- a/hw/dataplane/vring.c +++ b/hw/dataplane/vring.c @@ -15,7 +15,7 @@ */ #include "trace.h" -#include "vring.h" +#include "hw/virtio/dataplane/vring.h" #include "qemu/error-report.h" /* Map the guest's vring to host memory */ diff --git a/hw/debugcon.c b/hw/debugcon.c index cab7691..0588eeb 100644 --- a/hw/debugcon.c +++ b/hw/debugcon.c @@ -26,8 +26,8 @@ #include "hw/hw.h" #include "char/char.h" -#include "hw/isa.h" -#include "hw/pc.h" +#include "hw/isa/isa.h" +#include "hw/i386/pc.h" #define TYPE_ISA_DEBUGCON_DEVICE "isa-debugcon" #define ISA_DEBUGCON_DEVICE(obj) \ diff --git a/hw/debugexit.c b/hw/debugexit.c index ba67a8f..59bed5b 100644 --- a/hw/debugexit.c +++ b/hw/debugexit.c @@ -8,7 +8,7 @@ */ #include "hw/hw.h" -#include "hw/isa.h" +#include "hw/isa/isa.h" #define TYPE_ISA_DEBUG_EXIT_DEVICE "isa-debug-exit" #define ISA_DEBUG_EXIT_DEVICE(obj) \ @@ -22,7 +22,7 @@ * THE SOFTWARE. */ #include "hw/hw.h" -#include "hw/isa.h" +#include "hw/isa/isa.h" #include "qemu/main-loop.h" /* #define DEBUG_DMA */ diff --git a/hw/dp8393x.c b/hw/dp8393x.c index 8b5ca6a..2289f08 100644 --- a/hw/dp8393x.c +++ b/hw/dp8393x.c @@ -20,7 +20,7 @@ #include "hw/hw.h" #include "qemu/timer.h" #include "net/net.h" -#include "hw/mips.h" +#include "hw/mips/mips.h" //#define DEBUG_SONIC diff --git a/hw/ds1338.c b/hw/ds1338.c index ae7ca9f..8987cdc 100644 --- a/hw/ds1338.c +++ b/hw/ds1338.c @@ -10,7 +10,7 @@ * GNU GPL, version 2 or (at your option) any later version. */ -#include "hw/i2c.h" +#include "hw/i2c/i2c.h" /* Size of NVRAM including both the user-accessible area and the * secondary register area. @@ -12,7 +12,7 @@ */ #include "hw/hw.h" -#include "hw/flash.h" +#include "hw/block/flash.h" /* * Pre-calculated 256-way 1 byte column parity. Table borrowed from Linux. diff --git a/hw/eepro100.c b/hw/eepro100.c index 68d729c..dc99ea6 100644 --- a/hw/eepro100.c +++ b/hw/eepro100.c @@ -44,7 +44,7 @@ #include "hw/hw.h" #include "hw/pci/pci.h" #include "net/net.h" -#include "hw/eeprom93xx.h" +#include "hw/nvram/eeprom93xx.h" #include "sysemu/sysemu.h" #include "sysemu/dma.h" diff --git a/hw/eeprom93xx.c b/hw/eeprom93xx.c index 39f5605..08f4df5 100644 --- a/hw/eeprom93xx.c +++ b/hw/eeprom93xx.c @@ -36,7 +36,7 @@ */ #include "hw/hw.h" -#include "hw/eeprom93xx.h" +#include "hw/nvram/eeprom93xx.h" /* Debug EEPROM emulation. */ //~ #define DEBUG_EEPROM diff --git a/hw/es1370.c b/hw/es1370.c index e64cf23..9fe5708 100644 --- a/hw/es1370.c +++ b/hw/es1370.c @@ -27,7 +27,7 @@ #define SILENT_ES1370 #include "hw/hw.h" -#include "hw/audiodev.h" +#include "hw/audio/audio.h" #include "audio/audio.h" #include "hw/pci/pci.h" #include "sysemu/dma.h" @@ -24,7 +24,7 @@ #include "hw/hw.h" #include "hw/sysbus.h" -#include "hw/escc.h" +#include "hw/char/escc.h" #include "char/char.h" #include "ui/console.h" #include "trace.h" diff --git a/hw/esp-pci.c b/hw/esp-pci.c index 7599b39..3ca5c8c 100644 --- a/hw/esp-pci.c +++ b/hw/esp-pci.c @@ -24,8 +24,8 @@ */ #include "hw/pci/pci.h" -#include "hw/eeprom93xx.h" -#include "hw/esp.h" +#include "hw/nvram/eeprom93xx.h" +#include "hw/scsi/esp.h" #include "trace.h" #include "qemu/log.h" @@ -24,7 +24,7 @@ */ #include "hw/sysbus.h" -#include "hw/esp.h" +#include "hw/scsi/esp.h" #include "trace.h" #include "qemu/log.h" diff --git a/hw/etraxfs_dma.c b/hw/etraxfs_dma.c index a84ec1f..6a8c222 100644 --- a/hw/etraxfs_dma.c +++ b/hw/etraxfs_dma.c @@ -28,7 +28,7 @@ #include "qemu-common.h" #include "sysemu/sysemu.h" -#include "hw/etraxfs_dma.h" +#include "hw/cris/etraxfs_dma.h" #define D(x) diff --git a/hw/etraxfs_eth.c b/hw/etraxfs_eth.c index 591bee2..1039913 100644 --- a/hw/etraxfs_eth.c +++ b/hw/etraxfs_eth.c @@ -25,7 +25,7 @@ #include <stdio.h> #include "hw/sysbus.h" #include "net/net.h" -#include "hw/etraxfs.h" +#include "hw/cris/etraxfs.h" #define D(x) diff --git a/hw/exynos4210_combiner.c b/hw/exynos4210_combiner.c index 5818f10..6874287 100644 --- a/hw/exynos4210_combiner.c +++ b/hw/exynos4210_combiner.c @@ -29,7 +29,7 @@ #include "hw/sysbus.h" -#include "hw/exynos4210.h" +#include "hw/arm/exynos4210.h" //#define DEBUG_COMBINER diff --git a/hw/exynos4210_gic.c b/hw/exynos4210_gic.c index 807849c..bad6dde 100644 --- a/hw/exynos4210_gic.c +++ b/hw/exynos4210_gic.c @@ -23,7 +23,7 @@ #include "hw/sysbus.h" #include "qemu-common.h" #include "hw/irq.h" -#include "hw/exynos4210.h" +#include "hw/arm/exynos4210.h" enum ExtGicId { EXT_GIC_ID_MDMA_LCD0 = 66, diff --git a/hw/exynos4210_i2c.c b/hw/exynos4210_i2c.c index 9e42875..196f889 100644 --- a/hw/exynos4210_i2c.c +++ b/hw/exynos4210_i2c.c @@ -22,7 +22,7 @@ #include "qemu/timer.h" #include "hw/sysbus.h" -#include "hw/i2c.h" +#include "hw/i2c/i2c.h" #ifndef EXYNOS4_I2C_DEBUG #define EXYNOS4_I2C_DEBUG 0 diff --git a/hw/exynos4210_mct.c b/hw/exynos4210_mct.c index 862c962..87ce75b 100644 --- a/hw/exynos4210_mct.c +++ b/hw/exynos4210_mct.c @@ -57,7 +57,7 @@ #include "qemu-common.h" #include "hw/ptimer.h" -#include "hw/exynos4210.h" +#include "hw/arm/exynos4210.h" //#define DEBUG_MCT diff --git a/hw/exynos4210_pwm.c b/hw/exynos4210_pwm.c index 6d74cd4..185ccb9 100644 --- a/hw/exynos4210_pwm.c +++ b/hw/exynos4210_pwm.c @@ -25,7 +25,7 @@ #include "qemu-common.h" #include "hw/ptimer.h" -#include "hw/exynos4210.h" +#include "hw/arm/exynos4210.h" //#define DEBUG_PWM diff --git a/hw/exynos4210_rtc.c b/hw/exynos4210_rtc.c index d170ca7..bceee44 100644 --- a/hw/exynos4210_rtc.c +++ b/hw/exynos4210_rtc.c @@ -34,7 +34,7 @@ #include "qemu/timer.h" #include "sysemu/sysemu.h" -#include "hw/exynos4210.h" +#include "hw/arm/exynos4210.h" #define DEBUG_RTC 0 diff --git a/hw/exynos4210_uart.c b/hw/exynos4210_uart.c index 006f3d4..8b4e72c 100644 --- a/hw/exynos4210_uart.c +++ b/hw/exynos4210_uart.c @@ -23,7 +23,7 @@ #include "sysemu/sysemu.h" #include "char/char.h" -#include "hw/exynos4210.h" +#include "hw/arm/exynos4210.h" #undef DEBUG_UART #undef DEBUG_UART_EXTEND @@ -28,10 +28,10 @@ */ #include "hw/hw.h" -#include "hw/fdc.h" +#include "hw/block/fdc.h" #include "qemu/error-report.h" #include "qemu/timer.h" -#include "hw/isa.h" +#include "hw/isa/isa.h" #include "hw/sysbus.h" #include "hw/qdev-addr.h" #include "sysemu/blockdev.h" diff --git a/hw/fw_cfg.c b/hw/fw_cfg.c index 63a1998..97bba87 100644 --- a/hw/fw_cfg.c +++ b/hw/fw_cfg.c @@ -23,8 +23,8 @@ */ #include "hw/hw.h" #include "sysemu/sysemu.h" -#include "hw/isa.h" -#include "hw/fw_cfg.h" +#include "hw/isa/isa.h" +#include "hw/nvram/fw_cfg.h" #include "hw/sysbus.h" #include "trace.h" #include "qemu/error-report.h" diff --git a/hw/grlib_irqmp.c b/hw/grlib_irqmp.c index 7ee469d..68dfe6a 100644 --- a/hw/grlib_irqmp.c +++ b/hw/grlib_irqmp.c @@ -27,7 +27,7 @@ #include "hw/sysbus.h" #include "cpu.h" -#include "hw/grlib.h" +#include "hw/sparc/grlib.h" #include "trace.h" diff --git a/hw/gt64xxx.c b/hw/gt64xxx.c index 37be9c2..189e865 100644 --- a/hw/gt64xxx.c +++ b/hw/gt64xxx.c @@ -23,10 +23,10 @@ */ #include "hw/hw.h" -#include "hw/mips.h" +#include "hw/mips/mips.h" #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" -#include "hw/pc.h" +#include "hw/i386/pc.h" #include "exec/address-spaces.h" //#define DEBUG @@ -22,9 +22,9 @@ * THE SOFTWARE. */ #include "hw/hw.h" -#include "hw/audiodev.h" +#include "hw/audio/audio.h" #include "audio/audio.h" -#include "hw/isa.h" +#include "hw/isa/isa.h" #include "hw/gusemu.h" #include "hw/gustate.h" diff --git a/hw/hd-geometry.c b/hw/hd-geometry.c index c305143..6feb4f8 100644 --- a/hw/hd-geometry.c +++ b/hw/hd-geometry.c @@ -31,7 +31,7 @@ */ #include "block/block.h" -#include "hw/block-common.h" +#include "hw/block/block.h" #include "trace.h" struct partition { @@ -25,7 +25,7 @@ #include "hw/hw.h" #include "ui/console.h" #include "qemu/timer.h" -#include "hw/hid.h" +#include "hw/input/hid.h" #define HID_USAGE_ERROR_ROLLOVER 0x01 #define HID_USAGE_POSTFAIL 0x02 @@ -25,13 +25,13 @@ */ #include "hw/hw.h" -#include "hw/pc.h" +#include "hw/i386/pc.h" #include "ui/console.h" #include "qemu/timer.h" -#include "hw/hpet_emul.h" +#include "hw/timer/hpet.h" #include "hw/sysbus.h" -#include "hw/mc146818rtc.h" -#include "hw/i8254.h" +#include "hw/timer/mc146818rtc.h" +#include "hw/timer/i8254.h" //#define HPET_DEBUG #ifdef HPET_DEBUG @@ -7,7 +7,7 @@ * This code is licensed under the LGPL. */ -#include "hw/i2c.h" +#include "hw/i2c/i2c.h" struct i2c_bus { diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c index cc95e5c..ed9b448 100644 --- a/hw/i386/kvmvapic.c +++ b/hw/i386/kvmvapic.c @@ -11,7 +11,7 @@ #include "sysemu/sysemu.h" #include "sysemu/cpus.h" #include "sysemu/kvm.h" -#include "hw/apic_internal.h" +#include "hw/i386/apic_internal.h" #define VAPIC_IO_PORT 0x7e diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c index 3cb228f..c7f01df 100644 --- a/hw/i386/multiboot.c +++ b/hw/i386/multiboot.c @@ -23,7 +23,7 @@ */ #include "hw/hw.h" -#include "hw/fw_cfg.h" +#include "hw/nvram/fw_cfg.h" #include "hw/multiboot.h" #include "hw/loader.h" #include "elf.h" diff --git a/hw/i386/pc.c b/hw/i386/pc.c index ebbf059..a38fc95 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -22,30 +22,30 @@ * THE SOFTWARE. */ #include "hw/hw.h" -#include "hw/pc.h" -#include "hw/serial.h" -#include "hw/apic.h" -#include "hw/fdc.h" +#include "hw/i386/pc.h" +#include "hw/char/serial.h" +#include "hw/i386/apic.h" +#include "hw/block/fdc.h" #include "hw/ide.h" #include "hw/pci/pci.h" #include "monitor/monitor.h" -#include "hw/fw_cfg.h" -#include "hw/hpet_emul.h" -#include "hw/smbios.h" +#include "hw/nvram/fw_cfg.h" +#include "hw/timer/hpet.h" +#include "hw/i386/smbios.h" #include "hw/loader.h" #include "elf.h" #include "hw/multiboot.h" -#include "hw/mc146818rtc.h" -#include "hw/i8254.h" -#include "hw/pcspk.h" +#include "hw/timer/mc146818rtc.h" +#include "hw/timer/i8254.h" +#include "hw/audio/pcspk.h" #include "hw/pci/msi.h" #include "hw/sysbus.h" #include "sysemu/sysemu.h" #include "sysemu/kvm.h" #include "kvm_i386.h" -#include "hw/xen.h" +#include "hw/xen/xen.h" #include "sysemu/blockdev.h" -#include "hw/block-common.h" +#include "hw/block/block.h" #include "ui/qemu-spice.h" #include "exec/memory.h" #include "exec/address-spaces.h" diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 0abc9f1..cff8013 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -25,8 +25,8 @@ #include <glib.h> #include "hw/hw.h" -#include "hw/pc.h" -#include "hw/apic.h" +#include "hw/i386/pc.h" +#include "hw/i386/apic.h" #include "hw/pci/pci.h" #include "hw/pci/pci_ids.h" #include "hw/usb.h" @@ -39,8 +39,8 @@ #include "hw/sysbus.h" #include "sysemu/arch_init.h" #include "sysemu/blockdev.h" -#include "hw/smbus.h" -#include "hw/xen.h" +#include "hw/i2c/smbus.h" +#include "hw/xen/xen.h" #include "exec/memory.h" #include "exec/address-spaces.h" #include "cpu.h" diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 4f5f347..6ac1a89 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -29,15 +29,15 @@ */ #include "hw/hw.h" #include "sysemu/arch_init.h" -#include "hw/smbus.h" +#include "hw/i2c/smbus.h" #include "hw/boards.h" -#include "hw/mc146818rtc.h" -#include "hw/xen.h" +#include "hw/timer/mc146818rtc.h" +#include "hw/xen/xen.h" #include "sysemu/kvm.h" #include "hw/kvm/clock.h" -#include "hw/q35.h" +#include "hw/pci-host/q35.h" #include "exec/address-spaces.h" -#include "hw/ich9.h" +#include "hw/i386/ich9.h" #include "hw/ide/pci.h" #include "hw/ide/ahci.h" #include "hw/usb.h" diff --git a/hw/i386/smbios.c b/hw/i386/smbios.c index 672ee9b..c00bb2f 100644 --- a/hw/i386/smbios.c +++ b/hw/i386/smbios.c @@ -14,7 +14,7 @@ */ #include "sysemu/sysemu.h" -#include "hw/smbios.h" +#include "hw/i386/smbios.h" #include "hw/loader.h" /* diff --git a/hw/i386/xen_domainbuild.c b/hw/i386/xen_domainbuild.c index d477061..ed90b4b 100644 --- a/hw/i386/xen_domainbuild.c +++ b/hw/i386/xen_domainbuild.c @@ -1,5 +1,5 @@ #include <signal.h> -#include "hw/xen_backend.h" +#include "hw/xen/xen_backend.h" #include "hw/xen_domainbuild.h" #include "qemu/timer.h" #include "qemu/log.h" diff --git a/hw/i386/xen_machine_pv.c b/hw/i386/xen_machine_pv.c index 37ba34e..fdd9374 100644 --- a/hw/i386/xen_machine_pv.c +++ b/hw/i386/xen_machine_pv.c @@ -23,9 +23,9 @@ */ #include "hw/hw.h" -#include "hw/pc.h" +#include "hw/i386/pc.h" #include "hw/boards.h" -#include "hw/xen_backend.h" +#include "hw/xen/xen_backend.h" #include "hw/xen_domainbuild.h" #include "sysemu/blockdev.h" diff --git a/hw/i82374.c b/hw/i82374.c index 22115e4..835639d 100644 --- a/hw/i82374.c +++ b/hw/i82374.c @@ -22,7 +22,7 @@ * THE SOFTWARE. */ -#include "hw/isa.h" +#include "hw/isa/isa.h" //#define DEBUG_I82374 diff --git a/hw/i82378.c b/hw/i82378.c index 6f8c48b..cced9af 100644 --- a/hw/i82378.c +++ b/hw/i82378.c @@ -18,9 +18,9 @@ */ #include "hw/pci/pci.h" -#include "hw/pc.h" -#include "hw/i8254.h" -#include "hw/pcspk.h" +#include "hw/i386/pc.h" +#include "hw/timer/i8254.h" +#include "hw/audio/pcspk.h" //#define DEBUG_I82378 @@ -22,11 +22,11 @@ * THE SOFTWARE. */ #include "hw/hw.h" -#include "hw/pc.h" -#include "hw/isa.h" +#include "hw/i386/pc.h" +#include "hw/isa/isa.h" #include "qemu/timer.h" -#include "hw/i8254.h" -#include "hw/i8254_internal.h" +#include "hw/timer/i8254.h" +#include "hw/timer/i8254_internal.h" //#define DEBUG_PIT diff --git a/hw/i8254_common.c b/hw/i8254_common.c index c6c0c80..5342df4 100644 --- a/hw/i8254_common.c +++ b/hw/i8254_common.c @@ -23,11 +23,11 @@ * THE SOFTWARE. */ #include "hw/hw.h" -#include "hw/pc.h" -#include "hw/isa.h" +#include "hw/i386/pc.h" +#include "hw/isa/isa.h" #include "qemu/timer.h" -#include "hw/i8254.h" -#include "hw/i8254_internal.h" +#include "hw/timer/i8254.h" +#include "hw/timer/i8254_internal.h" /* val must be 0 or 1 */ void pit_set_gate(ISADevice *dev, int channel, int val) @@ -22,11 +22,11 @@ * THE SOFTWARE. */ #include "hw/hw.h" -#include "hw/pc.h" -#include "hw/isa.h" +#include "hw/i386/pc.h" +#include "hw/isa/isa.h" #include "monitor/monitor.h" #include "qemu/timer.h" -#include "hw/i8259_internal.h" +#include "hw/isa/i8259_internal.h" /* debug PIC */ //#define DEBUG_PIC diff --git a/hw/i8259_common.c b/hw/i8259_common.c index 98052db..996ba9d 100644 --- a/hw/i8259_common.c +++ b/hw/i8259_common.c @@ -22,8 +22,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw/pc.h" -#include "hw/i8259_internal.h" +#include "hw/i386/pc.h" +#include "hw/isa/i8259_internal.h" void pic_reset_common(PICCommonState *s) { diff --git a/hw/i82801b11.c b/hw/i82801b11.c index 8b4a9c6..5807a92 100644 --- a/hw/i82801b11.c +++ b/hw/i82801b11.c @@ -42,7 +42,7 @@ */ #include "hw/pci/pci.h" -#include "hw/ich9.h" +#include "hw/i386/ich9.h" /*****************************************************************************/ diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index ad0094f..d0ae8af 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -23,7 +23,7 @@ #include <hw/hw.h> #include <hw/pci/msi.h> -#include <hw/pc.h> +#include <hw/i386/pc.h> #include <hw/pci/pci.h> #include <hw/sysbus.h> diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c index 861fd2b..05e60b1 100644 --- a/hw/ide/atapi.c +++ b/hw/ide/atapi.c @@ -24,7 +24,7 @@ */ #include "hw/ide/internal.h" -#include "hw/scsi.h" +#include "hw/scsi/scsi.h" static void ide_atapi_cmd_read_dma_cb(void *opaque, int ret); diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index 745ef94..541d4ef 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -23,9 +23,9 @@ * THE SOFTWARE. */ #include <hw/hw.h> -#include <hw/pc.h> +#include <hw/i386/pc.h> #include <hw/pci/pci.h> -#include <hw/isa.h> +#include <hw/isa/isa.h> #include "block/block.h" #include "sysemu/sysemu.h" #include "sysemu/dma.h" diff --git a/hw/ide/core.c b/hw/ide/core.c index 3743dc3..87d67b7 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -23,14 +23,14 @@ * THE SOFTWARE. */ #include <hw/hw.h> -#include <hw/pc.h> +#include <hw/i386/pc.h> #include <hw/pci/pci.h> -#include <hw/isa.h> +#include <hw/isa/isa.h> #include "qemu/error-report.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" #include "sysemu/dma.h" -#include "hw/block-common.h" +#include "hw/block/block.h" #include "sysemu/blockdev.h" #include <hw/ide/internal.h> diff --git a/hw/ide/ich.c b/hw/ide/ich.c index cc30adc..ed1f1a2 100644 --- a/hw/ide/ich.c +++ b/hw/ide/ich.c @@ -62,9 +62,9 @@ #include <hw/hw.h> #include <hw/pci/msi.h> -#include <hw/pc.h> +#include <hw/i386/pc.h> #include <hw/pci/pci.h> -#include <hw/isa.h> +#include <hw/isa/isa.h> #include "block/block.h" #include "sysemu/dma.h" diff --git a/hw/ide/internal.h b/hw/ide/internal.h index d80360e..2c89b50 100644 --- a/hw/ide/internal.h +++ b/hw/ide/internal.h @@ -7,12 +7,12 @@ * non-internal declarations are in hw/ide.h */ #include <hw/ide.h> -#include <hw/isa.h> +#include <hw/isa/isa.h> #include "exec/iorange.h" #include "sysemu/dma.h" #include "sysemu/sysemu.h" -#include "hw/block-common.h" -#include "hw/scsi-defs.h" +#include "hw/block/block.h" +#include "block/scsi.h" /* debug IDE devices */ //#define DEBUG_IDE diff --git a/hw/ide/isa.c b/hw/ide/isa.c index fb7bb82..e0d47bf 100644 --- a/hw/ide/isa.c +++ b/hw/ide/isa.c @@ -23,8 +23,8 @@ * THE SOFTWARE. */ #include <hw/hw.h> -#include <hw/pc.h> -#include <hw/isa.h> +#include <hw/i386/pc.h> +#include <hw/isa/isa.h> #include "block/block.h" #include "sysemu/dma.h" diff --git a/hw/ide/macio.c b/hw/ide/macio.c index 375c46f..64b2406 100644 --- a/hw/ide/macio.c +++ b/hw/ide/macio.c @@ -24,7 +24,7 @@ */ #include "hw/hw.h" #include "hw/ppc/mac.h" -#include "hw/mac_dbdma.h" +#include "hw/ppc/mac_dbdma.h" #include "block/block.h" #include "sysemu/dma.h" diff --git a/hw/ide/microdrive.c b/hw/ide/microdrive.c index 642774e..92c1df0 100644 --- a/hw/ide/microdrive.c +++ b/hw/ide/microdrive.c @@ -23,7 +23,7 @@ * THE SOFTWARE. */ #include <hw/hw.h> -#include <hw/pc.h> +#include <hw/i386/pc.h> #include <hw/pcmcia.h> #include "block/block.h" #include "sysemu/dma.h" diff --git a/hw/ide/pci.c b/hw/ide/pci.c index 59fd539..a310975 100644 --- a/hw/ide/pci.c +++ b/hw/ide/pci.c @@ -23,9 +23,9 @@ * THE SOFTWARE. */ #include <hw/hw.h> -#include <hw/pc.h> +#include <hw/i386/pc.h> #include <hw/pci/pci.h> -#include <hw/isa.h> +#include <hw/isa/isa.h> #include "block/block.h" #include "sysemu/dma.h" diff --git a/hw/ide/piix.c b/hw/ide/piix.c index 4d3e822..1de284d 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -24,9 +24,9 @@ */ #include <hw/hw.h> -#include <hw/pc.h> +#include <hw/i386/pc.h> #include <hw/pci/pci.h> -#include <hw/isa.h> +#include <hw/isa/isa.h> #include "sysemu/blockdev.h" #include "sysemu/sysemu.h" #include "sysemu/dma.h" diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c index fd06da7..8a9a891 100644 --- a/hw/ide/qdev.c +++ b/hw/ide/qdev.c @@ -21,7 +21,7 @@ #include "qemu/error-report.h" #include <hw/ide/internal.h> #include "sysemu/blockdev.h" -#include "hw/block-common.h" +#include "hw/block/block.h" #include "sysemu/sysemu.h" /* --------------------------------- */ diff --git a/hw/ide/via.c b/hw/ide/via.c index f40c1ad..9d6a644 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -24,9 +24,9 @@ * THE SOFTWARE. */ #include <hw/hw.h> -#include <hw/pc.h> +#include <hw/i386/pc.h> #include <hw/pci/pci.h> -#include <hw/isa.h> +#include <hw/isa/isa.h> #include "block/block.h" #include "sysemu/sysemu.h" #include "sysemu/dma.h" diff --git a/hw/imx_ccm.c b/hw/imx_ccm.c index ad7aad3..c153a24 100644 --- a/hw/imx_ccm.c +++ b/hw/imx_ccm.c @@ -13,7 +13,7 @@ #include "hw/hw.h" #include "hw/sysbus.h" #include "sysemu/sysemu.h" -#include "hw/imx.h" +#include "hw/arm/imx.h" #define CKIH_FREQ 26000000 /* 26MHz crystal input */ #define CKIL_FREQ 32768 /* nominal 32khz clock */ diff --git a/hw/imx_serial.c b/hw/imx_serial.c index 746723c..d7ec209 100644 --- a/hw/imx_serial.c +++ b/hw/imx_serial.c @@ -21,7 +21,7 @@ #include "hw/sysbus.h" #include "sysemu/sysemu.h" #include "char/char.h" -#include "hw/imx.h" +#include "hw/arm/imx.h" //#define DEBUG_SERIAL 1 #ifdef DEBUG_SERIAL diff --git a/hw/imx_timer.c b/hw/imx_timer.c index a8c3111..03197e3 100644 --- a/hw/imx_timer.c +++ b/hw/imx_timer.c @@ -15,7 +15,7 @@ #include "qemu/timer.h" #include "hw/ptimer.h" #include "hw/sysbus.h" -#include "hw/imx.h" +#include "hw/arm/imx.h" //#define DEBUG_TIMER 1 #ifdef DEBUG_TIMER diff --git a/hw/intel-hda.c b/hw/intel-hda.c index 728b60f..68201cd 100644 --- a/hw/intel-hda.c +++ b/hw/intel-hda.c @@ -21,7 +21,7 @@ #include "hw/pci/pci.h" #include "hw/pci/msi.h" #include "qemu/timer.h" -#include "hw/audiodev.h" +#include "hw/audio/audio.h" #include "hw/intel-hda.h" #include "hw/intel-hda-defs.h" #include "sysemu/dma.h" diff --git a/hw/ioapic.c b/hw/ioapic.c index 78629fa..7089fa8 100644 --- a/hw/ioapic.c +++ b/hw/ioapic.c @@ -21,10 +21,10 @@ */ #include "hw/hw.h" -#include "hw/pc.h" -#include "hw/apic.h" -#include "hw/ioapic.h" -#include "hw/ioapic_internal.h" +#include "hw/i386/pc.h" +#include "hw/i386/apic.h" +#include "hw/i386/ioapic.h" +#include "hw/i386/ioapic_internal.h" //#define DEBUG_IOAPIC diff --git a/hw/ioapic_common.c b/hw/ioapic_common.c index d4aff29..42c7adc 100644 --- a/hw/ioapic_common.c +++ b/hw/ioapic_common.c @@ -19,8 +19,8 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -#include "hw/ioapic.h" -#include "hw/ioapic_internal.h" +#include "hw/i386/ioapic.h" +#include "hw/i386/ioapic_internal.h" #include "hw/sysbus.h" void ioapic_reset_common(DeviceState *dev) diff --git a/hw/isa-bus.c b/hw/isa-bus.c index 67ff8fd..7860b17 100644 --- a/hw/isa-bus.c +++ b/hw/isa-bus.c @@ -20,7 +20,7 @@ #include "monitor/monitor.h" #include "hw/sysbus.h" #include "sysemu/sysemu.h" -#include "hw/isa.h" +#include "hw/isa/isa.h" #include "exec/address-spaces.h" static ISABus *isabus; diff --git a/hw/isa_mmio.c b/hw/isa_mmio.c index a7860e7..d4dbf13 100644 --- a/hw/isa_mmio.c +++ b/hw/isa_mmio.c @@ -23,7 +23,7 @@ */ #include "hw/hw.h" -#include "hw/isa.h" +#include "hw/isa/isa.h" #include "exec/address-spaces.h" static void isa_mmio_writeb (void *opaque, hwaddr addr, diff --git a/hw/ivshmem.c b/hw/ivshmem.c index af2789e..f92ce19 100644 --- a/hw/ivshmem.c +++ b/hw/ivshmem.c @@ -17,7 +17,7 @@ * GNU GPL, version 2 or (at your option) any later version. */ #include "hw/hw.h" -#include "hw/pc.h" +#include "hw/i386/pc.h" #include "hw/pci/pci.h" #include "hw/pci/msix.h" #include "sysemu/kvm.h" diff --git a/hw/kvm/apic.c b/hw/kvm/apic.c index d994ea7..c6ff982 100644 --- a/hw/kvm/apic.c +++ b/hw/kvm/apic.c @@ -9,7 +9,7 @@ * This work is licensed under the terms of the GNU GPL version 2. * See the COPYING file in the top-level directory. */ -#include "hw/apic_internal.h" +#include "hw/i386/apic_internal.h" #include "hw/pci/msi.h" #include "sysemu/kvm.h" diff --git a/hw/kvm/i8254.c b/hw/kvm/i8254.c index 04ad649..da90711 100644 --- a/hw/kvm/i8254.c +++ b/hw/kvm/i8254.c @@ -24,8 +24,8 @@ */ #include "qemu/timer.h" #include "sysemu/sysemu.h" -#include "hw/i8254.h" -#include "hw/i8254_internal.h" +#include "hw/timer/i8254.h" +#include "hw/timer/i8254_internal.h" #include "sysemu/kvm.h" #define KVM_PIT_REINJECT_BIT 0 diff --git a/hw/kvm/i8259.c b/hw/kvm/i8259.c index 5ae8b68..ea77be8 100644 --- a/hw/kvm/i8259.c +++ b/hw/kvm/i8259.c @@ -9,8 +9,8 @@ * This work is licensed under the terms of the GNU GPL version 2. * See the COPYING file in the top-level directory. */ -#include "hw/i8259_internal.h" -#include "hw/apic_internal.h" +#include "hw/isa/i8259_internal.h" +#include "hw/i386/apic_internal.h" #include "sysemu/kvm.h" static void kvm_pic_get(PICCommonState *s) diff --git a/hw/kvm/ioapic.c b/hw/kvm/ioapic.c index 23877d4..a3bd519 100644 --- a/hw/kvm/ioapic.c +++ b/hw/kvm/ioapic.c @@ -10,9 +10,9 @@ * See the COPYING file in the top-level directory. */ -#include "hw/pc.h" -#include "hw/ioapic_internal.h" -#include "hw/apic_internal.h" +#include "hw/i386/pc.h" +#include "hw/i386/ioapic_internal.h" +#include "hw/i386/apic_internal.h" #include "sysemu/kvm.h" /* PC Utility function */ diff --git a/hw/kvm/pci-assign.c b/hw/kvm/pci-assign.c index da64b5b..c1e08ec 100644 --- a/hw/kvm/pci-assign.c +++ b/hw/kvm/pci-assign.c @@ -27,7 +27,7 @@ #include <sys/types.h> #include <sys/stat.h> #include "hw/hw.h" -#include "hw/pc.h" +#include "hw/i386/pc.h" #include "qemu/error-report.h" #include "ui/console.h" #include "hw/loader.h" diff --git a/hw/lan9118.c b/hw/lan9118.c index 403fb86..04cf267 100644 --- a/hw/lan9118.c +++ b/hw/lan9118.c @@ -12,7 +12,7 @@ #include "hw/sysbus.h" #include "net/net.h" -#include "hw/devices.h" +#include "hw/arm/devices.h" #include "sysemu/sysemu.h" #include "hw/ptimer.h" /* For crc32 */ @@ -39,7 +39,7 @@ #include "net/net.h" #include "qemu/timer.h" #include "qemu/sockets.h" -#include "hw/sun4m.h" +#include "hw/sparc/sun4m.h" #include "hw/pcnet.h" #include "trace.h" diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c index db92948..b22c94f 100644 --- a/hw/lm32/lm32_boards.c +++ b/hw/lm32/lm32_boards.c @@ -19,8 +19,8 @@ #include "hw/sysbus.h" #include "hw/hw.h" -#include "hw/flash.h" -#include "hw/devices.h" +#include "hw/block/flash.h" +#include "hw/arm/devices.h" #include "hw/boards.h" #include "hw/loader.h" #include "sysemu/blockdev.h" diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c index b347cf9..c3724dee 100644 --- a/hw/lm32/milkymist.c +++ b/hw/lm32/milkymist.c @@ -19,9 +19,9 @@ #include "hw/sysbus.h" #include "hw/hw.h" -#include "hw/flash.h" +#include "hw/block/flash.h" #include "sysemu/sysemu.h" -#include "hw/devices.h" +#include "hw/arm/devices.h" #include "hw/boards.h" #include "hw/loader.h" #include "elf.h" diff --git a/hw/lm32_juart.c b/hw/lm32_juart.c index 472e9c2..93f0d15 100644 --- a/hw/lm32_juart.c +++ b/hw/lm32_juart.c @@ -22,7 +22,7 @@ #include "trace.h" #include "char/char.h" -#include "hw/lm32_juart.h" +#include "hw/lm32/lm32_juart.h" enum { LM32_JUART_MIN_SAVE_VERSION = 0, diff --git a/hw/lm32_pic.c b/hw/lm32_pic.c index d17c310..b4e80c8 100644 --- a/hw/lm32_pic.c +++ b/hw/lm32_pic.c @@ -20,11 +20,11 @@ #include <assert.h> #include "hw/hw.h" -#include "hw/pc.h" +#include "hw/i386/pc.h" #include "monitor/monitor.h" #include "hw/sysbus.h" #include "trace.h" -#include "hw/lm32_pic.h" +#include "hw/lm32/lm32_pic.h" struct LM32PicState { SysBusDevice busdev; diff --git a/hw/lm832x.c b/hw/lm832x.c index a064dfd..bacbeb2 100644 --- a/hw/lm832x.c +++ b/hw/lm832x.c @@ -19,7 +19,7 @@ */ #include "hw/hw.h" -#include "hw/i2c.h" +#include "hw/i2c/i2c.h" #include "qemu/timer.h" #include "ui/console.h" diff --git a/hw/loader.c b/hw/loader.c index 6ce66fb..2f5072d 100644 --- a/hw/loader.c +++ b/hw/loader.c @@ -48,7 +48,7 @@ #include "sysemu/sysemu.h" #include "hw/uboot_image.h" #include "hw/loader.h" -#include "hw/fw_cfg.h" +#include "hw/nvram/fw_cfg.h" #include "exec/memory.h" #include "exec/address-spaces.h" diff --git a/hw/lpc_ich9.c b/hw/lpc_ich9.c index ff0a309..d116075 100644 --- a/hw/lpc_ich9.c +++ b/hw/lpc_ich9.c @@ -30,18 +30,17 @@ #include "qemu-common.h" #include "hw/hw.h" #include "qemu/range.h" -#include "hw/isa.h" +#include "hw/isa/isa.h" #include "hw/sysbus.h" -#include "hw/pc.h" -#include "hw/apm.h" -#include "hw/ioapic.h" +#include "hw/i386/pc.h" +#include "hw/isa/apm.h" +#include "hw/i386/ioapic.h" #include "hw/pci/pci.h" #include "hw/pci/pcie_host.h" #include "hw/pci/pci_bridge.h" -#include "hw/ich9.h" -#include "hw/acpi.h" -#include "hw/acpi_ich9.h" -#include "hw/pam.h" +#include "hw/i386/ich9.h" +#include "hw/acpi/acpi.h" +#include "hw/acpi/ich9.h" #include "hw/pci/pci_bus.h" #include "exec/address-spaces.h" #include "sysemu/sysemu.h" diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c index 5a8bf4d..c601b29 100644 --- a/hw/lsi53c895a.c +++ b/hw/lsi53c895a.c @@ -14,7 +14,7 @@ #include "hw/hw.h" #include "hw/pci/pci.h" -#include "hw/scsi.h" +#include "hw/scsi/scsi.h" #include "sysemu/dma.h" //#define DEBUG_LSI diff --git a/hw/m25p80.c b/hw/m25p80.c index 55e9d0d..cd560e3 100644 --- a/hw/m25p80.c +++ b/hw/m25p80.c @@ -24,7 +24,7 @@ #include "hw/hw.h" #include "sysemu/blockdev.h" #include "hw/ssi.h" -#include "hw/devices.h" +#include "hw/arm/devices.h" #ifdef M25P80_ERR_DEBUG #define DB_PRINT(...) do { \ diff --git a/hw/m48t59.c b/hw/m48t59.c index 39a9d80..5019e06 100644 --- a/hw/m48t59.c +++ b/hw/m48t59.c @@ -22,11 +22,11 @@ * THE SOFTWARE. */ #include "hw/hw.h" -#include "hw/nvram.h" +#include "hw/timer/m48t59.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" #include "hw/sysbus.h" -#include "hw/isa.h" +#include "hw/isa/isa.h" #include "exec/address-spaces.h" //#define DEBUG_NVRAM diff --git a/hw/m68k/an5206.c b/hw/m68k/an5206.c index 7c21c66..c4a5626 100644 --- a/hw/m68k/an5206.c +++ b/hw/m68k/an5206.c @@ -7,7 +7,7 @@ */ #include "hw/hw.h" -#include "hw/mcf.h" +#include "hw/m68k/mcf.h" #include "hw/boards.h" #include "hw/loader.h" #include "elf.h" diff --git a/hw/m68k/mcf5206.c b/hw/m68k/mcf5206.c index 58cd8d4..bcc619d 100644 --- a/hw/m68k/mcf5206.c +++ b/hw/m68k/mcf5206.c @@ -6,7 +6,7 @@ * This code is licensed under the GPL */ #include "hw/hw.h" -#include "hw/mcf.h" +#include "hw/m68k/mcf.h" #include "qemu/timer.h" #include "hw/ptimer.h" #include "sysemu/sysemu.h" diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c index 748bf56..05efde7 100644 --- a/hw/m68k/mcf5208.c +++ b/hw/m68k/mcf5208.c @@ -6,7 +6,7 @@ * This code is licensed under the GPL */ #include "hw/hw.h" -#include "hw/mcf.h" +#include "hw/m68k/mcf.h" #include "qemu/timer.h" #include "hw/ptimer.h" #include "sysemu/sysemu.h" diff --git a/hw/m68k/mcf_intc.c b/hw/m68k/mcf_intc.c index fff27b3..cfe660d 100644 --- a/hw/m68k/mcf_intc.c +++ b/hw/m68k/mcf_intc.c @@ -6,7 +6,7 @@ * This code is licensed under the GPL */ #include "hw/hw.h" -#include "hw/mcf.h" +#include "hw/m68k/mcf.h" #include "exec/address-spaces.h" typedef struct { diff --git a/hw/mac_dbdma.c b/hw/mac_dbdma.c index 61d2f35..a2363bb 100644 --- a/hw/mac_dbdma.c +++ b/hw/mac_dbdma.c @@ -37,8 +37,8 @@ * THE SOFTWARE. */ #include "hw/hw.h" -#include "hw/isa.h" -#include "hw/mac_dbdma.h" +#include "hw/isa/isa.h" +#include "hw/ppc/mac_dbdma.h" #include "qemu/main-loop.h" /* debug DBDMA */ diff --git a/hw/mac_nvram.c b/hw/mac_nvram.c index ed32bde..5223330 100644 --- a/hw/mac_nvram.c +++ b/hw/mac_nvram.c @@ -23,7 +23,7 @@ * THE SOFTWARE. */ #include "hw/hw.h" -#include "hw/firmware_abi.h" +#include "hw/sparc/firmware_abi.h" #include "sysemu/sysemu.h" #include "hw/ppc/mac.h" @@ -25,8 +25,8 @@ #include "hw/hw.h" #include "hw/ppc/mac.h" #include "hw/pci/pci.h" -#include "hw/mac_dbdma.h" -#include "hw/escc.h" +#include "hw/ppc/mac_dbdma.h" +#include "hw/char/escc.h" #define TYPE_MACIO "macio" #define MACIO(obj) OBJECT_CHECK(MacIOState, (obj), TYPE_MACIO) diff --git a/hw/marvell_88w8618_audio.c b/hw/marvell_88w8618_audio.c index e042046..f9b68fd 100644 --- a/hw/marvell_88w8618_audio.c +++ b/hw/marvell_88w8618_audio.c @@ -11,7 +11,7 @@ */ #include "hw/sysbus.h" #include "hw/hw.h" -#include "hw/i2c.h" +#include "hw/i2c/i2c.h" #include "hw/sysbus.h" #include "audio/audio.h" diff --git a/hw/max7310.c b/hw/max7310.c index e5cb810..59b2877 100644 --- a/hw/max7310.c +++ b/hw/max7310.c @@ -7,7 +7,7 @@ * This file is licensed under GNU GPL. */ -#include "hw/i2c.h" +#include "hw/i2c/i2c.h" typedef struct { I2CSlave i2c; diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c index a2119ad..69e6844 100644 --- a/hw/mc146818rtc.c +++ b/hw/mc146818rtc.c @@ -24,11 +24,11 @@ #include "hw/hw.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" -#include "hw/mc146818rtc.h" +#include "hw/timer/mc146818rtc.h" #include "qapi/visitor.h" #ifdef TARGET_I386 -#include "hw/apic.h" +#include "hw/i386/apic.h" #endif //#define DEBUG_CMOS diff --git a/hw/mcf_fec.c b/hw/mcf_fec.c index 0227bd8..9b68052 100644 --- a/hw/mcf_fec.c +++ b/hw/mcf_fec.c @@ -7,7 +7,7 @@ */ #include "hw/hw.h" #include "net/net.h" -#include "hw/mcf.h" +#include "hw/m68k/mcf.h" /* For crc32 */ #include <zlib.h> #include "exec/address-spaces.h" diff --git a/hw/mcf_uart.c b/hw/mcf_uart.c index e5de801..6724b1b 100644 --- a/hw/mcf_uart.c +++ b/hw/mcf_uart.c @@ -6,7 +6,7 @@ * This code is licensed under the GPL */ #include "hw/hw.h" -#include "hw/mcf.h" +#include "hw/m68k/mcf.h" #include "char/char.h" #include "exec/address-spaces.h" diff --git a/hw/megasas.c b/hw/megasas.c index 9b815d4..f46f800 100644 --- a/hw/megasas.c +++ b/hw/megasas.c @@ -23,8 +23,8 @@ #include "sysemu/dma.h" #include "hw/pci/msix.h" #include "qemu/iov.h" -#include "hw/scsi.h" -#include "hw/scsi-defs.h" +#include "hw/scsi/scsi.h" +#include "block/scsi.h" #include "trace.h" #include "hw/mfi.h" diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c index 07dc808..79a8a0e 100644 --- a/hw/microblaze/petalogix_ml605_mmu.c +++ b/hw/microblaze/petalogix_ml605_mmu.c @@ -28,13 +28,13 @@ #include "hw/sysbus.h" #include "hw/hw.h" #include "net/net.h" -#include "hw/flash.h" +#include "hw/block/flash.h" #include "sysemu/sysemu.h" -#include "hw/devices.h" +#include "hw/arm/devices.h" #include "hw/boards.h" #include "hw/xilinx.h" #include "sysemu/blockdev.h" -#include "hw/serial.h" +#include "hw/char/serial.h" #include "exec/address-spaces.h" #include "hw/ssi.h" diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c index 2498362..b386403 100644 --- a/hw/microblaze/petalogix_s3adsp1800_mmu.c +++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c @@ -26,9 +26,9 @@ #include "hw/sysbus.h" #include "hw/hw.h" #include "net/net.h" -#include "hw/flash.h" +#include "hw/block/flash.h" #include "sysemu/sysemu.h" -#include "hw/devices.h" +#include "hw/arm/devices.h" #include "hw/boards.h" #include "hw/xilinx.h" #include "sysemu/blockdev.h" diff --git a/hw/milkymist-softusb.c b/hw/milkymist-softusb.c index 90a0ae5..3edab4f 100644 --- a/hw/milkymist-softusb.c +++ b/hw/milkymist-softusb.c @@ -25,7 +25,7 @@ #include "hw/sysbus.h" #include "trace.h" #include "ui/console.h" -#include "hw/hid.h" +#include "hw/input/hid.h" #include "qemu/error-report.h" enum { diff --git a/hw/mips/addr.c b/hw/mips/addr.c index cddc25c..99488f1 100644 --- a/hw/mips/addr.c +++ b/hw/mips/addr.c @@ -21,7 +21,7 @@ */ #include "hw/hw.h" -#include "hw/mips_cpudevs.h" +#include "hw/mips/cpudevs.h" uint64_t cpu_mips_kseg0_to_phys(void *opaque, uint64_t addr) { diff --git a/hw/mips/cputimer.c b/hw/mips/cputimer.c index 9ad13f3..e0266bf 100644 --- a/hw/mips/cputimer.c +++ b/hw/mips/cputimer.c @@ -21,7 +21,7 @@ */ #include "hw/hw.h" -#include "hw/mips_cpudevs.h" +#include "hw/mips/cpudevs.h" #include "qemu/timer.h" #define TIMER_FREQ 100 * 1000 * 1000 diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c index 766aa9d..3cf27fa 100644 --- a/hw/mips/mips_fulong2e.c +++ b/hw/mips/mips_fulong2e.c @@ -19,28 +19,28 @@ */ #include "hw/hw.h" -#include "hw/pc.h" -#include "hw/serial.h" -#include "hw/fdc.h" +#include "hw/i386/pc.h" +#include "hw/char/serial.h" +#include "hw/block/fdc.h" #include "net/net.h" #include "hw/boards.h" -#include "hw/smbus.h" +#include "hw/i2c/smbus.h" #include "block/block.h" -#include "hw/flash.h" -#include "hw/mips.h" -#include "hw/mips_cpudevs.h" +#include "hw/block/flash.h" +#include "hw/mips/mips.h" +#include "hw/mips/cpudevs.h" #include "hw/pci/pci.h" #include "char/char.h" #include "sysemu/sysemu.h" #include "audio/audio.h" #include "qemu/log.h" #include "hw/loader.h" -#include "hw/mips-bios.h" +#include "hw/mips/bios.h" #include "hw/ide.h" #include "elf.h" -#include "hw/vt82c686.h" -#include "hw/mc146818rtc.h" -#include "hw/i8254.h" +#include "hw/isa/vt82c686.h" +#include "hw/timer/mc146818rtc.h" +#include "hw/timer/i8254.h" #include "sysemu/blockdev.h" #include "exec/address-spaces.h" diff --git a/hw/mips/mips_int.c b/hw/mips/mips_int.c index 0e5e866..7dbd24d 100644 --- a/hw/mips/mips_int.c +++ b/hw/mips/mips_int.c @@ -21,7 +21,7 @@ */ #include "hw/hw.h" -#include "hw/mips_cpudevs.h" +#include "hw/mips/cpudevs.h" #include "cpu.h" static void cpu_mips_irq_request(void *opaque, int irq, int level) diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c index daeb985..fd3a5f9 100644 --- a/hw/mips/mips_jazz.c +++ b/hw/mips/mips_jazz.c @@ -23,22 +23,22 @@ */ #include "hw/hw.h" -#include "hw/mips.h" -#include "hw/mips_cpudevs.h" -#include "hw/pc.h" -#include "hw/serial.h" -#include "hw/isa.h" -#include "hw/fdc.h" +#include "hw/mips/mips.h" +#include "hw/mips/cpudevs.h" +#include "hw/i386/pc.h" +#include "hw/char/serial.h" +#include "hw/isa/isa.h" +#include "hw/block/fdc.h" #include "sysemu/sysemu.h" #include "sysemu/arch_init.h" #include "hw/boards.h" #include "net/net.h" -#include "hw/esp.h" -#include "hw/mips-bios.h" +#include "hw/scsi/esp.h" +#include "hw/mips/bios.h" #include "hw/loader.h" -#include "hw/mc146818rtc.h" -#include "hw/i8254.h" -#include "hw/pcspk.h" +#include "hw/timer/mc146818rtc.h" +#include "hw/timer/i8254.h" +#include "hw/audio/pcspk.h" #include "sysemu/blockdev.h" #include "hw/sysbus.h" #include "exec/address-spaces.h" diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 9a67dce..a3e936b 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -23,28 +23,28 @@ */ #include "hw/hw.h" -#include "hw/pc.h" -#include "hw/serial.h" -#include "hw/fdc.h" +#include "hw/i386/pc.h" +#include "hw/char/serial.h" +#include "hw/block/fdc.h" #include "net/net.h" #include "hw/boards.h" -#include "hw/smbus.h" +#include "hw/i2c/smbus.h" #include "block/block.h" -#include "hw/flash.h" -#include "hw/mips.h" -#include "hw/mips_cpudevs.h" +#include "hw/block/flash.h" +#include "hw/mips/mips.h" +#include "hw/mips/cpudevs.h" #include "hw/pci/pci.h" #include "char/char.h" #include "sysemu/sysemu.h" #include "sysemu/arch_init.h" #include "hw/boards.h" #include "qemu/log.h" -#include "hw/mips-bios.h" +#include "hw/mips/bios.h" #include "hw/ide.h" #include "hw/loader.h" #include "elf.h" -#include "hw/mc146818rtc.h" -#include "hw/i8254.h" +#include "hw/timer/mc146818rtc.h" +#include "hw/timer/i8254.h" #include "sysemu/blockdev.h" #include "exec/address-spaces.h" #include "hw/sysbus.h" /* SysBusDevice */ diff --git a/hw/mips/mips_mipssim.c b/hw/mips/mips_mipssim.c index 4935c78..d1681ec 100644 --- a/hw/mips/mips_mipssim.c +++ b/hw/mips/mips_mipssim.c @@ -25,14 +25,14 @@ * THE SOFTWARE. */ #include "hw/hw.h" -#include "hw/mips.h" -#include "hw/mips_cpudevs.h" -#include "hw/serial.h" -#include "hw/isa.h" +#include "hw/mips/mips.h" +#include "hw/mips/cpudevs.h" +#include "hw/char/serial.h" +#include "hw/isa/isa.h" #include "net/net.h" #include "sysemu/sysemu.h" #include "hw/boards.h" -#include "hw/mips-bios.h" +#include "hw/mips/bios.h" #include "hw/loader.h" #include "elf.h" #include "hw/sysbus.h" diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c index 539a562..4646ab6 100644 --- a/hw/mips/mips_r4k.c +++ b/hw/mips/mips_r4k.c @@ -8,22 +8,22 @@ * the standard PC ISA addresses. */ #include "hw/hw.h" -#include "hw/mips.h" -#include "hw/mips_cpudevs.h" -#include "hw/pc.h" -#include "hw/serial.h" -#include "hw/isa.h" +#include "hw/mips/mips.h" +#include "hw/mips/cpudevs.h" +#include "hw/i386/pc.h" +#include "hw/char/serial.h" +#include "hw/isa/isa.h" #include "net/net.h" #include "sysemu/sysemu.h" #include "hw/boards.h" -#include "hw/flash.h" +#include "hw/block/flash.h" #include "qemu/log.h" -#include "hw/mips-bios.h" +#include "hw/mips/bios.h" #include "hw/ide.h" #include "hw/loader.h" #include "elf.h" -#include "hw/mc146818rtc.h" -#include "hw/i8254.h" +#include "hw/timer/mc146818rtc.h" +#include "hw/timer/i8254.h" #include "sysemu/blockdev.h" #include "exec/address-spaces.h" diff --git a/hw/moxie/moxiesim.c b/hw/moxie/moxiesim.c index e1e88a9..70bf28f 100644 --- a/hw/moxie/moxiesim.c +++ b/hw/moxie/moxiesim.c @@ -26,13 +26,13 @@ */ #include "hw/sysbus.h" #include "hw/hw.h" -#include "hw/pc.h" -#include "hw/isa.h" +#include "hw/i386/pc.h" +#include "hw/isa/isa.h" #include "net/net.h" #include "sysemu/sysemu.h" #include "hw/boards.h" #include "hw/loader.h" -#include "hw/serial.h" +#include "hw/char/serial.h" #include "exec/address-spaces.h" #define PHYS_MEM_BASE 0x80000000 @@ -19,7 +19,7 @@ #ifndef NAND_IO # include "hw/hw.h" -# include "hw/flash.h" +# include "hw/block/flash.h" # include "sysemu/blockdev.h" # include "hw/sysbus.h" #include "qemu/error-report.h" diff --git a/hw/ne2000-isa.c b/hw/ne2000-isa.c index 47c00c3..e4c10db 100644 --- a/hw/ne2000-isa.c +++ b/hw/ne2000-isa.c @@ -22,8 +22,8 @@ * THE SOFTWARE. */ #include "hw/hw.h" -#include "hw/pc.h" -#include "hw/isa.h" +#include "hw/i386/pc.h" +#include "hw/isa/isa.h" #include "hw/qdev.h" #include "net/net.h" #include "hw/ne2000.h" diff --git a/hw/omap_clk.c b/hw/omap_clk.c index c7b5c11..80a3c50 100644 --- a/hw/omap_clk.c +++ b/hw/omap_clk.c @@ -19,7 +19,7 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "hw/hw.h" -#include "hw/omap.h" +#include "hw/arm/omap.h" struct clk { const char *name; diff --git a/hw/omap_dma.c b/hw/omap_dma.c index 0c5902f..184fcee 100644 --- a/hw/omap_dma.c +++ b/hw/omap_dma.c @@ -19,9 +19,9 @@ */ #include "qemu-common.h" #include "qemu/timer.h" -#include "hw/omap.h" +#include "hw/arm/omap.h" #include "hw/irq.h" -#include "hw/soc_dma.h" +#include "hw/arm/soc_dma.h" struct omap_dma_channel_s { /* transfer data */ diff --git a/hw/omap_dss.c b/hw/omap_dss.c index 948ad8f..ea3afce 100644 --- a/hw/omap_dss.c +++ b/hw/omap_dss.c @@ -19,7 +19,7 @@ */ #include "hw/hw.h" #include "ui/console.h" -#include "hw/omap.h" +#include "hw/arm/omap.h" struct omap_dss_s { qemu_irq irq; diff --git a/hw/omap_gpio.c b/hw/omap_gpio.c index c79f61c..f5eeaea 100644 --- a/hw/omap_gpio.c +++ b/hw/omap_gpio.c @@ -19,7 +19,7 @@ */ #include "hw/hw.h" -#include "hw/omap.h" +#include "hw/arm/omap.h" #include "hw/sysbus.h" struct omap_gpio_s { diff --git a/hw/omap_gpmc.c b/hw/omap_gpmc.c index ebb259c..91adb66 100644 --- a/hw/omap_gpmc.c +++ b/hw/omap_gpmc.c @@ -19,8 +19,8 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "hw/hw.h" -#include "hw/flash.h" -#include "hw/omap.h" +#include "hw/block/flash.h" +#include "hw/arm/omap.h" #include "exec/memory.h" #include "exec/address-spaces.h" diff --git a/hw/omap_gptimer.c b/hw/omap_gptimer.c index 8485ee8..9b0e9dd 100644 --- a/hw/omap_gptimer.c +++ b/hw/omap_gptimer.c @@ -19,7 +19,7 @@ */ #include "hw/hw.h" #include "qemu/timer.h" -#include "hw/omap.h" +#include "hw/arm/omap.h" /* GP timers */ struct omap_gp_timer_s { diff --git a/hw/omap_i2c.c b/hw/omap_i2c.c index 92f7b37..efb2254 100644 --- a/hw/omap_i2c.c +++ b/hw/omap_i2c.c @@ -17,8 +17,8 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "hw/hw.h" -#include "hw/i2c.h" -#include "hw/omap.h" +#include "hw/i2c/i2c.h" +#include "hw/arm/omap.h" #include "hw/sysbus.h" diff --git a/hw/omap_intc.c b/hw/omap_intc.c index 7da9c35..875eba4 100644 --- a/hw/omap_intc.c +++ b/hw/omap_intc.c @@ -18,7 +18,7 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "hw/hw.h" -#include "hw/omap.h" +#include "hw/arm/omap.h" #include "hw/sysbus.h" /* Interrupt Handlers */ diff --git a/hw/omap_l4.c b/hw/omap_l4.c index cbe8a06..ac8251f 100644 --- a/hw/omap_l4.c +++ b/hw/omap_l4.c @@ -18,7 +18,7 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "hw/hw.h" -#include "hw/omap.h" +#include "hw/arm/omap.h" struct omap_l4_s { MemoryRegion *address_space; diff --git a/hw/omap_lcdc.c b/hw/omap_lcdc.c index 4f5b094..4048cc1 100644 --- a/hw/omap_lcdc.c +++ b/hw/omap_lcdc.c @@ -18,7 +18,7 @@ */ #include "hw/hw.h" #include "ui/console.h" -#include "hw/omap.h" +#include "hw/arm/omap.h" #include "hw/framebuffer.h" #include "ui/pixel_ops.h" diff --git a/hw/omap_mmc.c b/hw/omap_mmc.c index 6e48110..d4079cd 100644 --- a/hw/omap_mmc.c +++ b/hw/omap_mmc.c @@ -17,7 +17,7 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "hw/hw.h" -#include "hw/omap.h" +#include "hw/arm/omap.h" #include "hw/sd.h" struct omap_mmc_s { diff --git a/hw/omap_sdrc.c b/hw/omap_sdrc.c index 510e6cc..e38b571 100644 --- a/hw/omap_sdrc.c +++ b/hw/omap_sdrc.c @@ -18,7 +18,7 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "hw/hw.h" -#include "hw/omap.h" +#include "hw/arm/omap.h" /* SDRAM Controller Subsystem */ struct omap_sdrc_s { diff --git a/hw/omap_spi.c b/hw/omap_spi.c index 1cbd98d..11403c4 100644 --- a/hw/omap_spi.c +++ b/hw/omap_spi.c @@ -20,7 +20,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "hw/hw.h" -#include "hw/omap.h" +#include "hw/arm/omap.h" /* Multichannel SPI */ struct omap_mcspi_s { diff --git a/hw/omap_synctimer.c b/hw/omap_synctimer.c index 13e7280..a24f35c 100644 --- a/hw/omap_synctimer.c +++ b/hw/omap_synctimer.c @@ -19,7 +19,7 @@ */ #include "hw/hw.h" #include "qemu/timer.h" -#include "hw/omap.h" +#include "hw/arm/omap.h" struct omap_synctimer_s { MemoryRegion iomem; uint32_t val; diff --git a/hw/omap_tap.c b/hw/omap_tap.c index 181ecee..99b70d5 100644 --- a/hw/omap_tap.c +++ b/hw/omap_tap.c @@ -19,7 +19,7 @@ */ #include "hw/hw.h" -#include "hw/omap.h" +#include "hw/arm/omap.h" /* TEST-Chip-level TAP */ static uint64_t omap_tap_read(void *opaque, hwaddr addr, diff --git a/hw/omap_uart.c b/hw/omap_uart.c index af51ce7..26c1426 100644 --- a/hw/omap_uart.c +++ b/hw/omap_uart.c @@ -19,8 +19,8 @@ */ #include "char/char.h" #include "hw/hw.h" -#include "hw/omap.h" -#include "hw/serial.h" +#include "hw/arm/omap.h" +#include "hw/char/serial.h" #include "exec/address-spaces.h" /* UARTs */ diff --git a/hw/onenand.c b/hw/onenand.c index 57a346d..8b511a7 100644 --- a/hw/onenand.c +++ b/hw/onenand.c @@ -20,7 +20,7 @@ #include "qemu-common.h" #include "hw/hw.h" -#include "hw/flash.h" +#include "hw/block/flash.h" #include "hw/irq.h" #include "sysemu/blockdev.h" #include "exec/memory.h" diff --git a/hw/openpic.c b/hw/openpic.c index 03a7075..c788714 100644 --- a/hw/openpic.c +++ b/hw/openpic.c @@ -36,11 +36,11 @@ #include "hw/hw.h" #include "hw/ppc/mac.h" #include "hw/pci/pci.h" -#include "hw/openpic.h" +#include "hw/ppc/openpic.h" #include "hw/sysbus.h" #include "hw/pci/msi.h" #include "qemu/bitops.h" -#include "hw/ppc.h" +#include "hw/ppc/ppc.h" //#define DEBUG_OPENPIC diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c index db2aac8..49bab1f 100644 --- a/hw/openrisc/openrisc_sim.c +++ b/hw/openrisc/openrisc_sim.c @@ -21,7 +21,7 @@ #include "hw/hw.h" #include "hw/boards.h" #include "elf.h" -#include "hw/serial.h" +#include "hw/char/serial.h" #include "net/net.h" #include "hw/loader.h" #include "exec/address-spaces.h" @@ -27,7 +27,7 @@ * THE SOFTWARE. */ #include "sysemu/sysemu.h" -#include "hw/pam.h" +#include "hw/pci-host/pam.h" void smram_update(MemoryRegion *smram_region, uint8_t smram, uint8_t smm_enabled) diff --git a/hw/parallel.c b/hw/parallel.c index 0b9af43..863a6fb 100644 --- a/hw/parallel.c +++ b/hw/parallel.c @@ -24,8 +24,8 @@ */ #include "hw/hw.h" #include "char/char.h" -#include "hw/isa.h" -#include "hw/pc.h" +#include "hw/isa/isa.h" +#include "hw/i386/pc.h" #include "sysemu/sysemu.h" //#define DEBUG_PARALLEL diff --git a/hw/pc-testdev.c b/hw/pc-testdev.c index 8236bce..32df175 100644 --- a/hw/pc-testdev.c +++ b/hw/pc-testdev.c @@ -41,7 +41,7 @@ #endif #include "hw/hw.h" #include "hw/qdev.h" -#include "hw/isa.h" +#include "hw/isa/isa.h" #define IOMEM_LEN 0x10000 diff --git a/hw/pc87312.c b/hw/pc87312.c index c4e4c62..9f5e185 100644 --- a/hw/pc87312.c +++ b/hw/pc87312.c @@ -23,7 +23,7 @@ * THE SOFTWARE. */ -#include "hw/pc87312.h" +#include "hw/isa/pc87312.h" #include "qemu/error-report.h" #include "sysemu/blockdev.h" #include "sysemu/sysemu.h" diff --git a/hw/pc_sysfw.c b/hw/pc_sysfw.c index 3e01528..0d95c8a 100644 --- a/hw/pc_sysfw.c +++ b/hw/pc_sysfw.c @@ -27,11 +27,11 @@ #include "qemu/error-report.h" #include "hw/sysbus.h" #include "hw/hw.h" -#include "hw/pc.h" +#include "hw/i386/pc.h" #include "hw/boards.h" #include "hw/loader.h" #include "sysemu/sysemu.h" -#include "hw/flash.h" +#include "hw/block/flash.h" #include "sysemu/kvm.h" #define BIOS_FILENAME "bios.bin" diff --git a/hw/pci/pci-hotplug.c b/hw/pci/pci-hotplug.c index 180ee07..12287d1 100644 --- a/hw/pci/pci-hotplug.c +++ b/hw/pci/pci-hotplug.c @@ -26,10 +26,10 @@ #include "hw/boards.h" #include "hw/pci/pci.h" #include "net/net.h" -#include "hw/pc.h" +#include "hw/i386/pc.h" #include "monitor/monitor.h" -#include "hw/scsi.h" -#include "hw/virtio-blk.h" +#include "hw/scsi/scsi.h" +#include "hw/virtio/virtio-blk.h" #include "qemu/config-file.h" #include "sysemu/blockdev.h" #include "qapi/error.h" @@ -22,9 +22,9 @@ * THE SOFTWARE. */ #include "hw/hw.h" -#include "hw/isa.h" -#include "hw/pc.h" -#include "hw/ps2.h" +#include "hw/isa/isa.h" +#include "hw/i386/pc.h" +#include "hw/input/ps2.h" #include "sysemu/sysemu.h" /* debug PC keyboard */ @@ -23,12 +23,12 @@ */ #include "hw/hw.h" -#include "hw/pc.h" -#include "hw/isa.h" +#include "hw/i386/pc.h" +#include "hw/isa/isa.h" #include "audio/audio.h" #include "qemu/timer.h" -#include "hw/i8254.h" -#include "hw/pcspk.h" +#include "hw/timer/i8254.h" +#include "hw/audio/pcspk.h" #define PCSPK_BUF_LEN 1792 #define PCSPK_SAMPLE_RATE 32000 diff --git a/hw/pflash_cfi01.c b/hw/pflash_cfi01.c index 646dc79..3ff20e0 100644 --- a/hw/pflash_cfi01.c +++ b/hw/pflash_cfi01.c @@ -37,7 +37,7 @@ */ #include "hw/hw.h" -#include "hw/flash.h" +#include "hw/block/flash.h" #include "block/block.h" #include "qemu/timer.h" #include "exec/address-spaces.h" diff --git a/hw/pflash_cfi02.c b/hw/pflash_cfi02.c index 37b4fcc..9a7fa70 100644 --- a/hw/pflash_cfi02.c +++ b/hw/pflash_cfi02.c @@ -36,7 +36,7 @@ */ #include "hw/hw.h" -#include "hw/flash.h" +#include "hw/block/flash.h" #include "qemu/timer.h" #include "block/block.h" #include "exec/address-spaces.h" @@ -23,9 +23,9 @@ */ #include "hw/hw.h" -#include "hw/pc.h" +#include "hw/i386/pc.h" #include "hw/pci/pci.h" -#include "hw/isa.h" +#include "hw/isa/isa.h" #include "hw/sysbus.h" PCIDevice *piix4_dev; diff --git a/hw/piix_pci.c b/hw/piix_pci.c index 83fcfa4..f9e68c3 100644 --- a/hw/piix_pci.c +++ b/hw/piix_pci.c @@ -23,14 +23,14 @@ */ #include "hw/hw.h" -#include "hw/pc.h" +#include "hw/i386/pc.h" #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" -#include "hw/isa.h" +#include "hw/isa/isa.h" #include "hw/sysbus.h" #include "qemu/range.h" -#include "hw/xen.h" -#include "hw/pam.h" +#include "hw/xen/xen.h" +#include "hw/pci-host/pam.h" #include "sysemu/sysemu.h" /* @@ -8,7 +8,7 @@ */ #include "hw/sysbus.h" -#include "hw/ps2.h" +#include "hw/input/ps2.h" typedef struct { SysBusDevice busdev; @@ -14,7 +14,7 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "sysbus.h" +#include "hw/sysbus.h" #include "qemu/timer.h" #include "sysemu/dma.h" diff --git a/hw/pm_smbus.c b/hw/pm_smbus.c index 7900610..0b5bb89 100644 --- a/hw/pm_smbus.c +++ b/hw/pm_smbus.c @@ -18,9 +18,9 @@ * <http://www.gnu.org/licenses/>. */ #include "hw/hw.h" -#include "hw/pc.h" -#include "hw/pm_smbus.h" -#include "hw/smbus.h" +#include "hw/i386/pc.h" +#include "hw/i2c/pm_smbus.h" +#include "hw/i2c/smbus.h" /* no save/load? */ diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index fef9c5d..c1bdb6b 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -21,21 +21,21 @@ #include "net/net.h" #include "qemu/config-file.h" #include "hw/hw.h" -#include "hw/serial.h" +#include "hw/char/serial.h" #include "hw/pci/pci.h" #include "hw/boards.h" #include "sysemu/sysemu.h" #include "sysemu/kvm.h" #include "kvm_ppc.h" #include "sysemu/device_tree.h" -#include "hw/openpic.h" -#include "hw/ppc.h" +#include "hw/ppc/openpic.h" +#include "hw/ppc/ppc.h" #include "hw/loader.h" #include "elf.h" #include "hw/sysbus.h" #include "exec/address-spaces.h" #include "qemu/host-utils.h" -#include "hw/ppce500_pci.h" +#include "hw/pci-host/ppce500.h" #define BINARY_DEVICE_TREE_FILE "mpc8544ds.dtb" #define UIMAGE_LOAD_BASE 0 diff --git a/hw/ppc/e500plat.c b/hw/ppc/e500plat.c index 4b30575..7292ce1 100644 --- a/hw/ppc/e500plat.c +++ b/hw/ppc/e500plat.c @@ -15,7 +15,7 @@ #include "hw/boards.h" #include "sysemu/device_tree.h" #include "hw/pci/pci.h" -#include "hw/openpic.h" +#include "hw/ppc/openpic.h" static void e500plat_fixup_devtree(PPCE500Params *params, void *fdt) { diff --git a/hw/ppc/mac.h b/hw/ppc/mac.h index b17107b..54efaed 100644 --- a/hw/ppc/mac.h +++ b/hw/ppc/mac.h @@ -28,7 +28,7 @@ #include "exec/memory.h" #include "hw/sysbus.h" #include "hw/ide/internal.h" -#include "hw/adb.h" +#include "hw/input/adb.h" /* SMP is not enabled, for now */ #define MAX_CPUS 1 diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index a08a6b2..4a9b883 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -47,18 +47,18 @@ * */ #include "hw/hw.h" -#include "hw/ppc.h" +#include "hw/ppc/ppc.h" #include "hw/ppc/mac.h" -#include "hw/adb.h" -#include "hw/mac_dbdma.h" -#include "hw/nvram.h" +#include "hw/input/adb.h" +#include "hw/ppc/mac_dbdma.h" +#include "hw/timer/m48t59.h" #include "hw/pci/pci.h" #include "net/net.h" #include "sysemu/sysemu.h" #include "hw/boards.h" -#include "hw/fw_cfg.h" -#include "hw/escc.h" -#include "hw/openpic.h" +#include "hw/nvram/fw_cfg.h" +#include "hw/char/escc.h" +#include "hw/ppc/openpic.h" #include "hw/ide.h" #include "hw/loader.h" #include "elf.h" diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c index 2778e45..3acca94 100644 --- a/hw/ppc/mac_oldworld.c +++ b/hw/ppc/mac_oldworld.c @@ -24,17 +24,17 @@ * THE SOFTWARE. */ #include "hw/hw.h" -#include "hw/ppc.h" +#include "hw/ppc/ppc.h" #include "mac.h" -#include "hw/adb.h" -#include "hw/nvram.h" +#include "hw/input/adb.h" +#include "hw/timer/m48t59.h" #include "sysemu/sysemu.h" #include "net/net.h" -#include "hw/isa.h" +#include "hw/isa/isa.h" #include "hw/pci/pci.h" #include "hw/boards.h" -#include "hw/fw_cfg.h" -#include "hw/escc.h" +#include "hw/nvram/fw_cfg.h" +#include "hw/char/escc.h" #include "hw/ide.h" #include "hw/loader.h" #include "elf.h" diff --git a/hw/ppc/mpc8544ds.c b/hw/ppc/mpc8544ds.c index cf29788..444da02 100644 --- a/hw/ppc/mpc8544ds.c +++ b/hw/ppc/mpc8544ds.c @@ -14,7 +14,7 @@ #include "e500.h" #include "hw/boards.h" #include "sysemu/device_tree.h" -#include "hw/openpic.h" +#include "hw/ppc/openpic.h" static void mpc8544ds_fixup_devtree(PPCE500Params *params, void *fdt) { diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c index 85bc821..fb57b42 100644 --- a/hw/ppc/ppc.c +++ b/hw/ppc/ppc.c @@ -22,10 +22,10 @@ * THE SOFTWARE. */ #include "hw/hw.h" -#include "hw/ppc.h" +#include "hw/ppc/ppc.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" -#include "hw/nvram.h" +#include "hw/timer/m48t59.h" #include "qemu/log.h" #include "hw/loader.h" #include "sysemu/kvm.h" diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c index ba443cf..18a29db 100644 --- a/hw/ppc/ppc405_boards.c +++ b/hw/ppc/ppc405_boards.c @@ -22,10 +22,10 @@ * THE SOFTWARE. */ #include "hw/hw.h" -#include "hw/ppc.h" +#include "hw/ppc/ppc.h" #include "hw/ppc405.h" -#include "hw/nvram.h" -#include "hw/flash.h" +#include "hw/timer/m48t59.h" +#include "hw/block/flash.h" #include "sysemu/sysemu.h" #include "block/block.h" #include "hw/boards.h" diff --git a/hw/ppc/ppc405_uc.c b/hw/ppc/ppc405_uc.c index 56bae8f..82b8956 100644 --- a/hw/ppc/ppc405_uc.c +++ b/hw/ppc/ppc405_uc.c @@ -22,9 +22,9 @@ * THE SOFTWARE. */ #include "hw/hw.h" -#include "hw/ppc.h" +#include "hw/ppc/ppc.h" #include "hw/ppc405.h" -#include "hw/serial.h" +#include "hw/char/serial.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" #include "qemu/log.h" diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c index 66911b5..48a0218 100644 --- a/hw/ppc/ppc440_bamboo.c +++ b/hw/ppc/ppc440_bamboo.c @@ -23,8 +23,8 @@ #include "hw/loader.h" #include "elf.h" #include "exec/address-spaces.h" -#include "hw/serial.h" -#include "hw/ppc.h" +#include "hw/char/serial.h" +#include "hw/ppc/ppc.h" #include "hw/ppc405.h" #include "sysemu/sysemu.h" #include "hw/sysbus.h" diff --git a/hw/ppc/ppc4xx_devs.c b/hw/ppc/ppc4xx_devs.c index 49ec728..d8e3dae 100644 --- a/hw/ppc/ppc4xx_devs.c +++ b/hw/ppc/ppc4xx_devs.c @@ -22,8 +22,8 @@ * THE SOFTWARE. */ #include "hw/hw.h" -#include "hw/ppc.h" -#include "hw/ppc4xx.h" +#include "hw/ppc/ppc.h" +#include "hw/ppc/ppc4xx.h" #include "qemu/log.h" #include "exec/address-spaces.h" diff --git a/hw/ppc/ppc_booke.c b/hw/ppc/ppc_booke.c index 30375c0..585f53b 100644 --- a/hw/ppc/ppc_booke.c +++ b/hw/ppc/ppc_booke.c @@ -22,10 +22,10 @@ * THE SOFTWARE. */ #include "hw/hw.h" -#include "hw/ppc.h" +#include "hw/ppc/ppc.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" -#include "hw/nvram.h" +#include "hw/timer/m48t59.h" #include "qemu/log.h" #include "hw/loader.h" diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index 2920911..cceab3e 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -22,22 +22,22 @@ * THE SOFTWARE. */ #include "hw/hw.h" -#include "hw/nvram.h" -#include "hw/pc.h" -#include "hw/serial.h" -#include "hw/fdc.h" +#include "hw/timer/m48t59.h" +#include "hw/i386/pc.h" +#include "hw/char/serial.h" +#include "hw/block/fdc.h" #include "net/net.h" #include "sysemu/sysemu.h" -#include "hw/isa.h" +#include "hw/isa/isa.h" #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" -#include "hw/ppc.h" +#include "hw/ppc/ppc.h" #include "hw/boards.h" #include "qemu/log.h" #include "hw/ide.h" #include "hw/loader.h" -#include "hw/mc146818rtc.h" -#include "hw/pc87312.h" +#include "hw/timer/mc146818rtc.h" +#include "hw/isa/pc87312.h" #include "sysemu/blockdev.h" #include "sysemu/arch_init.h" #include "exec/address-spaces.h" diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 7b2a11f..7a42501 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -34,13 +34,13 @@ #include "kvm_ppc.h" #include "hw/boards.h" -#include "hw/ppc.h" +#include "hw/ppc/ppc.h" #include "hw/loader.h" -#include "hw/spapr.h" -#include "hw/spapr_vio.h" -#include "hw/spapr_pci.h" -#include "hw/xics.h" +#include "hw/ppc/spapr.h" +#include "hw/ppc/spapr_vio.h" +#include "hw/pci-host/spapr.h" +#include "hw/ppc/xics.h" #include "hw/pci/msi.h" #include "sysemu/kvm.h" diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c index ce78f09..ff87ac3 100644 --- a/hw/ppc/spapr_events.c +++ b/hw/ppc/spapr_events.c @@ -30,8 +30,8 @@ #include "hw/qdev.h" #include "sysemu/device_tree.h" -#include "hw/spapr.h" -#include "hw/spapr_vio.h" +#include "hw/ppc/spapr.h" +#include "hw/ppc/spapr_vio.h" #include <libfdt.h> diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index 22cfb7e..f518aee 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -2,7 +2,7 @@ #include "cpu.h" #include "sysemu/sysemu.h" #include "helper_regs.h" -#include "hw/spapr.h" +#include "hw/ppc/spapr.h" #include "mmu-hash64.h" static target_ulong compute_tlbie_rb(target_ulong v, target_ulong r, diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c index 8d500bf..d2782cf 100644 --- a/hw/ppc/spapr_iommu.c +++ b/hw/ppc/spapr_iommu.c @@ -23,7 +23,7 @@ #include "sysemu/dma.h" #include "exec/address-spaces.h" -#include "hw/spapr.h" +#include "hw/ppc/spapr.h" #include <libfdt.h> diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c index a24e853..b71b59c 100644 --- a/hw/ppc/spapr_rtas.c +++ b/hw/ppc/spapr_rtas.c @@ -30,8 +30,8 @@ #include "hw/qdev.h" #include "sysemu/device_tree.h" -#include "hw/spapr.h" -#include "hw/spapr_vio.h" +#include "hw/ppc/spapr.h" +#include "hw/ppc/spapr_vio.h" #include <libfdt.h> diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c index 6eb3ab5..4dbc315 100644 --- a/hw/ppc/spapr_vio.c +++ b/hw/ppc/spapr_vio.c @@ -30,9 +30,9 @@ #include "sysemu/device_tree.h" #include "kvm_ppc.h" -#include "hw/spapr.h" -#include "hw/spapr_vio.h" -#include "hw/xics.h" +#include "hw/ppc/spapr.h" +#include "hw/ppc/spapr_vio.h" +#include "hw/ppc/xics.h" #ifdef CONFIG_FDT #include <libfdt.h> diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c index 41eab16..db52649 100644 --- a/hw/ppc/virtex_ml507.c +++ b/hw/ppc/virtex_ml507.c @@ -24,10 +24,10 @@ #include "hw/sysbus.h" #include "hw/hw.h" -#include "hw/serial.h" -#include "hw/flash.h" +#include "hw/char/serial.h" +#include "hw/block/flash.h" #include "sysemu/sysemu.h" -#include "hw/devices.h" +#include "hw/arm/devices.h" #include "hw/boards.h" #include "sysemu/device_tree.h" #include "hw/loader.h" @@ -35,8 +35,8 @@ #include "qemu/log.h" #include "exec/address-spaces.h" -#include "hw/ppc.h" -#include "hw/ppc4xx.h" +#include "hw/ppc/ppc.h" +#include "hw/ppc/ppc4xx.h" #include "hw/ppc405.h" #include "sysemu/blockdev.h" diff --git a/hw/ppc/xics.c b/hw/ppc/xics.c index 374da5b..8e1e85e 100644 --- a/hw/ppc/xics.c +++ b/hw/ppc/xics.c @@ -27,8 +27,8 @@ #include "hw/hw.h" #include "trace.h" -#include "hw/spapr.h" -#include "hw/xics.h" +#include "hw/ppc/spapr.h" +#include "hw/ppc/xics.h" /* * ICP: Presentation layer diff --git a/hw/ppc405.h b/hw/ppc405.h index 45c2159..1c5f04f 100644 --- a/hw/ppc405.h +++ b/hw/ppc405.h @@ -25,7 +25,7 @@ #if !defined(PPC_405_H) #define PPC_405_H -#include "hw/ppc4xx.h" +#include "hw/ppc/ppc4xx.h" /* Bootinfo as set-up by u-boot */ typedef struct ppc4xx_bd_info_t ppc4xx_bd_info_t; diff --git a/hw/ppc4xx_pci.c b/hw/ppc4xx_pci.c index 854e170..599539b 100644 --- a/hw/ppc4xx_pci.c +++ b/hw/ppc4xx_pci.c @@ -20,8 +20,8 @@ * 4xx SoCs, such as the 440EP. */ #include "hw/hw.h" -#include "hw/ppc.h" -#include "hw/ppc4xx.h" +#include "hw/ppc/ppc.h" +#include "hw/ppc/ppc4xx.h" #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" #include "exec/address-spaces.h" diff --git a/hw/ppce500_pci.c b/hw/ppce500_pci.c index abc7ebe..5e7ad94 100644 --- a/hw/ppce500_pci.c +++ b/hw/ppce500_pci.c @@ -19,7 +19,7 @@ #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" #include "qemu/bswap.h" -#include "hw/ppce500_pci.h" +#include "hw/pci-host/ppce500.h" #ifdef DEBUG_PCI #define pci_debug(fmt, ...) fprintf(stderr, fmt, ## __VA_ARGS__) diff --git a/hw/prep_pci.c b/hw/prep_pci.c index 58df245..6130253 100644 --- a/hw/prep_pci.c +++ b/hw/prep_pci.c @@ -27,7 +27,7 @@ #include "hw/pci/pci.h" #include "hw/pci/pci_bus.h" #include "hw/pci/pci_host.h" -#include "hw/pc.h" +#include "hw/i386/pc.h" #include "exec/address-spaces.h" #define TYPE_RAVEN_PCI_DEVICE "raven" @@ -22,7 +22,7 @@ * THE SOFTWARE. */ #include "hw/hw.h" -#include "hw/ps2.h" +#include "hw/input/ps2.h" #include "ui/console.h" #include "sysemu/sysemu.h" diff --git a/hw/puv3_dma.c b/hw/puv3_dma.c index c05a14e..32844b5 100644 --- a/hw/puv3_dma.c +++ b/hw/puv3_dma.c @@ -12,7 +12,7 @@ #include "hw/sysbus.h" #undef DEBUG_PUV3 -#include "hw/puv3.h" +#include "hw/unicore32/puv3.h" #define PUV3_DMA_CH_NR (6) #define PUV3_DMA_CH_MASK (0xff) diff --git a/hw/puv3_gpio.c b/hw/puv3_gpio.c index b2a790b..5bab97e 100644 --- a/hw/puv3_gpio.c +++ b/hw/puv3_gpio.c @@ -12,7 +12,7 @@ #include "hw/sysbus.h" #undef DEBUG_PUV3 -#include "hw/puv3.h" +#include "hw/unicore32/puv3.h" typedef struct { SysBusDevice busdev; diff --git a/hw/puv3_intc.c b/hw/puv3_intc.c index 6bc9e1a..0cd5e9e 100644 --- a/hw/puv3_intc.c +++ b/hw/puv3_intc.c @@ -11,7 +11,7 @@ #include "hw/sysbus.h" #undef DEBUG_PUV3 -#include "hw/puv3.h" +#include "hw/unicore32/puv3.h" typedef struct { SysBusDevice busdev; diff --git a/hw/puv3_ost.c b/hw/puv3_ost.c index 10a522a..0c3d827 100644 --- a/hw/puv3_ost.c +++ b/hw/puv3_ost.c @@ -12,7 +12,7 @@ #include "hw/ptimer.h" #undef DEBUG_PUV3 -#include "hw/puv3.h" +#include "hw/unicore32/puv3.h" /* puv3 ostimer implementation. */ typedef struct { diff --git a/hw/puv3_pm.c b/hw/puv3_pm.c index 6b8d94d..0aacdc2 100644 --- a/hw/puv3_pm.c +++ b/hw/puv3_pm.c @@ -12,7 +12,7 @@ #include "hw/sysbus.h" #undef DEBUG_PUV3 -#include "hw/puv3.h" +#include "hw/unicore32/puv3.h" typedef struct { SysBusDevice busdev; diff --git a/hw/pxa2xx_dma.c b/hw/pxa2xx_dma.c index 1db21c9..6e4c1f6 100644 --- a/hw/pxa2xx_dma.c +++ b/hw/pxa2xx_dma.c @@ -9,7 +9,7 @@ */ #include "hw/hw.h" -#include "hw/pxa.h" +#include "hw/arm/pxa.h" #include "hw/sysbus.h" #define PXA255_DMA_NUM_CHANNELS 16 diff --git a/hw/pxa2xx_keypad.c b/hw/pxa2xx_keypad.c index 32ea7a5..1fd5f20 100644 --- a/hw/pxa2xx_keypad.c +++ b/hw/pxa2xx_keypad.c @@ -12,7 +12,7 @@ */ #include "hw/hw.h" -#include "hw/pxa.h" +#include "hw/arm/pxa.h" #include "ui/console.h" /* diff --git a/hw/pxa2xx_lcd.c b/hw/pxa2xx_lcd.c index f2b0c93..ee59bc2 100644 --- a/hw/pxa2xx_lcd.c +++ b/hw/pxa2xx_lcd.c @@ -12,7 +12,7 @@ #include "hw/hw.h" #include "ui/console.h" -#include "hw/pxa.h" +#include "hw/arm/pxa.h" #include "ui/pixel_ops.h" /* FIXME: For graphic_rotate. Should probably be done in common code. */ #include "sysemu/sysemu.h" diff --git a/hw/pxa2xx_mmci.c b/hw/pxa2xx_mmci.c index 0df83cc..2db1cab 100644 --- a/hw/pxa2xx_mmci.c +++ b/hw/pxa2xx_mmci.c @@ -11,7 +11,7 @@ */ #include "hw/hw.h" -#include "hw/pxa.h" +#include "hw/arm/pxa.h" #include "hw/sd.h" #include "hw/qdev.h" diff --git a/hw/pxa2xx_pcmcia.c b/hw/pxa2xx_pcmcia.c index 66fefba..323d458 100644 --- a/hw/pxa2xx_pcmcia.c +++ b/hw/pxa2xx_pcmcia.c @@ -12,7 +12,7 @@ #include "hw/hw.h" #include "hw/pcmcia.h" -#include "hw/pxa.h" +#include "hw/arm/pxa.h" struct PXA2xxPCMCIAState { diff --git a/hw/pxa2xx_timer.c b/hw/pxa2xx_timer.c index c173fe4..8ea2416 100644 --- a/hw/pxa2xx_timer.c +++ b/hw/pxa2xx_timer.c @@ -10,7 +10,7 @@ #include "hw/hw.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" -#include "hw/pxa.h" +#include "hw/arm/pxa.h" #include "hw/sysbus.h" #define OSMR0 0x00 @@ -28,7 +28,7 @@ * THE SOFTWARE. */ #include "hw/hw.h" -#include "hw/q35.h" +#include "hw/pci-host/q35.h" /**************************************************************************** * Q35 host diff --git a/hw/qdev-properties-system.c b/hw/qdev-properties-system.c index a22b155..8c2e152 100644 --- a/hw/qdev-properties-system.c +++ b/hw/qdev-properties-system.c @@ -14,7 +14,7 @@ #include "hw/qdev.h" #include "qapi/qmp/qerror.h" #include "sysemu/blockdev.h" -#include "hw/block-common.h" +#include "hw/block/block.h" #include "net/hub.h" #include "qapi/visitor.h" #include "char/char.h" diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c index 168c466..9a0872d 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev-properties.c @@ -2,7 +2,7 @@ #include "hw/qdev.h" #include "qapi/qmp/qerror.h" #include "sysemu/blockdev.h" -#include "hw/block-common.h" +#include "hw/block/block.h" #include "net/hub.h" #include "qapi/visitor.h" #include "char/char.h" diff --git a/hw/rc4030.c b/hw/rc4030.c index b065515..03f92f1 100644 --- a/hw/rc4030.c +++ b/hw/rc4030.c @@ -23,7 +23,7 @@ */ #include "hw/hw.h" -#include "hw/mips.h" +#include "hw/mips/mips.h" #include "qemu/timer.h" /********************************************************/ diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c index 8c529c1..ddf15a2 100644 --- a/hw/s390x/s390-virtio-bus.c +++ b/hw/s390x/s390-virtio-bus.c @@ -24,15 +24,15 @@ #include "monitor/monitor.h" #include "hw/loader.h" #include "elf.h" -#include "hw/virtio.h" -#include "hw/virtio-rng.h" -#include "hw/virtio-serial.h" -#include "hw/virtio-net.h" +#include "hw/virtio/virtio.h" +#include "hw/virtio/virtio-rng.h" +#include "hw/virtio/virtio-serial.h" +#include "hw/virtio/virtio-net.h" #include "hw/sysbus.h" #include "sysemu/kvm.h" #include "hw/s390x/s390-virtio-bus.h" -#include "hw/virtio-bus.h" +#include "hw/virtio/virtio-bus.h" /* #define DEBUG_S390 */ diff --git a/hw/s390x/s390-virtio-bus.h b/hw/s390x/s390-virtio-bus.h index ebe8794..c557132 100644 --- a/hw/s390x/s390-virtio-bus.h +++ b/hw/s390x/s390-virtio-bus.h @@ -19,12 +19,12 @@ #ifndef HW_S390_VIRTIO_BUS_H #define HW_S390_VIRTIO_BUS_H 1 -#include "hw/virtio-blk.h" -#include "hw/virtio-net.h" -#include "hw/virtio-rng.h" -#include "hw/virtio-serial.h" -#include "hw/virtio-scsi.h" -#include "hw/virtio-bus.h" +#include "hw/virtio/virtio-blk.h" +#include "hw/virtio/virtio-net.h" +#include "hw/virtio/virtio-rng.h" +#include "hw/virtio/virtio-serial.h" +#include "hw/virtio/virtio-scsi.h" +#include "hw/virtio/virtio-bus.h" #define VIRTIO_DEV_OFFS_TYPE 0 /* 8 bits */ #define VIRTIO_DEV_OFFS_NUM_VQ 1 /* 8 bits */ diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c index ca275bd..f82c0e1 100644 --- a/hw/s390x/s390-virtio.c +++ b/hw/s390x/s390-virtio.c @@ -29,7 +29,7 @@ #include "hw/boards.h" #include "monitor/monitor.h" #include "hw/loader.h" -#include "hw/virtio.h" +#include "hw/virtio/virtio.h" #include "hw/sysbus.h" #include "sysemu/kvm.h" #include "exec/address-spaces.h" diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 5dce791..4dec0cd 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -15,12 +15,12 @@ #include "sysemu/sysemu.h" #include "net/net.h" #include "monitor/monitor.h" -#include "hw/virtio.h" -#include "hw/virtio-serial.h" -#include "hw/virtio-net.h" +#include "hw/virtio/virtio.h" +#include "hw/virtio/virtio-serial.h" +#include "hw/virtio/virtio-net.h" #include "hw/sysbus.h" #include "qemu/bitops.h" -#include "hw/virtio-bus.h" +#include "hw/virtio/virtio-bus.h" #include "ioinst.h" #include "css.h" diff --git a/hw/s390x/virtio-ccw.h b/hw/s390x/virtio-ccw.h index d580510..46e9a55 100644 --- a/hw/s390x/virtio-ccw.h +++ b/hw/s390x/virtio-ccw.h @@ -12,13 +12,13 @@ #ifndef HW_S390X_VIRTIO_CCW_H #define HW_S390X_VIRTIO_CCW_H -#include <hw/virtio-blk.h> -#include <hw/virtio-net.h> -#include <hw/virtio-serial.h> -#include <hw/virtio-scsi.h> -#include "hw/virtio-balloon.h" -#include <hw/virtio-rng.h> -#include <hw/virtio-bus.h> +#include <hw/virtio/virtio-blk.h> +#include <hw/virtio/virtio-net.h> +#include <hw/virtio/virtio-serial.h> +#include <hw/virtio/virtio-scsi.h> +#include <hw/virtio/virtio-balloon.h> +#include <hw/virtio/virtio-rng.h> +#include <hw/virtio/virtio-bus.h> #define VIRTUAL_CSSID 0xfe @@ -22,9 +22,9 @@ * THE SOFTWARE. */ #include "hw/hw.h" -#include "hw/audiodev.h" +#include "hw/audio/audio.h" #include "audio/audio.h" -#include "hw/isa.h" +#include "hw/isa/isa.h" #include "hw/qdev.h" #include "qemu/timer.h" #include "qemu/host-utils.h" diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index ac2093a..6239ee1 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -1,7 +1,7 @@ #include "hw/hw.h" #include "qemu/error-report.h" -#include "hw/scsi.h" -#include "hw/scsi-defs.h" +#include "hw/scsi/scsi.h" +#include "block/scsi.h" #include "hw/qdev.h" #include "sysemu/blockdev.h" #include "trace.h" diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index c5c7bf3..f52bd11 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -30,11 +30,11 @@ do { printf("scsi-disk: " fmt , ## __VA_ARGS__); } while (0) #include "qemu-common.h" #include "qemu/error-report.h" -#include "hw/scsi.h" -#include "hw/scsi-defs.h" +#include "hw/scsi/scsi.h" +#include "block/scsi.h" #include "sysemu/sysemu.h" #include "sysemu/blockdev.h" -#include "hw/block-common.h" +#include "hw/block/block.h" #include "sysemu/dma.h" #ifdef __linux diff --git a/hw/scsi-generic.c b/hw/scsi-generic.c index 4d04cac..2a9a561 100644 --- a/hw/scsi-generic.c +++ b/hw/scsi-generic.c @@ -13,7 +13,7 @@ #include "qemu-common.h" #include "qemu/error-report.h" -#include "hw/scsi.h" +#include "hw/scsi/scsi.h" #include "sysemu/blockdev.h" #ifdef __linux__ @@ -35,7 +35,7 @@ do { fprintf(stderr, "scsi-generic: " fmt , ## __VA_ARGS__); } while (0) #include <sys/stat.h> #include <unistd.h> #include <scsi/sg.h> -#include "hw/scsi-defs.h" +#include "block/scsi.h" #define SCSI_SENSE_BUF_SIZE 96 diff --git a/hw/serial-isa.c b/hw/serial-isa.c index a630a7d..ed140d0 100644 --- a/hw/serial-isa.c +++ b/hw/serial-isa.c @@ -23,8 +23,8 @@ * THE SOFTWARE. */ -#include "hw/serial.h" -#include "hw/isa.h" +#include "hw/char/serial.h" +#include "hw/isa/isa.h" typedef struct ISASerialState { ISADevice dev; diff --git a/hw/serial-pci.c b/hw/serial-pci.c index 954657b..2138e35 100644 --- a/hw/serial-pci.c +++ b/hw/serial-pci.c @@ -25,7 +25,7 @@ /* see docs/specs/pci-serial.txt */ -#include "hw/serial.h" +#include "hw/char/serial.h" #include "hw/pci/pci.h" #define PCI_SERIAL_MAX_PORTS 4 diff --git a/hw/serial.c b/hw/serial.c index 0ccc499..1151bf1 100644 --- a/hw/serial.c +++ b/hw/serial.c @@ -23,7 +23,7 @@ * THE SOFTWARE. */ -#include "hw/serial.h" +#include "hw/char/serial.h" #include "char/char.h" #include "qemu/timer.h" #include "exec/address-spaces.h" @@ -25,7 +25,7 @@ * */ #include "hw/pci/pci.h" -#include "hw/pc.h" +#include "hw/i386/pc.h" #include "hw/loader.h" #include "sysemu/sysemu.h" diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c index faa03d2..bcc326a 100644 --- a/hw/sh4/r2d.c +++ b/hw/sh4/r2d.c @@ -25,8 +25,8 @@ #include "hw/sysbus.h" #include "hw/hw.h" -#include "hw/sh.h" -#include "hw/devices.h" +#include "hw/sh4/sh.h" +#include "hw/arm/devices.h" #include "sysemu/sysemu.h" #include "hw/boards.h" #include "hw/pci/pci.h" @@ -35,7 +35,7 @@ #include "hw/ide.h" #include "hw/loader.h" #include "hw/usb.h" -#include "hw/flash.h" +#include "hw/block/flash.h" #include "sysemu/blockdev.h" #include "exec/address-spaces.h" diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c index e4d37ad..d72708e 100644 --- a/hw/sh4/sh7750.c +++ b/hw/sh4/sh7750.c @@ -24,11 +24,11 @@ */ #include <stdio.h> #include "hw/hw.h" -#include "hw/sh.h" +#include "hw/sh4/sh.h" #include "sysemu/sysemu.h" #include "hw/sh7750_regs.h" #include "hw/sh7750_regnames.h" -#include "hw/sh_intc.h" +#include "hw/sh4/sh_intc.h" #include "cpu.h" #include "exec/address-spaces.h" diff --git a/hw/sh4/sh7750_regnames.c b/hw/sh4/sh7750_regnames.c index 389698d..7a3cdf3 100644 --- a/hw/sh4/sh7750_regnames.c +++ b/hw/sh4/sh7750_regnames.c @@ -1,5 +1,5 @@ #include "hw/hw.h" -#include "hw/sh.h" +#include "hw/sh4/sh.h" #include "hw/sh7750_regs.h" #include "hw/sh7750_regnames.h" diff --git a/hw/sh4/shix.c b/hw/sh4/shix.c index 192579d..c23d4af 100644 --- a/hw/sh4/shix.c +++ b/hw/sh4/shix.c @@ -28,7 +28,7 @@ More information in target-sh4/README.sh4 */ #include "hw/hw.h" -#include "hw/sh.h" +#include "hw/sh4/sh.h" #include "sysemu/sysemu.h" #include "hw/boards.h" #include "hw/loader.h" diff --git a/hw/sh_intc.c b/hw/sh_intc.c index 29e3d8f..050bfb6 100644 --- a/hw/sh_intc.c +++ b/hw/sh_intc.c @@ -8,9 +8,9 @@ * This code is licensed under the GPL. */ -#include "hw/sh_intc.h" +#include "hw/sh4/sh_intc.h" #include "hw/hw.h" -#include "hw/sh.h" +#include "hw/sh4/sh.h" //#define DEBUG_INTC //#define DEBUG_INTC_SOURCES diff --git a/hw/sh_pci.c b/hw/sh_pci.c index e3e7550..d213a90 100644 --- a/hw/sh_pci.c +++ b/hw/sh_pci.c @@ -22,7 +22,7 @@ * THE SOFTWARE. */ #include "hw/sysbus.h" -#include "hw/sh.h" +#include "hw/sh4/sh.h" #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" #include "qemu/bswap.h" diff --git a/hw/sh_serial.c b/hw/sh_serial.c index 4629695..450c7d8 100644 --- a/hw/sh_serial.c +++ b/hw/sh_serial.c @@ -25,7 +25,7 @@ * THE SOFTWARE. */ #include "hw/hw.h" -#include "hw/sh.h" +#include "hw/sh4/sh.h" #include "char/char.h" #include "exec/address-spaces.h" diff --git a/hw/sh_timer.c b/hw/sh_timer.c index b450323..f92ff4f 100644 --- a/hw/sh_timer.c +++ b/hw/sh_timer.c @@ -9,7 +9,7 @@ */ #include "hw/hw.h" -#include "hw/sh.h" +#include "hw/sh4/sh.h" #include "qemu/timer.h" #include "exec/address-spaces.h" #include "hw/ptimer.h" diff --git a/hw/slavio_intctl.c b/hw/slavio_intctl.c index b60592b..b367752 100644 --- a/hw/slavio_intctl.c +++ b/hw/slavio_intctl.c @@ -22,7 +22,7 @@ * THE SOFTWARE. */ -#include "hw/sun4m.h" +#include "hw/sparc/sun4m.h" #include "monitor/monitor.h" #include "hw/sysbus.h" #include "trace.h" diff --git a/hw/slavio_timer.c b/hw/slavio_timer.c index 83f22a0..1145a87 100644 --- a/hw/slavio_timer.c +++ b/hw/slavio_timer.c @@ -22,7 +22,7 @@ * THE SOFTWARE. */ -#include "hw/sun4m.h" +#include "hw/sparc/sun4m.h" #include "qemu/timer.h" #include "hw/ptimer.h" #include "hw/sysbus.h" @@ -24,9 +24,9 @@ #include <stdio.h> #include "hw/hw.h" -#include "hw/serial.h" +#include "hw/char/serial.h" #include "ui/console.h" -#include "hw/devices.h" +#include "hw/arm/devices.h" #include "hw/sysbus.h" #include "hw/qdev-addr.h" #include "qemu/range.h" @@ -10,8 +10,8 @@ /* TODO: Implement PEC. */ #include "hw/hw.h" -#include "hw/i2c.h" -#include "hw/smbus.h" +#include "hw/i2c/i2c.h" +#include "hw/i2c/smbus.h" //#define DEBUG_SMBUS 1 diff --git a/hw/smbus_eeprom.c b/hw/smbus_eeprom.c index dff8403d..0154283 100644 --- a/hw/smbus_eeprom.c +++ b/hw/smbus_eeprom.c @@ -23,8 +23,8 @@ */ #include "hw/hw.h" -#include "hw/i2c.h" -#include "hw/smbus.h" +#include "hw/i2c/i2c.h" +#include "hw/i2c/smbus.h" //#define DEBUG diff --git a/hw/smbus_ich9.c b/hw/smbus_ich9.c index 732ebd3..ca22978 100644 --- a/hw/smbus_ich9.c +++ b/hw/smbus_ich9.c @@ -25,14 +25,14 @@ * */ #include "hw/hw.h" -#include "hw/pc.h" -#include "hw/pm_smbus.h" +#include "hw/i386/pc.h" +#include "hw/i2c/pm_smbus.h" #include "hw/pci/pci.h" #include "sysemu/sysemu.h" -#include "hw/i2c.h" -#include "hw/smbus.h" +#include "hw/i2c/i2c.h" +#include "hw/i2c/smbus.h" -#include "hw/ich9.h" +#include "hw/i386/ich9.h" #define TYPE_ICH9_SMB_DEVICE "ICH9 SMB" #define ICH9_SMB_DEVICE(obj) \ diff --git a/hw/smc91c111.c b/hw/smc91c111.c index c2feae6..f659256 100644 --- a/hw/smc91c111.c +++ b/hw/smc91c111.c @@ -9,7 +9,7 @@ #include "hw/sysbus.h" #include "net/net.h" -#include "hw/devices.h" +#include "hw/arm/devices.h" /* For crc32 */ #include <zlib.h> diff --git a/hw/soc_dma.c b/hw/soc_dma.c index db5d609..5e3491d 100644 --- a/hw/soc_dma.c +++ b/hw/soc_dma.c @@ -19,7 +19,7 @@ */ #include "qemu-common.h" #include "qemu/timer.h" -#include "hw/soc_dma.h" +#include "hw/arm/soc_dma.h" static void transfer_mem2mem(struct soc_dma_ch_s *ch) { diff --git a/hw/spapr_llan.c b/hw/spapr_llan.c index 19701e7..34332f2 100644 --- a/hw/spapr_llan.c +++ b/hw/spapr_llan.c @@ -27,8 +27,8 @@ #include "hw/hw.h" #include "net/net.h" #include "hw/qdev.h" -#include "hw/spapr.h" -#include "hw/spapr_vio.h" +#include "hw/ppc/spapr.h" +#include "hw/ppc/spapr_vio.h" #include <libfdt.h> diff --git a/hw/spapr_nvram.c b/hw/spapr_nvram.c index 680cdba..0cc6cba 100644 --- a/hw/spapr_nvram.c +++ b/hw/spapr_nvram.c @@ -26,8 +26,8 @@ #include "sysemu/device_tree.h" #include "hw/sysbus.h" -#include "hw/spapr.h" -#include "hw/spapr_vio.h" +#include "hw/ppc/spapr.h" +#include "hw/ppc/spapr_vio.h" typedef struct sPAPRNVRAM { VIOsPAPRDevice sdev; diff --git a/hw/spapr_pci.c b/hw/spapr_pci.c index 3e0d8d1..62ff323 100644 --- a/hw/spapr_pci.c +++ b/hw/spapr_pci.c @@ -27,8 +27,8 @@ #include "hw/pci/msi.h" #include "hw/pci/msix.h" #include "hw/pci/pci_host.h" -#include "hw/spapr.h" -#include "hw/spapr_pci.h" +#include "hw/ppc/spapr.h" +#include "hw/pci-host/spapr.h" #include "exec/address-spaces.h" #include <libfdt.h> #include "trace.h" diff --git a/hw/spapr_vscsi.c b/hw/spapr_vscsi.c index 2794094..e92b09a 100644 --- a/hw/spapr_vscsi.c +++ b/hw/spapr_vscsi.c @@ -32,12 +32,12 @@ * - Maybe do autosense (PAPR seems to mandate it, linux doesn't care) */ #include "hw/hw.h" -#include "hw/scsi.h" -#include "hw/scsi-defs.h" +#include "hw/scsi/scsi.h" +#include "block/scsi.h" #include "hw/srp.h" #include "hw/qdev.h" -#include "hw/spapr.h" -#include "hw/spapr_vio.h" +#include "hw/ppc/spapr.h" +#include "hw/ppc/spapr_vio.h" #include "hw/ppc-viosrp.h" #include <libfdt.h> diff --git a/hw/spapr_vty.c b/hw/spapr_vty.c index be08571..9df018a 100644 --- a/hw/spapr_vty.c +++ b/hw/spapr_vty.c @@ -1,7 +1,7 @@ #include "hw/qdev.h" #include "char/char.h" -#include "hw/spapr.h" -#include "hw/spapr_vio.h" +#include "hw/ppc/spapr.h" +#include "hw/ppc/spapr_vio.h" #define VTERM_BUFSIZE 16 diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c index bf06bf4..3b27d40 100644 --- a/hw/sparc/leon3.c +++ b/hw/sparc/leon3.c @@ -32,7 +32,7 @@ #include "trace.h" #include "exec/address-spaces.h" -#include "hw/grlib.h" +#include "hw/sparc/grlib.h" /* Default system clock. */ #define CPU_CLK (40 * 1000 * 1000) diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 9ebda02..31beb32 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -23,19 +23,19 @@ */ #include "hw/sysbus.h" #include "qemu/timer.h" -#include "hw/sun4m.h" -#include "hw/nvram.h" -#include "hw/sparc32_dma.h" -#include "hw/fdc.h" +#include "hw/sparc/sun4m.h" +#include "hw/timer/m48t59.h" +#include "hw/sparc/sparc32_dma.h" +#include "hw/block/fdc.h" #include "sysemu/sysemu.h" #include "net/net.h" #include "hw/boards.h" -#include "hw/firmware_abi.h" -#include "hw/esp.h" -#include "hw/pc.h" -#include "hw/isa.h" -#include "hw/fw_cfg.h" -#include "hw/escc.h" +#include "hw/sparc/firmware_abi.h" +#include "hw/scsi/esp.h" +#include "hw/i386/pc.h" +#include "hw/isa/isa.h" +#include "hw/nvram/fw_cfg.h" +#include "hw/char/escc.h" #include "hw/empty_slot.h" #include "hw/qdev-addr.h" #include "hw/loader.h" diff --git a/hw/sparc32_dma.c b/hw/sparc32_dma.c index 18e368e..fd21533 100644 --- a/hw/sparc32_dma.c +++ b/hw/sparc32_dma.c @@ -26,8 +26,8 @@ */ #include "hw/hw.h" -#include "hw/sparc32_dma.h" -#include "hw/sun4m.h" +#include "hw/sparc/sparc32_dma.h" +#include "hw/sparc/sun4m.h" #include "hw/sysbus.h" #include "trace.h" diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index 4c39cf6..0d29620 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -23,17 +23,17 @@ */ #include "hw/hw.h" #include "hw/pci/pci.h" -#include "hw/apb_pci.h" -#include "hw/pc.h" -#include "hw/serial.h" -#include "hw/nvram.h" -#include "hw/fdc.h" +#include "hw/pci-host/apb.h" +#include "hw/i386/pc.h" +#include "hw/char/serial.h" +#include "hw/timer/m48t59.h" +#include "hw/block/fdc.h" #include "net/net.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" #include "hw/boards.h" -#include "hw/firmware_abi.h" -#include "hw/fw_cfg.h" +#include "hw/sparc/firmware_abi.h" +#include "hw/nvram/fw_cfg.h" #include "hw/sysbus.h" #include "hw/ide.h" #include "hw/loader.h" diff --git a/hw/ssd0303.c b/hw/ssd0303.c index 68d1f24..183a878 100644 --- a/hw/ssd0303.c +++ b/hw/ssd0303.c @@ -10,7 +10,7 @@ /* The controller can support a variety of different displays, but we only implement one. Most of the commends relating to brightness and geometry setup are ignored. */ -#include "hw/i2c.h" +#include "hw/i2c/i2c.h" #include "ui/console.h" //#define DEBUG_SSD0303 1 diff --git a/hw/stellaris_input.c b/hw/stellaris_input.c index 4e40792..f83fc3f 100644 --- a/hw/stellaris_input.c +++ b/hw/stellaris_input.c @@ -7,7 +7,7 @@ * This code is licensed under the GPL. */ #include "hw/hw.h" -#include "hw/devices.h" +#include "hw/arm/devices.h" #include "ui/console.h" typedef struct { diff --git a/hw/strongarm.c b/hw/strongarm.c index 49f9577..0e5262d 100644 --- a/hw/strongarm.c +++ b/hw/strongarm.c @@ -29,7 +29,7 @@ #include "hw/sysbus.h" #include "hw/strongarm.h" #include "qemu/error-report.h" -#include "hw/arm-misc.h" +#include "hw/arm.h" #include "char/char.h" #include "sysemu/sysemu.h" #include "hw/ssi.h" diff --git a/hw/sun4c_intctl.c b/hw/sun4c_intctl.c index 9d443d1..1096375 100644 --- a/hw/sun4c_intctl.c +++ b/hw/sun4c_intctl.c @@ -23,7 +23,7 @@ */ #include "hw/hw.h" -#include "hw/sun4m.h" +#include "hw/sparc/sun4m.h" #include "monitor/monitor.h" #include "hw/sysbus.h" diff --git a/hw/sun4m_iommu.c b/hw/sun4m_iommu.c index 33e77b0..744b584 100644 --- a/hw/sun4m_iommu.c +++ b/hw/sun4m_iommu.c @@ -22,7 +22,7 @@ * THE SOFTWARE. */ -#include "hw/sun4m.h" +#include "hw/sparc/sun4m.h" #include "hw/sysbus.h" #include "trace.h" diff --git a/hw/tc58128.c b/hw/tc58128.c index f76f96d..a3929d4 100644 --- a/hw/tc58128.c +++ b/hw/tc58128.c @@ -1,5 +1,5 @@ #include "hw/hw.h" -#include "hw/sh.h" +#include "hw/sh4/sh.h" #include "hw/loader.h" #define CE1 0x0100 diff --git a/hw/tc6393xb.c b/hw/tc6393xb.c index 79c971b..2d5fa89 100644 --- a/hw/tc6393xb.c +++ b/hw/tc6393xb.c @@ -11,8 +11,8 @@ * GNU GPL, version 2 or (at your option) any later version. */ #include "hw/hw.h" -#include "hw/devices.h" -#include "hw/flash.h" +#include "hw/arm/devices.h" +#include "hw/block/flash.h" #include "ui/console.h" #include "ui/pixel_ops.h" #include "sysemu/blockdev.h" diff --git a/hw/tmp105.c b/hw/tmp105.c index 47e5437..21a27a6 100644 --- a/hw/tmp105.c +++ b/hw/tmp105.c @@ -19,7 +19,7 @@ */ #include "hw/hw.h" -#include "hw/i2c.h" +#include "hw/i2c/i2c.h" #include "hw/tmp105.h" #include "qapi/visitor.h" diff --git a/hw/tmp105.h b/hw/tmp105.h index 9a9632c..9ba05ec 100644 --- a/hw/tmp105.h +++ b/hw/tmp105.h @@ -14,8 +14,8 @@ #ifndef QEMU_TMP105_H #define QEMU_TMP105_H -#include "hw/i2c.h" -#include "hw/tmp105_regs.h" +#include "hw/i2c/i2c.h" +#include "hw/misc/tmp105_regs.h" #define TYPE_TMP105 "tmp105" #define TMP105(obj) OBJECT_CHECK(TMP105State, (obj), TYPE_TMP105) diff --git a/hw/tsc2005.c b/hw/tsc2005.c index a771cd5..34ee1fb 100644 --- a/hw/tsc2005.c +++ b/hw/tsc2005.c @@ -21,7 +21,7 @@ #include "hw/hw.h" #include "qemu/timer.h" #include "ui/console.h" -#include "hw/devices.h" +#include "hw/arm/devices.h" #define TSC_CUT_RESOLUTION(value, p) ((value) >> (16 - (p ? 12 : 10))) diff --git a/hw/tsc210x.c b/hw/tsc210x.c index b93e502..e6c217c 100644 --- a/hw/tsc210x.c +++ b/hw/tsc210x.c @@ -23,8 +23,8 @@ #include "audio/audio.h" #include "qemu/timer.h" #include "ui/console.h" -#include "hw/omap.h" /* For I2SCodec and uWireSlave */ -#include "hw/devices.h" +#include "hw/arm/omap.h" /* For I2SCodec and uWireSlave */ +#include "hw/arm/devices.h" #define TSC_DATA_REGISTERS_PAGE 0x0 #define TSC_CONTROL_REGISTERS_PAGE 0x1 diff --git a/hw/tusb6010.c b/hw/tusb6010.c index a5251a3..533938a 100644 --- a/hw/tusb6010.c +++ b/hw/tusb6010.c @@ -21,9 +21,9 @@ #include "qemu-common.h" #include "qemu/timer.h" #include "hw/usb.h" -#include "hw/omap.h" +#include "hw/arm/omap.h" #include "hw/irq.h" -#include "hw/devices.h" +#include "hw/arm/devices.h" #include "hw/sysbus.h" typedef struct TUSBState { diff --git a/hw/twl92230.c b/hw/twl92230.c index 7d020c4..b730d85 100644 --- a/hw/twl92230.c +++ b/hw/twl92230.c @@ -21,7 +21,7 @@ #include "hw/hw.h" #include "qemu/timer.h" -#include "hw/i2c.h" +#include "hw/i2c/i2c.h" #include "sysemu/sysemu.h" #include "ui/console.h" diff --git a/hw/unicore32/puv3.c b/hw/unicore32/puv3.c index 78ab13f..7c8fc36 100644 --- a/hw/unicore32/puv3.c +++ b/hw/unicore32/puv3.c @@ -16,10 +16,10 @@ #include "hw/sysbus.h" #include "hw/boards.h" #include "hw/loader.h" -#include "hw/pc.h" +#include "hw/i386/pc.h" #undef DEBUG_PUV3 -#include "hw/puv3.h" +#include "hw/unicore32/puv3.h" #define KERNEL_LOAD_ADDR 0x03000000 #define KERNEL_MAX_SIZE 0x00800000 /* Just a guess */ diff --git a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c index b8c79b8..44fc43f 100644 --- a/hw/usb/dev-audio.c +++ b/hw/usb/dev-audio.c @@ -33,7 +33,7 @@ #include "hw/usb.h" #include "hw/usb/desc.h" #include "hw/hw.h" -#include "hw/audiodev.h" +#include "hw/audio/audio.h" #include "audio/audio.h" #define USBAUDIO_VENDOR_NUM 0x46f4 /* CRC16() of "QEMU" */ diff --git a/hw/usb/dev-hid.c b/hw/usb/dev-hid.c index 9701048..5f3a4b4 100644 --- a/hw/usb/dev-hid.c +++ b/hw/usb/dev-hid.c @@ -27,7 +27,7 @@ #include "hw/usb.h" #include "hw/usb/desc.h" #include "qemu/timer.h" -#include "hw/hid.h" +#include "hw/input/hid.h" /* HID interface requests */ #define GET_REPORT 0xa101 diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c index 21651b3..06f0171 100644 --- a/hw/usb/dev-storage.c +++ b/hw/usb/dev-storage.c @@ -12,7 +12,7 @@ #include "qemu/config-file.h" #include "hw/usb.h" #include "hw/usb/desc.h" -#include "hw/scsi.h" +#include "hw/scsi/scsi.h" #include "ui/console.h" #include "monitor/monitor.h" #include "sysemu/sysemu.h" diff --git a/hw/usb/dev-uas.c b/hw/usb/dev-uas.c index 1ac5117..c8c42ee 100644 --- a/hw/usb/dev-uas.c +++ b/hw/usb/dev-uas.c @@ -16,8 +16,8 @@ #include "hw/usb.h" #include "hw/usb/desc.h" -#include "hw/scsi.h" -#include "hw/scsi-defs.h" +#include "hw/scsi/scsi.h" +#include "block/scsi.h" /* --------------------------------------------------------------------- */ diff --git a/hw/vga-isa-mm.c b/hw/vga-isa-mm.c index 02356d4..3b08720 100644 --- a/hw/vga-isa-mm.c +++ b/hw/vga-isa-mm.c @@ -23,7 +23,7 @@ */ #include "hw/hw.h" #include "ui/console.h" -#include "hw/pc.h" +#include "hw/i386/pc.h" #include "hw/vga_int.h" #include "ui/pixel_ops.h" #include "qemu/timer.h" diff --git a/hw/vga-isa.c b/hw/vga-isa.c index 9e29321..89d7fa6 100644 --- a/hw/vga-isa.c +++ b/hw/vga-isa.c @@ -25,7 +25,7 @@ */ #include "hw/hw.h" #include "ui/console.h" -#include "hw/pc.h" +#include "hw/i386/pc.h" #include "hw/vga_int.h" #include "ui/pixel_ops.h" #include "qemu/timer.h" @@ -24,12 +24,12 @@ #include "hw/hw.h" #include "hw/vga.h" #include "ui/console.h" -#include "hw/pc.h" +#include "hw/i386/pc.h" #include "hw/pci/pci.h" #include "hw/vga_int.h" #include "ui/pixel_ops.h" #include "qemu/timer.h" -#include "hw/xen.h" +#include "hw/xen/xen.h" #include "trace.h" //#define DEBUG_VGA @@ -14,7 +14,7 @@ */ #include <sys/ioctl.h> -#include "hw/vhost.h" +#include "hw/virtio/vhost.h" #include "hw/hw.h" #include "qemu/range.h" #include <linux/vhost.h> diff --git a/hw/vhost_net.c b/hw/vhost_net.c index d3218a0..8c5384c 100644 --- a/hw/vhost_net.c +++ b/hw/vhost_net.c @@ -16,8 +16,8 @@ #include "net/net.h" #include "net/tap.h" -#include "hw/virtio-net.h" -#include "hw/vhost_net.h" +#include "hw/virtio/virtio-net.h" +#include "net/vhost_net.h" #include "qemu/error-report.h" #include "config.h" @@ -36,7 +36,7 @@ #include <stdio.h> -#include "hw/vhost.h" +#include "hw/virtio/vhost.h" struct vhost_net { struct vhost_dev dev; diff --git a/hw/virtio-balloon.c b/hw/virtio-balloon.c index b382bd4..c2c446e 100644 --- a/hw/virtio-balloon.c +++ b/hw/virtio-balloon.c @@ -16,11 +16,11 @@ #include "qemu/iov.h" #include "qemu/timer.h" #include "qemu-common.h" -#include "hw/virtio.h" -#include "hw/pc.h" +#include "hw/virtio/virtio.h" +#include "hw/i386/pc.h" #include "cpu.h" #include "sysemu/balloon.h" -#include "hw/virtio-balloon.h" +#include "hw/virtio/virtio-balloon.h" #include "sysemu/kvm.h" #include "exec/address-spaces.h" #include "qapi/visitor.h" @@ -29,7 +29,7 @@ #include <sys/mman.h> #endif -#include "hw/virtio-bus.h" +#include "hw/virtio/virtio-bus.h" static void balloon_page(void *addr, int deflate) { diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index f2143fd..6efb2f0 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -14,14 +14,17 @@ #include "qemu-common.h" #include "qemu/error-report.h" #include "trace.h" -#include "hw/block-common.h" +#include "hw/block/block.h" #include "sysemu/blockdev.h" -#include "hw/virtio-blk.h" -#include "hw/scsi-defs.h" +#include "hw/virtio/virtio-blk.h" +#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE +# include "dataplane/virtio-blk.h" +#endif +#include "block/scsi.h" #ifdef __linux__ # include <scsi/sg.h> #endif -#include "hw/virtio-bus.h" +#include "hw/virtio/virtio-bus.h" typedef struct VirtIOBlockReq { diff --git a/hw/virtio-bus.c b/hw/virtio-bus.c index 6c2aab0..1596a1c 100644 --- a/hw/virtio-bus.c +++ b/hw/virtio-bus.c @@ -25,8 +25,8 @@ #include "hw/hw.h" #include "qemu/error-report.h" #include "hw/qdev.h" -#include "hw/virtio-bus.h" -#include "hw/virtio.h" +#include "hw/virtio/virtio-bus.h" +#include "hw/virtio/virtio.h" /* #define DEBUG_VIRTIO_BUS */ diff --git a/hw/virtio-console.c b/hw/virtio-console.c index 284180f..31f672c 100644 --- a/hw/virtio-console.c +++ b/hw/virtio-console.c @@ -13,7 +13,7 @@ #include "char/char.h" #include "qemu/error-report.h" #include "trace.h" -#include "hw/virtio-serial.h" +#include "hw/virtio/virtio-serial.h" typedef struct VirtConsole { VirtIOSerialPort port; diff --git a/hw/virtio-net.c b/hw/virtio-net.c index 5917740..bc8fd43 100644 --- a/hw/virtio-net.c +++ b/hw/virtio-net.c @@ -12,14 +12,14 @@ */ #include "qemu/iov.h" -#include "hw/virtio.h" +#include "hw/virtio/virtio.h" #include "net/net.h" #include "net/checksum.h" #include "net/tap.h" #include "qemu/error-report.h" #include "qemu/timer.h" -#include "hw/virtio-net.h" -#include "hw/vhost_net.h" +#include "hw/virtio/virtio-net.h" +#include "net/vhost_net.h" #define VIRTIO_NET_VM_VERSION 11 diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index fb20722..943b429 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -17,12 +17,12 @@ #include <inttypes.h> -#include "hw/virtio.h" -#include "hw/virtio-blk.h" -#include "hw/virtio-net.h" -#include "hw/virtio-serial.h" -#include "hw/virtio-scsi.h" -#include "hw/virtio-balloon.h" +#include "hw/virtio/virtio.h" +#include "hw/virtio/virtio-blk.h" +#include "hw/virtio/virtio-net.h" +#include "hw/virtio/virtio-serial.h" +#include "hw/virtio/virtio-scsi.h" +#include "hw/virtio/virtio-balloon.h" #include "hw/pci/pci.h" #include "qemu/error-report.h" #include "hw/pci/msi.h" @@ -32,7 +32,7 @@ #include "sysemu/blockdev.h" #include "hw/virtio-pci.h" #include "qemu/range.h" -#include "hw/virtio-bus.h" +#include "hw/virtio/virtio-bus.h" /* from Linux's linux/virtio_pci.h */ diff --git a/hw/virtio-pci.h b/hw/virtio-pci.h index f99f2eb..fb83155 100644 --- a/hw/virtio-pci.h +++ b/hw/virtio-pci.h @@ -16,14 +16,14 @@ #define QEMU_VIRTIO_PCI_H #include "hw/pci/msi.h" -#include "hw/virtio-blk.h" -#include "hw/virtio-net.h" -#include "hw/virtio-rng.h" -#include "hw/virtio-serial.h" -#include "hw/virtio-scsi.h" -#include "hw/virtio-balloon.h" -#include "hw/virtio-bus.h" -#include "hw/9pfs/virtio-9p-device.h" +#include "hw/virtio/virtio-blk.h" +#include "hw/virtio/virtio-net.h" +#include "hw/virtio/virtio-rng.h" +#include "hw/virtio/virtio-serial.h" +#include "hw/virtio/virtio-scsi.h" +#include "hw/virtio/virtio-balloon.h" +#include "hw/virtio/virtio-bus.h" +#include "hw/virtio/virtio-9p.h" typedef struct VirtIOPCIProxy VirtIOPCIProxy; typedef struct VirtIOBlkPCI VirtIOBlkPCI; diff --git a/hw/virtio-rng.c b/hw/virtio-rng.c index fa8e8f3..6079b2a 100644 --- a/hw/virtio-rng.c +++ b/hw/virtio-rng.c @@ -12,8 +12,8 @@ #include "qemu/iov.h" #include "hw/qdev.h" #include "qapi/qmp/qerror.h" -#include "hw/virtio.h" -#include "hw/virtio-rng.h" +#include "hw/virtio/virtio.h" +#include "hw/virtio/virtio-rng.h" #include "qemu/rng.h" static bool is_guest_ready(VirtIORNG *vrng) diff --git a/hw/virtio-scsi.c b/hw/virtio-scsi.c index 06a58a6..ead7cda 100644 --- a/hw/virtio-scsi.c +++ b/hw/virtio-scsi.c @@ -13,11 +13,11 @@ * */ -#include "hw/virtio-scsi.h" +#include "hw/virtio/virtio-scsi.h" #include "qemu/error-report.h" -#include <hw/scsi.h> -#include <hw/scsi-defs.h> -#include "hw/virtio-bus.h" +#include <hw/scsi/scsi.h> +#include <block/scsi.h> +#include <hw/virtio/virtio-bus.h> #define VIRTIO_SCSI_VQ_SIZE 128 #define VIRTIO_SCSI_CDB_SIZE 32 diff --git a/hw/virtio-serial-bus.c b/hw/virtio-serial-bus.c index a9cb114..1dba8ab 100644 --- a/hw/virtio-serial-bus.c +++ b/hw/virtio-serial-bus.c @@ -23,7 +23,7 @@ #include "qemu/queue.h" #include "hw/sysbus.h" #include "trace.h" -#include "hw/virtio-serial.h" +#include "hw/virtio/virtio-serial.h" static VirtIOSerialPort *find_port_by_id(VirtIOSerial *vser, uint32_t id) { diff --git a/hw/virtio.c b/hw/virtio.c index 26fbc79..1c2282c 100644 --- a/hw/virtio.c +++ b/hw/virtio.c @@ -15,9 +15,9 @@ #include "trace.h" #include "qemu/error-report.h" -#include "hw/virtio.h" +#include "hw/virtio/virtio.h" #include "qemu/atomic.h" -#include "hw/virtio-bus.h" +#include "hw/virtio/virtio-bus.h" /* The alignment to use between consumer and producer parts of vring. * x86 pagesize again. */ diff --git a/hw/vmmouse.c b/hw/vmmouse.c index a9d227e..f4f9c93 100644 --- a/hw/vmmouse.c +++ b/hw/vmmouse.c @@ -23,8 +23,8 @@ */ #include "hw/hw.h" #include "ui/console.h" -#include "hw/ps2.h" -#include "hw/pc.h" +#include "hw/input/ps2.h" +#include "hw/i386/pc.h" #include "hw/qdev.h" /* debug only vmmouse */ diff --git a/hw/vmport.c b/hw/vmport.c index cc1466a..0d07ea1 100644 --- a/hw/vmport.c +++ b/hw/vmport.c @@ -22,8 +22,8 @@ * THE SOFTWARE. */ #include "hw/hw.h" -#include "hw/isa.h" -#include "hw/pc.h" +#include "hw/isa/isa.h" +#include "hw/i386/pc.h" #include "sysemu/kvm.h" #include "hw/qdev.h" diff --git a/hw/vmxnet3.c b/hw/vmxnet3.c index bdd256e..5916624 100644 --- a/hw/vmxnet3.c +++ b/hw/vmxnet3.c @@ -15,17 +15,16 @@ * */ -#include "hw.h" -#include "pci/pci.h" +#include "hw/hw.h" +#include "hw/pci/pci.h" #include "net/net.h" -#include "virtio-net.h" #include "net/tap.h" #include "net/checksum.h" #include "sysemu/sysemu.h" #include "qemu-common.h" #include "qemu/bswap.h" -#include "pci/msix.h" -#include "pci/msi.h" +#include "hw/pci/msix.h" +#include "hw/pci/msi.h" #include "vmxnet3.h" #include "vmxnet_debug.h" diff --git a/hw/vt82c686.c b/hw/vt82c686.c index 9d9b64e..5261927 100644 --- a/hw/vt82c686.c +++ b/hw/vt82c686.c @@ -11,17 +11,17 @@ */ #include "hw/hw.h" -#include "hw/pc.h" -#include "hw/vt82c686.h" -#include "hw/i2c.h" -#include "hw/smbus.h" +#include "hw/i386/pc.h" +#include "hw/isa/vt82c686.h" +#include "hw/i2c/i2c.h" +#include "hw/i2c/smbus.h" #include "hw/pci/pci.h" -#include "hw/isa.h" +#include "hw/isa/isa.h" #include "hw/sysbus.h" -#include "hw/mips.h" -#include "hw/apm.h" -#include "hw/acpi.h" -#include "hw/pm_smbus.h" +#include "hw/mips/mips.h" +#include "hw/isa/apm.h" +#include "hw/acpi/acpi.h" +#include "hw/i2c/pm_smbus.h" #include "sysemu/sysemu.h" #include "qemu/timer.h" #include "exec/address-spaces.h" diff --git a/hw/watchdog.c b/hw/watchdog.c index 072d256..cb4e1f9 100644 --- a/hw/watchdog.c +++ b/hw/watchdog.c @@ -26,7 +26,7 @@ #include "qapi/qmp/types.h" #include "monitor/monitor.h" #include "sysemu/sysemu.h" -#include "hw/watchdog.h" +#include "sysemu/watchdog.h" /* Possible values for action parameter. */ #define WDT_RESET 1 /* Hard reset. */ diff --git a/hw/wdt_i6300esb.c b/hw/wdt_i6300esb.c index f13e507..1407fba 100644 --- a/hw/wdt_i6300esb.c +++ b/hw/wdt_i6300esb.c @@ -23,7 +23,7 @@ #include "qemu-common.h" #include "qemu/timer.h" -#include "hw/watchdog.h" +#include "sysemu/watchdog.h" #include "hw/hw.h" #include "hw/pci/pci.h" diff --git a/hw/wdt_ib700.c b/hw/wdt_ib700.c index 6c52808..b8c4be8 100644 --- a/hw/wdt_ib700.c +++ b/hw/wdt_ib700.c @@ -21,10 +21,10 @@ #include "qemu-common.h" #include "qemu/timer.h" -#include "hw/watchdog.h" +#include "sysemu/watchdog.h" #include "hw/hw.h" -#include "hw/isa.h" -#include "hw/pc.h" +#include "hw/isa/isa.h" +#include "hw/i386/pc.h" /*#define IB700_DEBUG 1*/ diff --git a/hw/wm8750.c b/hw/wm8750.c index 0904cf4..6b5a349 100644 --- a/hw/wm8750.c +++ b/hw/wm8750.c @@ -8,7 +8,7 @@ */ #include "hw/hw.h" -#include "hw/i2c.h" +#include "hw/i2c/i2c.h" #include "audio/audio.h" #define IN_PORT_N 3 diff --git a/hw/xen_apic.c b/hw/xen_apic.c index 8f387b6..a2eb8a1 100644 --- a/hw/xen_apic.c +++ b/hw/xen_apic.c @@ -9,9 +9,9 @@ * This work is licensed under the terms of the GNU GPL version 2 or * later. See the COPYING file in the top-level directory. */ -#include "hw/apic_internal.h" +#include "hw/i386/apic_internal.h" #include "hw/pci/msi.h" -#include "hw/xen.h" +#include "hw/xen/xen.h" static uint64_t xen_apic_mem_read(void *opaque, hwaddr addr, unsigned size) diff --git a/hw/xen_backend.c b/hw/xen_backend.c index 02693d7..2a8c9f5 100644 --- a/hw/xen_backend.c +++ b/hw/xen_backend.c @@ -37,7 +37,7 @@ #include "hw/hw.h" #include "char/char.h" #include "qemu/log.h" -#include "hw/xen_backend.h" +#include "hw/xen/xen_backend.h" #include <xen/grant_table.h> diff --git a/hw/xen_console.c b/hw/xen_console.c index c56ef47..efc3232 100644 --- a/hw/xen_console.c +++ b/hw/xen_console.c @@ -31,7 +31,7 @@ #include "hw/hw.h" #include "char/char.h" -#include "hw/xen_backend.h" +#include "hw/xen/xen_backend.h" #include <xen/io/console.h> diff --git a/hw/xen_devconfig.c b/hw/xen_devconfig.c index cdcaf62..fa998ef 100644 --- a/hw/xen_devconfig.c +++ b/hw/xen_devconfig.c @@ -1,4 +1,4 @@ -#include "hw/xen_backend.h" +#include "hw/xen/xen_backend.h" #include "sysemu/blockdev.h" /* ------------------------------------------------------------- */ diff --git a/hw/xen_disk.c b/hw/xen_disk.c index 47a51cf..532347b 100644 --- a/hw/xen_disk.c +++ b/hw/xen_disk.c @@ -36,7 +36,7 @@ #include <sys/uio.h> #include "hw/hw.h" -#include "hw/xen_backend.h" +#include "hw/xen/xen_backend.h" #include "hw/xen_blkif.h" #include "sysemu/blockdev.h" diff --git a/hw/xen_domainbuild.h b/hw/xen_domainbuild.h index 681cbe5..29a91ea 100644 --- a/hw/xen_domainbuild.h +++ b/hw/xen_domainbuild.h @@ -1,7 +1,7 @@ #ifndef QEMU_HW_XEN_DOMAINBUILD_H #define QEMU_HW_XEN_DOMAINBUILD_H 1 -#include "hw/xen_common.h" +#include "hw/xen/xen_common.h" int xenstore_domain_init1(const char *kernel, const char *ramdisk, const char *cmdline); diff --git a/hw/xen_nic.c b/hw/xen_nic.c index b6d3679..63918ae 100644 --- a/hw/xen_nic.c +++ b/hw/xen_nic.c @@ -39,7 +39,7 @@ #include "net/net.h" #include "net/checksum.h" #include "net/util.h" -#include "hw/xen_backend.h" +#include "hw/xen/xen_backend.h" #include <xen/io/netif.h> diff --git a/hw/xen_platform.c b/hw/xen_platform.c index 5e11c95..b6c6793 100644 --- a/hw/xen_platform.c +++ b/hw/xen_platform.c @@ -26,11 +26,11 @@ #include <assert.h> #include "hw/hw.h" -#include "hw/pc.h" +#include "hw/i386/pc.h" #include "hw/pci/pci.h" #include "hw/irq.h" -#include "hw/xen_common.h" -#include "hw/xen_backend.h" +#include "hw/xen/xen_common.h" +#include "hw/xen/xen_backend.h" #include "trace.h" #include "exec/address-spaces.h" diff --git a/hw/xen_pt.c b/hw/xen_pt.c index ce695d0..0cc4538 100644 --- a/hw/xen_pt.c +++ b/hw/xen_pt.c @@ -55,8 +55,8 @@ #include <sys/ioctl.h> #include "hw/pci/pci.h" -#include "hw/xen.h" -#include "hw/xen_backend.h" +#include "hw/xen/xen.h" +#include "hw/xen/xen_backend.h" #include "hw/xen_pt.h" #include "qemu/range.h" #include "exec/address-spaces.h" diff --git a/hw/xen_pt.h b/hw/xen_pt.h index 1cd9f44..d2cac18 100644 --- a/hw/xen_pt.h +++ b/hw/xen_pt.h @@ -2,7 +2,7 @@ #define XEN_PT_H #include "qemu-common.h" -#include "hw/xen_common.h" +#include "hw/xen/xen_common.h" #include "hw/pci/pci.h" #include "hw/xen-host-pci-device.h" diff --git a/hw/xen_pt_config_init.c b/hw/xen_pt_config_init.c index 5583821..3ee2adf 100644 --- a/hw/xen_pt_config_init.c +++ b/hw/xen_pt_config_init.c @@ -13,7 +13,7 @@ */ #include "qemu/timer.h" -#include "hw/xen_backend.h" +#include "hw/xen/xen_backend.h" #include "hw/xen_pt.h" #define XEN_PT_MERGE_VALUE(value, data, val_mask) \ diff --git a/hw/xen_pt_msi.c b/hw/xen_pt_msi.c index a54ee2b..dcdfc5c 100644 --- a/hw/xen_pt_msi.c +++ b/hw/xen_pt_msi.c @@ -11,9 +11,9 @@ #include <sys/mman.h> -#include "hw/xen_backend.h" +#include "hw/xen/xen_backend.h" #include "hw/xen_pt.h" -#include "hw/apic-msidef.h" +#include "hw/i386/apic-msidef.h" #define XEN_PT_AUTO_ASSIGN -1 @@ -38,7 +38,7 @@ #include "hw/hw.h" #include "ui/console.h" #include "char/char.h" -#include "hw/xen_backend.h" +#include "hw/xen/xen_backend.h" #include <xen/event_channel.h> #include <xen/io/fbif.h> diff --git a/hw/xtensa/xtensa_lx60.c b/hw/xtensa/xtensa_lx60.c index f2a63d8..5695897 100644 --- a/hw/xtensa/xtensa_lx60.c +++ b/hw/xtensa/xtensa_lx60.c @@ -31,10 +31,10 @@ #include "elf.h" #include "exec/memory.h" #include "exec/address-spaces.h" -#include "hw/serial.h" +#include "hw/char/serial.h" #include "net/net.h" #include "hw/sysbus.h" -#include "hw/flash.h" +#include "hw/block/flash.h" #include "sysemu/blockdev.h" #include "char/char.h" #include "hw/xtensa_bootparam.h" diff --git a/hw/zaurus.c b/hw/zaurus.c index 7d3258c..d853ea1 100644 --- a/hw/zaurus.c +++ b/hw/zaurus.c @@ -16,7 +16,7 @@ * with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "hw/hw.h" -#include "hw/sharpsl.h" +#include "hw/arm/sharpsl.h" #include "hw/sysbus.h" #undef REG_FMT diff --git a/hw/scsi-defs.h b/include/block/scsi.h index 9ab045b..9ab045b 100644 --- a/hw/scsi-defs.h +++ b/include/block/scsi.h diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h index 1da2400..977467b 100644 --- a/include/exec/memory-internal.h +++ b/include/exec/memory-internal.h @@ -20,7 +20,7 @@ #define MEMORY_INTERNAL_H #ifndef CONFIG_USER_ONLY -#include "hw/xen.h" +#include "hw/xen/xen.h" typedef struct PhysPageEntry PhysPageEntry; diff --git a/hw/acpi.h b/include/hw/acpi/acpi.h index e18ef28..e18ef28 100644 --- a/hw/acpi.h +++ b/include/hw/acpi/acpi.h diff --git a/hw/acpi_ich9.h b/include/hw/acpi/ich9.h index 91c3aeb..85b82ee 100644 --- a/hw/acpi_ich9.h +++ b/include/hw/acpi/ich9.h @@ -21,7 +21,7 @@ #ifndef HW_ACPI_ICH9_H #define HW_ACPI_ICH9_H -#include "hw/acpi.h" +#include "hw/acpi/acpi.h" typedef struct ICH9LPCPMRegs { /* diff --git a/hw/arm-misc.h b/include/hw/arm.h index 7b2b02d..7b2b02d 100644 --- a/hw/arm-misc.h +++ b/include/hw/arm.h diff --git a/hw/devices.h b/include/hw/arm/devices.h index c60bcab..c60bcab 100644 --- a/hw/devices.h +++ b/include/hw/arm/devices.h diff --git a/hw/exynos4210.h b/include/hw/arm/exynos4210.h index bb9a1dd..bb9a1dd 100644 --- a/hw/exynos4210.h +++ b/include/hw/arm/exynos4210.h diff --git a/hw/imx.h b/include/hw/arm/imx.h index ea9e093..ea9e093 100644 --- a/hw/imx.h +++ b/include/hw/arm/imx.h diff --git a/hw/omap.h b/include/hw/arm/omap.h index 188cda8..188cda8 100644 --- a/hw/omap.h +++ b/include/hw/arm/omap.h diff --git a/hw/primecell.h b/include/hw/arm/primecell.h index 7337c3b..7337c3b 100644 --- a/hw/primecell.h +++ b/include/hw/arm/primecell.h diff --git a/hw/pxa.h b/include/hw/arm/pxa.h index 668232c..668232c 100644 --- a/hw/pxa.h +++ b/include/hw/arm/pxa.h diff --git a/hw/sharpsl.h b/include/hw/arm/sharpsl.h index 13981a6..13981a6 100644 --- a/hw/sharpsl.h +++ b/include/hw/arm/sharpsl.h diff --git a/hw/soc_dma.h b/include/hw/arm/soc_dma.h index 7379731..7379731 100644 --- a/hw/soc_dma.h +++ b/include/hw/arm/soc_dma.h diff --git a/hw/audiodev.h b/include/hw/audio/audio.h index 428274f..428274f 100644 --- a/hw/audiodev.h +++ b/include/hw/audio/audio.h diff --git a/hw/pcspk.h b/include/hw/audio/pcspk.h index f448d22..ce8ef4f 100644 --- a/hw/pcspk.h +++ b/include/hw/audio/pcspk.h @@ -26,7 +26,7 @@ #define HW_PCSPK_H #include "hw/hw.h" -#include "hw/isa.h" +#include "hw/isa/isa.h" static inline ISADevice *pcspk_init(ISABus *bus, ISADevice *pit) { diff --git a/hw/block-common.h b/include/hw/block/block.h index dd11532..dd11532 100644 --- a/hw/block-common.h +++ b/include/hw/block/block.h diff --git a/hw/fdc.h b/include/hw/block/fdc.h index a8f6f7c..a8f6f7c 100644 --- a/hw/fdc.h +++ b/include/hw/block/fdc.h diff --git a/hw/flash.h b/include/hw/block/flash.h index 920d759..920d759 100644 --- a/hw/flash.h +++ b/include/hw/block/flash.h diff --git a/hw/boards.h b/include/hw/boards.h index 425bdc7..425bdc7 100644 --- a/hw/boards.h +++ b/include/hw/boards.h diff --git a/hw/bt.h b/include/hw/bt.h index 830af94..830af94 100644 --- a/hw/bt.h +++ b/include/hw/bt.h diff --git a/hw/escc.h b/include/hw/char/escc.h index bda3213..bda3213 100644 --- a/hw/escc.h +++ b/include/hw/char/escc.h diff --git a/hw/serial.h b/include/hw/char/serial.h index e884499..e884499 100644 --- a/hw/serial.h +++ b/include/hw/char/serial.h diff --git a/hw/etraxfs.h b/include/hw/cris/etraxfs.h index 0df4fdd..ab30559 100644 --- a/hw/etraxfs.h +++ b/include/hw/cris/etraxfs.h @@ -26,7 +26,7 @@ #define HW_EXTRAXFS_H 1 #include "net/net.h" -#include "hw/etraxfs_dma.h" +#include "hw/cris/etraxfs_dma.h" qemu_irq *cris_pic_init_cpu(CPUCRISState *env); diff --git a/hw/etraxfs_dma.h b/include/hw/cris/etraxfs_dma.h index 38104a6..38104a6 100644 --- a/hw/etraxfs_dma.h +++ b/include/hw/cris/etraxfs_dma.h diff --git a/hw/elf_ops.h b/include/hw/elf_ops.h index acc701e..acc701e 100644 --- a/hw/elf_ops.h +++ b/include/hw/elf_ops.h diff --git a/hw/empty_slot.h b/include/hw/empty_slot.h index 6079602..6079602 100644 --- a/hw/empty_slot.h +++ b/include/hw/empty_slot.h diff --git a/hw/hw.h b/include/hw/hw.h index 1fb9afa..1fb9afa 100644 --- a/hw/hw.h +++ b/include/hw/hw.h diff --git a/hw/i2c.h b/include/hw/i2c/i2c.h index 461392f..461392f 100644 --- a/hw/i2c.h +++ b/include/hw/i2c/i2c.h diff --git a/hw/pm_smbus.h b/include/hw/i2c/pm_smbus.h index e3069bf..e3069bf 100644 --- a/hw/pm_smbus.h +++ b/include/hw/i2c/pm_smbus.h diff --git a/hw/smbus.h b/include/hw/i2c/smbus.h index c3db620..d764d75 100644 --- a/hw/smbus.h +++ b/include/hw/i2c/smbus.h @@ -25,7 +25,7 @@ * THE SOFTWARE. */ -#include "hw/i2c.h" +#include "hw/i2c/i2c.h" #define TYPE_SMBUS_DEVICE "smbus-device" #define SMBUS_DEVICE(obj) \ diff --git a/hw/apic-msidef.h b/include/hw/i386/apic-msidef.h index 6e2eb71..6e2eb71 100644 --- a/hw/apic-msidef.h +++ b/include/hw/i386/apic-msidef.h diff --git a/hw/apic.h b/include/hw/i386/apic.h index 1d48e02..1d48e02 100644 --- a/hw/apic.h +++ b/include/hw/i386/apic.h diff --git a/hw/apic_internal.h b/include/hw/i386/apic_internal.h index 578241f..578241f 100644 --- a/hw/apic_internal.h +++ b/include/hw/i386/apic_internal.h diff --git a/hw/ich9.h b/include/hw/i386/ich9.h index e7d2df7..51d5981 100644 --- a/hw/ich9.h +++ b/include/hw/i386/ich9.h @@ -3,17 +3,16 @@ #include "hw/hw.h" #include "qemu/range.h" -#include "hw/isa.h" +#include "hw/isa/isa.h" #include "hw/sysbus.h" -#include "hw/pc.h" -#include "hw/apm.h" -#include "hw/ioapic.h" +#include "hw/i386/pc.h" +#include "hw/isa/apm.h" +#include "hw/i386/ioapic.h" #include "hw/pci/pci.h" #include "hw/pci/pcie_host.h" #include "hw/pci/pci_bridge.h" -#include "hw/acpi.h" -#include "hw/acpi_ich9.h" -#include "hw/pam.h" +#include "hw/acpi/acpi.h" +#include "hw/acpi/ich9.h" #include "hw/pci/pci_bus.h" void ich9_lpc_set_irq(void *opaque, int irq_num, int level); diff --git a/hw/ioapic.h b/include/hw/i386/ioapic.h index 86e63da..86e63da 100644 --- a/hw/ioapic.h +++ b/include/hw/i386/ioapic.h diff --git a/hw/ioapic_internal.h b/include/hw/i386/ioapic_internal.h index 25576c8..25576c8 100644 --- a/hw/ioapic_internal.h +++ b/include/hw/i386/ioapic_internal.h diff --git a/hw/pc.h b/include/hw/i386/pc.h index 55964ce..5d40914 100644 --- a/hw/pc.h +++ b/include/hw/i386/pc.h @@ -4,11 +4,11 @@ #include "qemu-common.h" #include "exec/memory.h" #include "exec/ioport.h" -#include "hw/isa.h" -#include "hw/fdc.h" +#include "hw/isa/isa.h" +#include "hw/block/fdc.h" #include "net/net.h" #include "exec/memory.h" -#include "hw/ioapic.h" +#include "hw/i386/ioapic.h" /* PC-style peripherals (also used by other machines). */ diff --git a/hw/smbios.h b/include/hw/i386/smbios.h index 94e3641..94e3641 100644 --- a/hw/smbios.h +++ b/include/hw/i386/smbios.h diff --git a/hw/ide.h b/include/hw/ide.h index 35444a3..507e6d3 100644 --- a/hw/ide.h +++ b/include/hw/ide.h @@ -1,7 +1,7 @@ #ifndef HW_IDE_H #define HW_IDE_H -#include "hw/isa.h" +#include "hw/isa/isa.h" #include "hw/pci/pci.h" #include "exec/memory.h" diff --git a/hw/adb.h b/include/hw/input/adb.h index bdfccd4..bdfccd4 100644 --- a/hw/adb.h +++ b/include/hw/input/adb.h diff --git a/hw/hid.h b/include/hw/input/hid.h index 56c71ed..56c71ed 100644 --- a/hw/hid.h +++ b/include/hw/input/hid.h diff --git a/hw/ps2.h b/include/hw/input/ps2.h index 7c45ce7..7c45ce7 100644 --- a/hw/ps2.h +++ b/include/hw/input/ps2.h diff --git a/hw/irq.h b/include/hw/irq.h index 610e6b7..610e6b7 100644 --- a/hw/irq.h +++ b/include/hw/irq.h diff --git a/hw/apm.h b/include/hw/isa/apm.h index 3edea5f..3edea5f 100644 --- a/hw/apm.h +++ b/include/hw/isa/apm.h diff --git a/hw/i8259_internal.h b/include/hw/isa/i8259_internal.h index 2813ec1..d3ddb27 100644 --- a/hw/i8259_internal.h +++ b/include/hw/isa/i8259_internal.h @@ -26,8 +26,8 @@ #define QEMU_I8259_INTERNAL_H #include "hw/hw.h" -#include "hw/pc.h" -#include "hw/isa.h" +#include "hw/i386/pc.h" +#include "hw/isa/isa.h" typedef struct PICCommonState PICCommonState; diff --git a/hw/isa.h b/include/hw/isa/isa.h index 82da37c..82da37c 100644 --- a/hw/isa.h +++ b/include/hw/isa/isa.h diff --git a/hw/pc87312.h b/include/hw/isa/pc87312.h index ad087c7..befc8bd 100644 --- a/hw/pc87312.h +++ b/include/hw/isa/pc87312.h @@ -25,7 +25,7 @@ #ifndef QEMU_PC87312_H #define QEMU_PC87312_H -#include "hw/isa.h" +#include "hw/isa/isa.h" #define TYPE_PC87312 "pc87312" diff --git a/hw/vt82c686.h b/include/hw/isa/vt82c686.h index 6ef876d..6ef876d 100644 --- a/hw/vt82c686.h +++ b/include/hw/isa/vt82c686.h diff --git a/hw/kvm/clock.h b/include/hw/kvm/clock.h index 252ea13..252ea13 100644 --- a/hw/kvm/clock.h +++ b/include/hw/kvm/clock.h diff --git a/hw/lm32_juart.h b/include/hw/lm32/lm32_juart.h index 67fc586..67fc586 100644 --- a/hw/lm32_juart.h +++ b/include/hw/lm32/lm32_juart.h diff --git a/hw/lm32_pic.h b/include/hw/lm32/lm32_pic.h index 5556803..5556803 100644 --- a/hw/lm32_pic.h +++ b/include/hw/lm32/lm32_pic.h diff --git a/hw/loader.h b/include/hw/loader.h index 0958f06..0958f06 100644 --- a/hw/loader.h +++ b/include/hw/loader.h diff --git a/hw/mcf.h b/include/hw/m68k/mcf.h index fbc8dc2..fbc8dc2 100644 --- a/hw/mcf.h +++ b/include/hw/m68k/mcf.h diff --git a/hw/mips-bios.h b/include/hw/mips/bios.h index b4b88ac..b4b88ac 100644 --- a/hw/mips-bios.h +++ b/include/hw/mips/bios.h diff --git a/hw/mips_cpudevs.h b/include/hw/mips/cpudevs.h index 6bea24b..6bea24b 100644 --- a/hw/mips_cpudevs.h +++ b/include/hw/mips/cpudevs.h diff --git a/hw/mips.h b/include/hw/mips/mips.h index 291e85f..291e85f 100644 --- a/hw/mips.h +++ b/include/hw/mips/mips.h diff --git a/hw/tmp105_regs.h b/include/hw/misc/tmp105_regs.h index 9b55aba..9b55aba 100644 --- a/hw/tmp105_regs.h +++ b/include/hw/misc/tmp105_regs.h diff --git a/hw/eeprom93xx.h b/include/hw/nvram/eeprom93xx.h index 8ba0e28..8ba0e28 100644 --- a/hw/eeprom93xx.h +++ b/include/hw/nvram/eeprom93xx.h diff --git a/hw/fw_cfg.h b/include/hw/nvram/fw_cfg.h index 05c8df1..05c8df1 100644 --- a/hw/fw_cfg.h +++ b/include/hw/nvram/fw_cfg.h diff --git a/hw/apb_pci.h b/include/hw/pci-host/apb.h index 736db61..736db61 100644 --- a/hw/apb_pci.h +++ b/include/hw/pci-host/apb.h diff --git a/hw/pam.h b/include/hw/pci-host/pam.h index 8e9e349..8e9e349 100644 --- a/hw/pam.h +++ b/include/hw/pci-host/pam.h diff --git a/hw/ppce500_pci.h b/include/hw/pci-host/ppce500.h index 61f773e..61f773e 100644 --- a/hw/ppce500_pci.h +++ b/include/hw/pci-host/ppce500.h diff --git a/hw/q35.h b/include/hw/pci-host/q35.h index d766bb7..6b50b5f 100644 --- a/hw/q35.h +++ b/include/hw/pci-host/q35.h @@ -24,16 +24,16 @@ #include "hw/hw.h" #include "qemu/range.h" -#include "hw/isa.h" +#include "hw/isa/isa.h" #include "hw/sysbus.h" -#include "hw/pc.h" -#include "hw/apm.h" -#include "hw/apic.h" +#include "hw/i386/pc.h" +#include "hw/isa/apm.h" +#include "hw/i386/apic.h" #include "hw/pci/pci.h" #include "hw/pci/pcie_host.h" -#include "hw/acpi.h" -#include "hw/acpi_ich9.h" -#include "hw/pam.h" +#include "hw/acpi/acpi.h" +#include "hw/acpi/ich9.h" +#include "hw/pci-host/pam.h" #define TYPE_Q35_HOST_DEVICE "q35-pcihost" #define Q35_HOST_DEVICE(obj) \ diff --git a/hw/spapr_pci.h b/include/hw/pci-host/spapr.h index 8bd8a66..b21080c 100644 --- a/hw/spapr_pci.h +++ b/include/hw/pci-host/spapr.h @@ -25,7 +25,7 @@ #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" -#include "hw/xics.h" +#include "hw/ppc/xics.h" #define SPAPR_MSIX_MAX_DEVS 32 diff --git a/hw/pci/msi.h b/include/hw/pci/msi.h index 81a3848..81a3848 100644 --- a/hw/pci/msi.h +++ b/include/hw/pci/msi.h diff --git a/hw/pci/msix.h b/include/hw/pci/msix.h index e648410..e648410 100644 --- a/hw/pci/msix.h +++ b/include/hw/pci/msix.h diff --git a/hw/pci/pci.h b/include/hw/pci/pci.h index 9ea67a3..05315c0 100644 --- a/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -8,7 +8,7 @@ #include "sysemu/dma.h" /* PCI includes legacy ISA access. */ -#include "hw/isa.h" +#include "hw/isa/isa.h" #include "hw/pci/pcie.h" diff --git a/hw/pci/pci_bridge.h b/include/hw/pci/pci_bridge.h index 1868f7a..1868f7a 100644 --- a/hw/pci/pci_bridge.h +++ b/include/hw/pci/pci_bridge.h diff --git a/hw/pci/pci_bus.h b/include/hw/pci/pci_bus.h index 6ee443c..6ee443c 100644 --- a/hw/pci/pci_bus.h +++ b/include/hw/pci/pci_bus.h diff --git a/hw/pci/pci_host.h b/include/hw/pci/pci_host.h index 236cd0f..236cd0f 100644 --- a/hw/pci/pci_host.h +++ b/include/hw/pci/pci_host.h diff --git a/hw/pci/pci_ids.h b/include/hw/pci/pci_ids.h index d8dc2f1..d8dc2f1 100644 --- a/hw/pci/pci_ids.h +++ b/include/hw/pci/pci_ids.h diff --git a/hw/pci/pci_regs.h b/include/hw/pci/pci_regs.h index 56a404b..56a404b 100644 --- a/hw/pci/pci_regs.h +++ b/include/hw/pci/pci_regs.h diff --git a/hw/pci/pcie.h b/include/hw/pci/pcie.h index c010007..c010007 100644 --- a/hw/pci/pcie.h +++ b/include/hw/pci/pcie.h diff --git a/hw/pci/pcie_aer.h b/include/hw/pci/pcie_aer.h index bcac80a..bcac80a 100644 --- a/hw/pci/pcie_aer.h +++ b/include/hw/pci/pcie_aer.h diff --git a/hw/pci/pcie_host.h b/include/hw/pci/pcie_host.h index 1228e36..1228e36 100644 --- a/hw/pci/pcie_host.h +++ b/include/hw/pci/pcie_host.h diff --git a/hw/pci/pcie_port.h b/include/hw/pci/pcie_port.h index d89aa61..d89aa61 100644 --- a/hw/pci/pcie_port.h +++ b/include/hw/pci/pcie_port.h diff --git a/hw/pci/pcie_regs.h b/include/hw/pci/pcie_regs.h index 4d123d9..4d123d9 100644 --- a/hw/pci/pcie_regs.h +++ b/include/hw/pci/pcie_regs.h diff --git a/hw/pci/shpc.h b/include/hw/pci/shpc.h index 467911a..467911a 100644 --- a/hw/pci/shpc.h +++ b/include/hw/pci/shpc.h diff --git a/hw/pci/slotid_cap.h b/include/hw/pci/slotid_cap.h index 70db047..70db047 100644 --- a/hw/pci/slotid_cap.h +++ b/include/hw/pci/slotid_cap.h diff --git a/hw/pcmcia.h b/include/hw/pcmcia.h index f916693..f916693 100644 --- a/hw/pcmcia.h +++ b/include/hw/pcmcia.h diff --git a/hw/mac_dbdma.h b/include/hw/ppc/mac_dbdma.h index 691263e..691263e 100644 --- a/hw/mac_dbdma.h +++ b/include/hw/ppc/mac_dbdma.h diff --git a/hw/openpic.h b/include/hw/ppc/openpic.h index 9dcaf0e..9dcaf0e 100644 --- a/hw/openpic.h +++ b/include/hw/ppc/openpic.h diff --git a/hw/ppc.h b/include/hw/ppc/ppc.h index acaf0d6..acaf0d6 100644 --- a/hw/ppc.h +++ b/include/hw/ppc/ppc.h diff --git a/hw/ppc4xx.h b/include/hw/ppc/ppc4xx.h index 91d84ba..91d84ba 100644 --- a/hw/ppc4xx.h +++ b/include/hw/ppc/ppc4xx.h diff --git a/hw/spapr.h b/include/hw/ppc/spapr.h index 3a1f69f..864bee9 100644 --- a/hw/spapr.h +++ b/include/hw/ppc/spapr.h @@ -2,7 +2,7 @@ #define __HW_SPAPR_H__ #include "sysemu/dma.h" -#include "hw/xics.h" +#include "hw/ppc/xics.h" struct VIOsPAPRBus; struct sPAPRPHBState; diff --git a/hw/spapr_vio.h b/include/hw/ppc/spapr_vio.h index f98ec0a..f98ec0a 100644 --- a/hw/spapr_vio.h +++ b/include/hw/ppc/spapr_vio.h diff --git a/hw/xics.h b/include/hw/ppc/xics.h index 6bce042..6bce042 100644 --- a/hw/xics.h +++ b/include/hw/ppc/xics.h diff --git a/hw/ptimer.h b/include/hw/ptimer.h index 28fcaf1..28fcaf1 100644 --- a/hw/ptimer.h +++ b/include/hw/ptimer.h diff --git a/hw/qdev-addr.h b/include/hw/qdev-addr.h index 79708e6..79708e6 100644 --- a/hw/qdev-addr.h +++ b/include/hw/qdev-addr.h diff --git a/hw/qdev-core.h b/include/hw/qdev-core.h index 547fbc7..547fbc7 100644 --- a/hw/qdev-core.h +++ b/include/hw/qdev-core.h diff --git a/hw/qdev-dma.h b/include/hw/qdev-dma.h index 6812735..6812735 100644 --- a/hw/qdev-dma.h +++ b/include/hw/qdev-dma.h diff --git a/hw/qdev-properties.h b/include/hw/qdev-properties.h index a379339..a379339 100644 --- a/hw/qdev-properties.h +++ b/include/hw/qdev-properties.h diff --git a/hw/qdev.h b/include/hw/qdev.h index 5cb8b08..5cb8b08 100644 --- a/hw/qdev.h +++ b/include/hw/qdev.h diff --git a/hw/s390x/event-facility.h b/include/hw/s390x/event-facility.h index 791ab2a..791ab2a 100644 --- a/hw/s390x/event-facility.h +++ b/include/hw/s390x/event-facility.h diff --git a/hw/s390x/sclp.h b/include/hw/s390x/sclp.h index 231a38a..231a38a 100644 --- a/hw/s390x/sclp.h +++ b/include/hw/s390x/sclp.h diff --git a/hw/esp.h b/include/hw/scsi/esp.h index 830673b..e079fb8 100644 --- a/hw/esp.h +++ b/include/hw/scsi/esp.h @@ -1,7 +1,7 @@ #ifndef QEMU_HW_ESP_H #define QEMU_HW_ESP_H -#include "hw/scsi.h" +#include "hw/scsi/scsi.h" /* esp.c */ #define ESP_MAX_DEVS 7 diff --git a/hw/scsi.h b/include/hw/scsi/scsi.h index 02a1497..3bda1c4 100644 --- a/hw/scsi.h +++ b/include/hw/scsi/scsi.h @@ -3,7 +3,7 @@ #include "hw/qdev.h" #include "block/block.h" -#include "hw/block-common.h" +#include "hw/block/block.h" #include "sysemu/sysemu.h" #define MAX_SCSI_DEVS 255 diff --git a/hw/sd.h b/include/hw/sd.h index d9b97e4..d9b97e4 100644 --- a/hw/sd.h +++ b/include/hw/sd.h diff --git a/hw/sh.h b/include/hw/sh4/sh.h index 6230954..87c378f 100644 --- a/hw/sh.h +++ b/include/hw/sh4/sh.h @@ -2,7 +2,7 @@ #define QEMU_SH_H /* Definitions for SH board emulation. */ -#include "hw/sh_intc.h" +#include "hw/sh4/sh_intc.h" #define A7ADDR(x) ((x) & 0x1fffffff) #define P4ADDR(x) ((x) | 0xe0000000) diff --git a/hw/sh_intc.h b/include/hw/sh4/sh_intc.h index b7ddcb0..b7ddcb0 100644 --- a/hw/sh_intc.h +++ b/include/hw/sh4/sh_intc.h diff --git a/hw/firmware_abi.h b/include/hw/sparc/firmware_abi.h index 5e6e5d4..5e6e5d4 100644 --- a/hw/firmware_abi.h +++ b/include/hw/sparc/firmware_abi.h diff --git a/hw/grlib.h b/include/hw/sparc/grlib.h index 470ce72..470ce72 100644 --- a/hw/grlib.h +++ b/include/hw/sparc/grlib.h diff --git a/hw/sparc32_dma.h b/include/hw/sparc/sparc32_dma.h index 9497b13..9497b13 100644 --- a/hw/sparc32_dma.h +++ b/include/hw/sparc/sparc32_dma.h diff --git a/hw/sun4m.h b/include/hw/sparc/sun4m.h index 0d2cfb8..e984671 100644 --- a/hw/sun4m.h +++ b/include/hw/sparc/sun4m.h @@ -31,6 +31,6 @@ void sun4m_pic_info(Monitor *mon, const QDict *qdict); void sun4m_irq_info(Monitor *mon, const QDict *qdict); /* sparc32_dma.c */ -#include "hw/sparc32_dma.h" +#include "hw/sparc/sparc32_dma.h" #endif diff --git a/hw/ssi.h b/include/hw/ssi.h index fdae317..fdae317 100644 --- a/hw/ssi.h +++ b/include/hw/ssi.h diff --git a/hw/stream.h b/include/hw/stream.h index f6137d6..f6137d6 100644 --- a/hw/stream.h +++ b/include/hw/stream.h diff --git a/hw/sysbus.h b/include/hw/sysbus.h index 7c2e316..7c2e316 100644 --- a/hw/sysbus.h +++ b/include/hw/sysbus.h diff --git a/hw/hpet_emul.h b/include/hw/timer/hpet.h index 757f79f..757f79f 100644 --- a/hw/hpet_emul.h +++ b/include/hw/timer/hpet.h diff --git a/hw/i8254.h b/include/hw/timer/i8254.h index 7d4432e..75bb530 100644 --- a/hw/i8254.h +++ b/include/hw/timer/i8254.h @@ -26,7 +26,7 @@ #define HW_I8254_H #include "hw/hw.h" -#include "hw/isa.h" +#include "hw/isa/isa.h" #define PIT_FREQ 1193182 diff --git a/hw/i8254_internal.h b/include/hw/timer/i8254_internal.h index 30d5b1b..e0cff0c 100644 --- a/hw/i8254_internal.h +++ b/include/hw/timer/i8254_internal.h @@ -26,8 +26,8 @@ #define QEMU_I8254_INTERNAL_H #include "hw/hw.h" -#include "hw/pc.h" -#include "hw/isa.h" +#include "hw/i386/pc.h" +#include "hw/isa/isa.h" typedef struct PITChannelState { int count; /* can be 65536 */ diff --git a/hw/nvram.h b/include/hw/timer/m48t59.h index 59337fa..59337fa 100644 --- a/hw/nvram.h +++ b/include/hw/timer/m48t59.h diff --git a/hw/mc146818rtc.h b/include/hw/timer/mc146818rtc.h index 967403e..854ea3f 100644 --- a/hw/mc146818rtc.h +++ b/include/hw/timer/mc146818rtc.h @@ -1,8 +1,8 @@ #ifndef MC146818RTC_H #define MC146818RTC_H -#include "hw/isa.h" -#include "hw/mc146818rtc_regs.h" +#include "hw/isa/isa.h" +#include "hw/timer/mc146818rtc_regs.h" ISADevice *rtc_init(ISABus *bus, int base_year, qemu_irq intercept_irq); void rtc_set_memory(ISADevice *dev, int addr, int val); diff --git a/hw/mc146818rtc_regs.h b/include/hw/timer/mc146818rtc_regs.h index ccdee42..ccdee42 100644 --- a/hw/mc146818rtc_regs.h +++ b/include/hw/timer/mc146818rtc_regs.h diff --git a/hw/puv3.h b/include/hw/unicore32/puv3.h index f37adcb..f37adcb 100644 --- a/hw/puv3.h +++ b/include/hw/unicore32/puv3.h diff --git a/hw/usb.h b/include/hw/usb.h index 1b10684..1b10684 100644 --- a/hw/usb.h +++ b/include/hw/usb.h diff --git a/hw/dataplane/hostmem.h b/include/hw/virtio/dataplane/hostmem.h index b2cf093..b2cf093 100644 --- a/hw/dataplane/hostmem.h +++ b/include/hw/virtio/dataplane/hostmem.h diff --git a/hw/dataplane/vring.h b/include/hw/virtio/dataplane/vring.h index defb1ef..9380cb5 100644 --- a/hw/dataplane/vring.h +++ b/include/hw/virtio/dataplane/vring.h @@ -20,7 +20,7 @@ #include <linux/virtio_ring.h> #include "qemu-common.h" #include "hostmem.h" -#include "hw/virtio.h" +#include "hw/virtio/virtio.h" typedef struct { HostMem hostmem; /* guest memory mapper */ diff --git a/hw/vhost.h b/include/hw/virtio/vhost.h index f062d48..b373be0 100644 --- a/hw/vhost.h +++ b/include/hw/virtio/vhost.h @@ -2,7 +2,7 @@ #define VHOST_H #include "hw/hw.h" -#include "hw/virtio.h" +#include "hw/virtio/virtio.h" #include "exec/memory.h" /* Generic structures common for any vhost based device. */ diff --git a/hw/9pfs/virtio-9p-device.h b/include/hw/virtio/virtio-9p.h index 65789db..65789db 100644 --- a/hw/9pfs/virtio-9p-device.h +++ b/include/hw/virtio/virtio-9p.h diff --git a/hw/virtio-balloon.h b/include/hw/virtio/virtio-balloon.h index d898315..3b459bb 100644 --- a/hw/virtio-balloon.h +++ b/include/hw/virtio/virtio-balloon.h @@ -15,7 +15,7 @@ #ifndef _QEMU_VIRTIO_BALLOON_H #define _QEMU_VIRTIO_BALLOON_H -#include "hw/virtio.h" +#include "hw/virtio/virtio.h" #include "hw/pci/pci.h" #define TYPE_VIRTIO_BALLOON "virtio-balloon" diff --git a/hw/virtio-blk.h b/include/hw/virtio/virtio-blk.h index 8c6c78b..c10d069 100644 --- a/hw/virtio-blk.h +++ b/include/hw/virtio/virtio-blk.h @@ -14,11 +14,8 @@ #ifndef _QEMU_VIRTIO_BLK_H #define _QEMU_VIRTIO_BLK_H -#include "hw/virtio.h" -#include "hw/block-common.h" -#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE -#include "dataplane/virtio-blk.h" -#endif +#include "hw/virtio/virtio.h" +#include "hw/block/block.h" #define TYPE_VIRTIO_BLK "virtio-blk" #define VIRTIO_BLK(obj) \ @@ -115,6 +112,8 @@ struct VirtIOBlkConf uint32_t data_plane; }; +struct VirtIOBlockDataPlane; + typedef struct VirtIOBlock { VirtIODevice parent_obj; BlockDriverState *bs; @@ -126,7 +125,7 @@ typedef struct VirtIOBlock { unsigned short sector_mask; VMChangeStateEntry *change; #ifdef CONFIG_VIRTIO_BLK_DATA_PLANE - VirtIOBlockDataPlane *dataplane; + struct VirtIOBlockDataPlane *dataplane; #endif } VirtIOBlock; diff --git a/hw/virtio-bus.h b/include/hw/virtio/virtio-bus.h index ae0f707..311e8c7 100644 --- a/hw/virtio-bus.h +++ b/include/hw/virtio/virtio-bus.h @@ -27,7 +27,7 @@ #include "hw/qdev.h" #include "sysemu/sysemu.h" -#include "hw/virtio.h" +#include "hw/virtio/virtio.h" #define TYPE_VIRTIO_BUS "virtio-bus" #define VIRTIO_BUS_GET_CLASS(obj) \ diff --git a/hw/virtio-net.h b/include/hw/virtio/virtio-net.h index 4d1a8cd..d2cc996 100644 --- a/hw/virtio-net.h +++ b/include/hw/virtio/virtio-net.h @@ -14,7 +14,7 @@ #ifndef _QEMU_VIRTIO_NET_H #define _QEMU_VIRTIO_NET_H -#include "hw/virtio.h" +#include "hw/virtio/virtio.h" #include "hw/pci/pci.h" #define ETH_ALEN 6 diff --git a/hw/virtio-rng.h b/include/hw/virtio/virtio-rng.h index 3711c97..3711c97 100644 --- a/hw/virtio-rng.h +++ b/include/hw/virtio/virtio-rng.h diff --git a/hw/virtio-scsi.h b/include/hw/virtio/virtio-scsi.h index 31e97bb..c9d92ca 100644 --- a/hw/virtio-scsi.h +++ b/include/hw/virtio/virtio-scsi.h @@ -14,9 +14,9 @@ #ifndef _QEMU_VIRTIO_SCSI_H #define _QEMU_VIRTIO_SCSI_H -#include "hw/virtio.h" +#include "hw/virtio/virtio.h" #include "hw/pci/pci.h" -#include "hw/scsi.h" +#include "hw/scsi/scsi.h" #define TYPE_VIRTIO_SCSI "virtio-scsi" #define VIRTIO_SCSI(obj) \ diff --git a/hw/virtio-serial.h b/include/hw/virtio/virtio-serial.h index 516400f..098deea 100644 --- a/hw/virtio-serial.h +++ b/include/hw/virtio/virtio-serial.h @@ -16,7 +16,7 @@ #define _QEMU_VIRTIO_SERIAL_H #include "hw/qdev.h" -#include "hw/virtio.h" +#include "hw/virtio/virtio.h" /* == Interface shared between the guest kernel and qemu == */ diff --git a/hw/virtio.h b/include/hw/virtio/virtio.h index fdbe931..7e24b2b 100644 --- a/hw/virtio.h +++ b/include/hw/virtio/virtio.h @@ -20,7 +20,7 @@ #include "sysemu/sysemu.h" #include "qemu/event_notifier.h" #ifdef CONFIG_VIRTFS -#include "hw/9pfs/virtio-9p-device.h" +#include "hw/virtio/virtio-9p.h" #endif /* from Linux's linux/virtio_config.h */ diff --git a/hw/xen.h b/include/hw/xen/xen.h index 6235f91..6235f91 100644 --- a/hw/xen.h +++ b/include/hw/xen/xen.h diff --git a/hw/xen_backend.h b/include/hw/xen/xen_backend.h index d04b985..3b7d96d 100644 --- a/hw/xen_backend.h +++ b/include/hw/xen/xen_backend.h @@ -1,7 +1,7 @@ #ifndef QEMU_HW_XEN_BACKEND_H #define QEMU_HW_XEN_BACKEND_H 1 -#include "hw/xen_common.h" +#include "hw/xen/xen_common.h" #include "sysemu/sysemu.h" #include "net/net.h" diff --git a/hw/xen_common.h b/include/hw/xen/xen_common.h index c37bde3..2d5a25b 100644 --- a/hw/xen_common.h +++ b/include/hw/xen/xen_common.h @@ -15,7 +15,7 @@ #include <xen/io/xenbus.h> #include "hw/hw.h" -#include "hw/xen.h" +#include "hw/xen/xen.h" #include "qemu/queue.h" /* diff --git a/hw/xilinx.h b/include/hw/xilinx.h index 6c1ee21..6c1ee21 100644 --- a/hw/xilinx.h +++ b/include/hw/xilinx.h diff --git a/hw/vhost_net.h b/include/net/vhost_net.h index 2d936bb..2d936bb 100644 --- a/hw/vhost_net.h +++ b/include/net/vhost_net.h diff --git a/hw/watchdog.h b/include/sysemu/watchdog.h index 3e9a970..3e9a970 100644 --- a/hw/watchdog.h +++ b/include/sysemu/watchdog.h @@ -26,9 +26,9 @@ #include "monitor/qdev.h" #include "hw/usb.h" #include "hw/pcmcia.h" -#include "hw/pc.h" +#include "hw/i386/pc.h" #include "hw/pci/pci.h" -#include "hw/watchdog.h" +#include "sysemu/watchdog.h" #include "hw/loader.h" #include "exec/gdbstub.h" #include "net/net.h" @@ -71,9 +71,9 @@ /* for pic/irq_info */ #if defined(TARGET_SPARC) -#include "hw/sun4m.h" +#include "hw/sparc/sun4m.h" #endif -#include "hw/lm32_pic.h" +#include "hw/lm32/lm32_pic.h" //#define DEBUG //#define DEBUG_COMPLETION @@ -42,7 +42,7 @@ #include "net/tap.h" -#include "hw/vhost_net.h" +#include "net/vhost_net.h" typedef struct TAPState { NetClientState nc; diff --git a/pc-bios/optionrom/optionrom.h b/pc-bios/optionrom/optionrom.h index 3daf7da..ce43608 100644 --- a/pc-bios/optionrom/optionrom.h +++ b/pc-bios/optionrom/optionrom.h @@ -20,7 +20,7 @@ #define NO_QEMU_PROTOS -#include "../../hw/fw_cfg.h" +#include "../../include/hw/nvram/fw_cfg.h" #define BIOS_CFG_IOPORT_CFG 0x510 #define BIOS_CFG_IOPORT_DATA 0x511 diff --git a/target-arm/arm-semi.c b/target-arm/arm-semi.c index 847318d..77718c4 100644 --- a/target-arm/arm-semi.c +++ b/target-arm/arm-semi.c @@ -34,7 +34,7 @@ #else #include "qemu-common.h" #include "exec/gdbstub.h" -#include "hw/arm-misc.h" +#include "hw/arm.h" #endif #define TARGET_SYS_OPEN 0x01 diff --git a/target-arm/kvm.c b/target-arm/kvm.c index 82e2e08..6bfb103 100644 --- a/target-arm/kvm.c +++ b/target-arm/kvm.c @@ -21,7 +21,7 @@ #include "sysemu/kvm.h" #include "kvm_arm.h" #include "cpu.h" -#include "hw/arm-misc.h" +#include "hw/arm.h" const KVMCapabilityInfo kvm_arch_required_capabilities[] = { KVM_CAP_LAST_INFO diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 69c3570..356378c 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -42,9 +42,9 @@ #include "sysemu/sysemu.h" #ifndef CONFIG_USER_ONLY -#include "hw/xen.h" +#include "hw/xen/xen.h" #include "hw/sysbus.h" -#include "hw/apic_internal.h" +#include "hw/i386/apic_internal.h" #endif static void x86_cpu_vendor_words2str(char *dst, uint32_t vendor1, diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 069a2e2..2b4e319 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -1164,7 +1164,7 @@ static inline void cpu_clone_regs(CPUX86State *env, target_ulong newsp) #include "svm.h" #if !defined(CONFIG_USER_ONLY) -#include "hw/apic.h" +#include "hw/i386/apic.h" #endif static inline bool cpu_has_work(CPUState *cs) diff --git a/target-i386/kvm.c b/target-i386/kvm.c index df30fa6..397afeb 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -28,8 +28,8 @@ #include "exec/gdbstub.h" #include "qemu/host-utils.h" #include "qemu/config-file.h" -#include "hw/pc.h" -#include "hw/apic.h" +#include "hw/i386/pc.h" +#include "hw/i386/apic.h" #include "exec/ioport.h" #include "hyperv.h" #include "hw/pci/pci.h" diff --git a/target-i386/machine.c b/target-i386/machine.c index b80a5f4..ee85e57 100644 --- a/target-i386/machine.c +++ b/target-i386/machine.c @@ -1,7 +1,7 @@ #include "hw/hw.h" #include "hw/boards.h" -#include "hw/pc.h" -#include "hw/isa.h" +#include "hw/i386/pc.h" +#include "hw/isa/isa.h" #include "cpu.h" #include "sysemu/kvm.h" diff --git a/target-lm32/op_helper.c b/target-lm32/op_helper.c index 7ff991e..f106873 100644 --- a/target-lm32/op_helper.c +++ b/target-lm32/op_helper.c @@ -3,8 +3,8 @@ #include "helper.h" #include "qemu/host-utils.h" -#include "hw/lm32_pic.h" -#include "hw/lm32_juart.h" +#include "hw/lm32/lm32_pic.h" +#include "hw/lm32/lm32_juart.h" #if !defined(CONFIG_USER_ONLY) #define MMUSUFFIX _mmu diff --git a/target-lm32/translate.c b/target-lm32/translate.c index e885bb3..af9ce8c 100644 --- a/target-lm32/translate.c +++ b/target-lm32/translate.c @@ -22,7 +22,7 @@ #include "helper.h" #include "tcg-op.h" -#include "hw/lm32_pic.h" +#include "hw/lm32/lm32_pic.h" #define GEN_HELPER 1 #include "helper.h" diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c index 597066f..5e9dddb 100644 --- a/target-ppc/kvm.c +++ b/target-ppc/kvm.c @@ -31,12 +31,12 @@ #include "sysemu/cpus.h" #include "sysemu/device_tree.h" #include "hw/sysbus.h" -#include "hw/spapr.h" +#include "hw/ppc/spapr.h" #include "mmu-hash64.h" #include "hw/sysbus.h" -#include "hw/spapr.h" -#include "hw/spapr_vio.h" +#include "hw/ppc/spapr.h" +#include "hw/ppc/spapr_vio.h" //#define DEBUG_KVM diff --git a/target-sh4/helper.c b/target-sh4/helper.c index 0a9cb3a..ce10ca8 100644 --- a/target-sh4/helper.c +++ b/target-sh4/helper.c @@ -26,7 +26,7 @@ #include "cpu.h" #if !defined(CONFIG_USER_ONLY) -#include "hw/sh_intc.h" +#include "hw/sh4/sh_intc.h" #endif #if defined(CONFIG_USER_ONLY) diff --git a/tests/rtc-test.c b/tests/rtc-test.c index 9ab583b..3395d7f 100644 --- a/tests/rtc-test.c +++ b/tests/rtc-test.c @@ -11,7 +11,7 @@ * */ #include "libqtest.h" -#include "hw/mc146818rtc_regs.h" +#include "hw/timer/mc146818rtc_regs.h" #include <glib.h> #include <stdio.h> diff --git a/tests/tmp105-test.c b/tests/tmp105-test.c index a6ad213..2869129 100644 --- a/tests/tmp105-test.c +++ b/tests/tmp105-test.c @@ -8,7 +8,7 @@ */ #include "libqtest.h" #include "libi2c.h" -#include "hw/tmp105_regs.h" +#include "hw/misc/tmp105_regs.h" #include <glib.h> diff --git a/tpm/tpm_passthrough.c b/tpm/tpm_passthrough.c index 80a48d6..1fdd66d 100644 --- a/tpm/tpm_passthrough.c +++ b/tpm/tpm_passthrough.c @@ -30,7 +30,7 @@ #include "backends/tpm.h" #include "tpm_int.h" #include "hw/hw.h" -#include "hw/pc.h" +#include "hw/i386/pc.h" #include "tpm_tis.h" #include "tpm_backend.h" diff --git a/tpm/tpm_tis.c b/tpm/tpm_tis.c index 367f734..f0a45846 100644 --- a/tpm/tpm_tis.c +++ b/tpm/tpm_tis.c @@ -24,7 +24,7 @@ #include "block/block.h" #include "exec/address-spaces.h" #include "hw/hw.h" -#include "hw/pc.h" +#include "hw/i386/pc.h" #include "hw/pci/pci_ids.h" #include "tpm/tpm_tis.h" #include "qemu-common.h" diff --git a/tpm/tpm_tis.h b/tpm/tpm_tis.h index 7f216e5..1be4ddc 100644 --- a/tpm/tpm_tis.h +++ b/tpm/tpm_tis.h @@ -17,7 +17,7 @@ #ifndef TPM_TPM_TIS_H #define TPM_TPM_TIS_H -#include "hw/isa.h" +#include "hw/isa/isa.h" #include "qemu-common.h" #define TPM_TIS_ADDR_BASE 0xFED40000 @@ -117,12 +117,12 @@ int main(int argc, char **argv) #include "hw/boards.h" #include "hw/usb.h" #include "hw/pcmcia.h" -#include "hw/pc.h" -#include "hw/isa.h" +#include "hw/i386/pc.h" +#include "hw/isa/isa.h" #include "hw/bt.h" -#include "hw/watchdog.h" -#include "hw/smbios.h" -#include "hw/xen.h" +#include "sysemu/watchdog.h" +#include "hw/i386/smbios.h" +#include "hw/xen/xen.h" #include "hw/qdev.h" #include "hw/loader.h" #include "monitor/qdev.h" @@ -137,7 +137,7 @@ int main(int argc, char **argv) #include "char/char.h" #include "qemu/cache-utils.h" #include "sysemu/blockdev.h" -#include "hw/block-common.h" +#include "hw/block/block.h" #include "migration/block.h" #include "tpm/tpm.h" #include "sysemu/dma.h" @@ -11,9 +11,9 @@ #include <sys/mman.h> #include "hw/pci/pci.h" -#include "hw/pc.h" -#include "hw/xen_common.h" -#include "hw/xen_backend.h" +#include "hw/i386/pc.h" +#include "hw/xen/xen_common.h" +#include "hw/xen/xen_backend.h" #include "qmp-commands.h" #include "char/char.h" diff --git a/xen-mapcache.c b/xen-mapcache.c index 5a626cd..eda914a 100644 --- a/xen-mapcache.c +++ b/xen-mapcache.c @@ -12,7 +12,7 @@ #include <sys/resource.h> -#include "hw/xen_backend.h" +#include "hw/xen/xen_backend.h" #include "sysemu/blockdev.h" #include "qemu/bitmap.h" @@ -9,7 +9,7 @@ */ #include "qemu-common.h" -#include "hw/xen.h" +#include "hw/xen/xen.h" #include "exec/memory.h" #include "qmp-commands.h" |
