From: Paolo Bonzini Date: Tue, 5 Feb 2013 16:06:20 +0000 (+0100) Subject: hw: move headers to include/ X-Git-Tag: v1.5.0-rc0~313^2~33 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0d09e41a51aa0752b1ce525ce084f7cd210e461b;p=thirdparty%2Fqemu.git hw: move headers to include/ Many of these should be cleaned up with proper qdev-/QOM-ification. Right now there are many catch-all headers in include/hw/ARCH depending on cpu.h, and this makes it necessary to compile these files per-target. However, fixing this does not belong in these patches. Signed-off-by: Paolo Bonzini --- diff --git a/arch_init.c b/arch_init.c index c2cbc71c31c..769ce77e61d 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 51a28894522..92d6eae76f2 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 #include #ifdef __linux__ #include -#include +#include #endif typedef struct IscsiLun { diff --git a/blockdev-nbd.c b/blockdev-nbd.c index dc4e9a2462c..95f10c81e3f 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" diff --git a/blockdev.c b/blockdev.c index 6dc999d802b..8a1652b7224 100644 --- a/blockdev.c +++ b/blockdev.c @@ -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" diff --git a/exec.c b/exec.c index 786987a0165..fa1e0c3d736 100644 --- a/exec.c +++ b/exec.c @@ -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" diff --git a/gdbstub.c b/gdbstub.c index a0288a77fb2..22ab12c68ce 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -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 d321c802f24..43f930e9205 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 e30fdb6730e..fe8e0ed19dc 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 diff --git a/hw/9pfs/virtio-9p-local.c b/hw/9pfs/virtio-9p-local.c index f1b1c83a226..be898eccd91 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 diff --git a/hw/9pfs/virtio-9p-posix-acl.c b/hw/9pfs/virtio-9p-posix-acl.c index 08bb0e8bcaf..339c5ecae44 100644 --- a/hw/9pfs/virtio-9p-posix-acl.c +++ b/hw/9pfs/virtio-9p-posix-acl.c @@ -13,7 +13,7 @@ #include #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 730027900e7..8ba2959dbb3 100644 --- a/hw/9pfs/virtio-9p-proxy.c +++ b/hw/9pfs/virtio-9p-proxy.c @@ -11,7 +11,7 @@ */ #include #include -#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 e95a856d25e..840e4ebb5ae 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 5bb60200709..e0c92ebf9e5 100644 --- a/hw/9pfs/virtio-9p-xattr-user.c +++ b/hw/9pfs/virtio-9p-xattr-user.c @@ -12,7 +12,7 @@ */ #include -#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 a83960676d1..90ae565c191 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 5cc4c92012a..db2ae32fe8c 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 52b1c6997f1..95a8ec3ba9e 100644 --- a/hw/9pfs/virtio-9p.h +++ b/hw/9pfs/virtio-9p.h @@ -6,7 +6,7 @@ #include #include #include -#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" diff --git a/hw/ac97.c b/hw/ac97.c index c7d601fdb7d..ab68ec6204c 100644 --- a/hw/ac97.c +++ b/hw/ac97.c @@ -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" diff --git a/hw/acpi.c b/hw/acpi.c index 856da81f0c7..64b871846d4 100644 --- a/hw/acpi.c +++ b/hw/acpi.c @@ -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 7b34a038661..e663d297a15 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 48a32b5aa05..88386d7ea7f 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 diff --git a/hw/adb.c b/hw/adb.c index fd9052c16b0..a75d3fd7b9b 100644 --- a/hw/adb.c +++ b/hw/adb.c @@ -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 */ diff --git a/hw/adlib.c b/hw/adlib.c index e6bce59512d..133c0ff7b11 100644 --- a/hw/adlib.c +++ b/hw/adlib.c @@ -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 13aaa57b903..a0dd12ce79b 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 b4ebd2a9cc6..50e7730caaf 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 b1e0044a356..41a0ebc7a3c 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 754ca6ca8f7..fe15ae8f8a6 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" diff --git a/hw/apic.c b/hw/apic.c index d2395f04dd9..2d79a9ea7f6 100644 --- a/hw/apic.c +++ b/hw/apic.c @@ -17,14 +17,14 @@ * License along with this library; if not, see */ #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 37985097caa..e0ae07afd51 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 */ -#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" diff --git a/hw/apm.c b/hw/apm.c index e2846f99c84..5f21d214730 100644 --- a/hw/apm.c +++ b/hw/apm.c @@ -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 44b9bacd88a..c29558bdd58 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 1d5bb592c49..a4bdd5f30f3 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 43253fd34a2..c79c590171a 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 17fddc8d5b0..76eda8e8b06 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 4592514bb26..78b8b7407a4 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 473da349bd1..ba14a1fd099 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 8859b7392fe..4d800c9547d 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 a622224dcce..58f73c1bd30 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 e0ba327a554..8d0fb7584ab 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 ec50a319acb..46264cdeacb 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 aea908f0365..b78e6f00d30 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 ea8473db3ec..97b13405e65 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 b28e7d372f1..ba8dc3e01ad 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 3245c62e68f..17caa618221 100644 --- a/hw/arm/omap1.c +++ b/hw/arm/omap1.c @@ -17,10 +17,10 @@ * with this program; if not, see . */ #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 0a2cd7bab66..010c483e8ce 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 85982334bdb..aa85602aa6e 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 baeb5850673..0bc11aed2bd 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 3a3f06566b0..787767f51f6 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 b7ca511d45c..bbecc770ed8 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 55ebcd724a8..fa31575edd3 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 25e90895e1d..835d07c3410 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 5fb490c832a..afd52d31bef 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 f5832bea935..fa434dc68eb 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 f4ce7945f39..952087ce2dd 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 747888c64e1..c4362d43134 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 baaa265888a..d9be6044818 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 2e1a5d0e5b5..96e098579f8 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 5b9257a9de6..8d65f796f99 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 cbb6d8085e1..3e272088f53 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 25fc6eac946..c8b55a83493 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 235120024f5..75742601cb0 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 e86062742c6..2866ac351b7 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 020d3de4319..bdb0b15ddb2 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 d21ec3ada12..33dd3f33b61 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 e58655a64d2..974150bfc11 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 69ccf9b4329..af494e1e06b 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 { diff --git a/hw/cbus.c b/hw/cbus.c index 29b467b61fd..3d9027f6922 100644 --- a/hw/cbus.c +++ b/hw/cbus.c @@ -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 diff --git a/hw/cdrom.c b/hw/cdrom.c index a018eec40aa..38469fa9289 100644 --- a/hw/cdrom.c +++ b/hw/cdrom.c @@ -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 eccd423abfb..00daceb8139 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 85c68c04971..bd47bf1a5d0 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 f005f258991..5711b62f83f 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" diff --git a/hw/cuda.c b/hw/cuda.c index 2ae430d326e..f797796a36d 100644 --- a/hw/cuda.c +++ b/hw/cuda.c @@ -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 380537e06d8..37292ffd00e 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 1242d61e71f..5baef2391aa 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 1e8fdfe4183..c90e99f48ff 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 e3b225315ff..e0d6e836250 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 cab7691b12e..0588eebb773 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 ba67a8fb415..59bed5bff55 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) \ diff --git a/hw/dma.c b/hw/dma.c index fd1161ca312..eb60d45178e 100644 --- a/hw/dma.c +++ b/hw/dma.c @@ -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 8b5ca6a4ece..2289f089ad1 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 ae7ca9f82da..8987cdc9e06 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. diff --git a/hw/ecc.c b/hw/ecc.c index 8c97c33debd..8c888cc12a5 100644 --- a/hw/ecc.c +++ b/hw/ecc.c @@ -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 68d729c17af..dc99ea6ea07 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 39f560553d1..08f4df586cd 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 e64cf23099e..9fe57087bf6 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" diff --git a/hw/escc.c b/hw/escc.c index baf02193043..067b055fee0 100644 --- a/hw/escc.c +++ b/hw/escc.c @@ -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 7599b39d8d5..3ca5c8c673b 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" diff --git a/hw/esp.c b/hw/esp.c index 5365eacec0f..17adbecf8c0 100644 --- a/hw/esp.c +++ b/hw/esp.c @@ -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 a84ec1f23ce..6a8c2225023 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 591bee245cc..1039913e0f1 100644 --- a/hw/etraxfs_eth.c +++ b/hw/etraxfs_eth.c @@ -25,7 +25,7 @@ #include #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 5818f101324..6874287302c 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 807849c5741..bad6dde652c 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 9e428759a11..196f88907da 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 862c96212bc..87ce75b6436 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 6d74cd4db5f..185ccb9a74e 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 d170ca755ad..bceee44cb26 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 006f3d44fb1..8b4e72ca11e 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 diff --git a/hw/fdc.c b/hw/fdc.c index a4bb1290eff..1ed874f0741 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -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 63a199876cf..97bba874e37 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 7ee469d1911..68dfe6a4bb6 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 37be9c2a566..189e865a653 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 diff --git a/hw/gus.c b/hw/gus.c index d2682249ca5..e44704b1cf8 100644 --- a/hw/gus.c +++ b/hw/gus.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/gusemu.h" #include "hw/gustate.h" diff --git a/hw/hd-geometry.c b/hw/hd-geometry.c index c30514364f1..6feb4f81750 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 { diff --git a/hw/hid.c b/hw/hid.c index 28b34747ff8..5fbde98f65b 100644 --- a/hw/hid.c +++ b/hw/hid.c @@ -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 diff --git a/hw/hpet.c b/hw/hpet.c index 6bfbf3a68ca..95dd01d147d 100644 --- a/hw/hpet.c +++ b/hw/hpet.c @@ -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 diff --git a/hw/i2c.c b/hw/i2c.c index ad361cc57f9..0c4fc1dbaa2 100644 --- a/hw/i2c.c +++ b/hw/i2c.c @@ -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 cc95e5c3f05..ed9b448d072 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 3cb228f0ca6..c7f01df4bfb 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 ebbf0592254..a38fc95055a 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 0abc9f11e38..cff8013b830 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -25,8 +25,8 @@ #include #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 4f5f3473090..6ac1a89ad71 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 672ee9b0e7b..c00bb2fad83 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 d4770615458..ed90b4b379d 100644 --- a/hw/i386/xen_domainbuild.c +++ b/hw/i386/xen_domainbuild.c @@ -1,5 +1,5 @@ #include -#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 37ba34e5a90..fdd93742d08 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 22115e4fcf4..835639d43cd 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 6f8c48b9aed..cced9aff263 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 diff --git a/hw/i8254.c b/hw/i8254.c index 67bfc6a8066..20c0c3601dc 100644 --- a/hw/i8254.c +++ b/hw/i8254.c @@ -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 c6c0c80c248..5342df4a347 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) diff --git a/hw/i8259.c b/hw/i8259.c index 1d8275232ab..ce14bd0f947 100644 --- a/hw/i8259.c +++ b/hw/i8259.c @@ -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 98052db1fa2..996ba9dfdb0 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 8b4a9c6e545..5807a92d7f3 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 ad0094f532e..d0ae8afba2d 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c index 861fd2bec31..05e60b1cdce 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 745ef94deb0..541d4ef3358 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -23,9 +23,9 @@ * THE SOFTWARE. */ #include -#include +#include #include -#include +#include #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 3743dc3b55e..87d67b7bcbf 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -23,14 +23,14 @@ * THE SOFTWARE. */ #include -#include +#include #include -#include +#include #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 diff --git a/hw/ide/ich.c b/hw/ide/ich.c index cc30adc701a..ed1f1a287e8 100644 --- a/hw/ide/ich.c +++ b/hw/ide/ich.c @@ -62,9 +62,9 @@ #include #include -#include +#include #include -#include +#include #include "block/block.h" #include "sysemu/dma.h" diff --git a/hw/ide/internal.h b/hw/ide/internal.h index d80360e85bb..2c89b50c5ec 100644 --- a/hw/ide/internal.h +++ b/hw/ide/internal.h @@ -7,12 +7,12 @@ * non-internal declarations are in hw/ide.h */ #include -#include +#include #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 fb7bb8201db..e0d47bf7cfa 100644 --- a/hw/ide/isa.c +++ b/hw/ide/isa.c @@ -23,8 +23,8 @@ * THE SOFTWARE. */ #include -#include -#include +#include +#include #include "block/block.h" #include "sysemu/dma.h" diff --git a/hw/ide/macio.c b/hw/ide/macio.c index 375c46f9daf..64b2406ab01 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 642774ef98f..92c1df0460f 100644 --- a/hw/ide/microdrive.c +++ b/hw/ide/microdrive.c @@ -23,7 +23,7 @@ * THE SOFTWARE. */ #include -#include +#include #include #include "block/block.h" #include "sysemu/dma.h" diff --git a/hw/ide/pci.c b/hw/ide/pci.c index 59fd53992a3..a310975391f 100644 --- a/hw/ide/pci.c +++ b/hw/ide/pci.c @@ -23,9 +23,9 @@ * THE SOFTWARE. */ #include -#include +#include #include -#include +#include #include "block/block.h" #include "sysemu/dma.h" diff --git a/hw/ide/piix.c b/hw/ide/piix.c index 4d3e82266c3..1de284d0e3d 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -24,9 +24,9 @@ */ #include -#include +#include #include -#include +#include #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 fd06da7003a..8a9a8917698 100644 --- a/hw/ide/qdev.c +++ b/hw/ide/qdev.c @@ -21,7 +21,7 @@ #include "qemu/error-report.h" #include #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 f40c1adc8cf..9d6a644391a 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -24,9 +24,9 @@ * THE SOFTWARE. */ #include -#include +#include #include -#include +#include #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 ad7aad33974..c153a243101 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 746723cd6e7..d7ec2090fd8 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 a8c311141e9..03197e3f547 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 728b60fb9a7..68201cd091a 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 78629fac6cc..7089fa808df 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 d4aff295446..42c7adc6911 100644 --- a/hw/ioapic_common.c +++ b/hw/ioapic_common.c @@ -19,8 +19,8 @@ * License along with this library; if not, see . */ -#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 67ff8fd314c..7860b17d66f 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 a7860e7459b..d4dbf138310 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 af2789e9ac8..f92ce19dde8 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 d994ea7c97b..c6ff9821e33 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 04ad649b0ee..da90711853e 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 5ae8b6819ba..ea77be8638f 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 23877d42593..a3bd519b4de 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 da64b5b86f8..c1e08ec1a04 100644 --- a/hw/kvm/pci-assign.c +++ b/hw/kvm/pci-assign.c @@ -27,7 +27,7 @@ #include #include #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 403fb868aea..04cf267f139 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 */ diff --git a/hw/lance.c b/hw/lance.c index acfffaed310..0f4e808d141 100644 --- a/hw/lance.c +++ b/hw/lance.c @@ -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 db929480927..b22c94f85ff 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 b347cf964cb..c3724dee066 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 472e9c25fd8..93f0d1534e0 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 d17c310d5c1..b4e80c8d8cf 100644 --- a/hw/lm32_pic.c +++ b/hw/lm32_pic.c @@ -20,11 +20,11 @@ #include #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 a064dfd1726..bacbeb23435 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 6ce66fb5bb1..2f5072dfa28 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 ff0a3092d52..d1160759334 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 5a8bf4d0e9b..c601b2943d6 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 55e9d0d37a1..cd560e3747f 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 39a9d808cd9..5019e0632b5 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 7c21c66cdec..c4a5626a531 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 58cd8d46c9a..bcc619d74bc 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 748bf569837..05efde7ceb9 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 fff27b34aa0..cfe660d0a49 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 61d2f35c8e6..a2363bbdf29 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 ed32bde5aba..52233308387 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" diff --git a/hw/macio.c b/hw/macio.c index e91143e3315..2f389dd7ccf 100644 --- a/hw/macio.c +++ b/hw/macio.c @@ -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 e042046e4f1..f9b68fd3112 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 e5cb810a276..59b287703ec 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 a2119ad2f1b..69e6844ff42 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 0227bd852c4..9b6805267d3 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 #include "exec/address-spaces.h" diff --git a/hw/mcf_uart.c b/hw/mcf_uart.c index e5de8016713..6724b1b7188 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 9b815d4b8fc..f46f800355e 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 07dc8084051..79a8a0e1703 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 24983621e59..b38640321b7 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 90a0ae57696..3edab4ff0b9 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 cddc25cf3f6..99488f1d2a6 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 9ad13f3924a..e0266bf15ae 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 766aa9dfb56..3cf27fa822f 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 0e5e86699cd..7dbd24d3d6e 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 daeb985b1d0..fd3a5f93f9a 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 9a67dce2077..a3e936b77fa 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 4935c78c016..d1681ec2fe5 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 539a5626207..4646ab6db7f 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 e1e88a9c307..70bf28f2fd4 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 diff --git a/hw/nand.c b/hw/nand.c index 63620938fba..087ca14ed1b 100644 --- a/hw/nand.c +++ b/hw/nand.c @@ -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 47c00c3a765..e4c10dbe252 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 c7b5c11626e..80a3c50e1e1 100644 --- a/hw/omap_clk.c +++ b/hw/omap_clk.c @@ -19,7 +19,7 @@ * with this program; if not, see . */ #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 0c5902f6f9c..184fcee1a72 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 948ad8fcc5f..ea3afcef5e8 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 c79f61c2ba0..f5eeaea5498 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 ebb259c2833..91adb66c2b3 100644 --- a/hw/omap_gpmc.c +++ b/hw/omap_gpmc.c @@ -19,8 +19,8 @@ * with this program; if not, see . */ #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 8485ee84f53..9b0e9dd5676 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 92f7b371eaf..efb2254aea1 100644 --- a/hw/omap_i2c.c +++ b/hw/omap_i2c.c @@ -17,8 +17,8 @@ * with this program; if not, see . */ #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 7da9c3548cd..875eba4e3ee 100644 --- a/hw/omap_intc.c +++ b/hw/omap_intc.c @@ -18,7 +18,7 @@ * with this program; if not, see . */ #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 cbe8a060337..ac8251f7367 100644 --- a/hw/omap_l4.c +++ b/hw/omap_l4.c @@ -18,7 +18,7 @@ * with this program; if not, see . */ #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 4f5b0947cff..4048cc102d9 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 6e48110c9ee..d4079cde0b9 100644 --- a/hw/omap_mmc.c +++ b/hw/omap_mmc.c @@ -17,7 +17,7 @@ * with this program; if not, see . */ #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 510e6cc5808..e38b5710546 100644 --- a/hw/omap_sdrc.c +++ b/hw/omap_sdrc.c @@ -18,7 +18,7 @@ * with this program; if not, see . */ #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 1cbd98d338f..11403c411b4 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 13e7280e693..a24f35c277c 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 181ecee1a5d..99b70d5a750 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 af51ce75349..26c14266fc4 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 57a346d7da3..8b511a79dce 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 03a7075c39c..c78871445b4 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 db2aac8cf81..49bab1f0f06 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" diff --git a/hw/pam.c b/hw/pam.c index 6c0061e06ed..7181bd68eb9 100644 --- a/hw/pam.c +++ b/hw/pam.c @@ -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 0b9af43d8b3..863a6fb4a9e 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 8236bce0c79..32df175c103 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 c4e4c6273bd..9f5e1856855 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 3e01528e786..0d95c8a9261 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 180ee07fefc..12287d1efcb 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" diff --git a/hw/pckbd.c b/hw/pckbd.c index cc63df0570d..08ceb9fe8a8 100644 --- a/hw/pckbd.c +++ b/hw/pckbd.c @@ -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 */ diff --git a/hw/pcspk.c b/hw/pcspk.c index d5334159502..34e0df74857 100644 --- a/hw/pcspk.c +++ b/hw/pcspk.c @@ -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 646dc794bf7..3ff20e0c6fa 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 37b4fcc234d..9a7fa707ca0 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" diff --git a/hw/piix4.c b/hw/piix4.c index 0f5cd014e59..d750413a7e3 100644 --- a/hw/piix4.c +++ b/hw/piix4.c @@ -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 83fcfa497c9..f9e68c30999 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" /* diff --git a/hw/pl050.c b/hw/pl050.c index 76735a0eda4..7dd8a59dd49 100644 --- a/hw/pl050.c +++ b/hw/pl050.c @@ -8,7 +8,7 @@ */ #include "hw/sysbus.h" -#include "hw/ps2.h" +#include "hw/input/ps2.h" typedef struct { SysBusDevice busdev; diff --git a/hw/pl330.c b/hw/pl330.c index 60aa4a8f9f1..8b33138f30f 100644 --- a/hw/pl330.c +++ b/hw/pl330.c @@ -14,7 +14,7 @@ * with this program; if not, see . */ -#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 790061065ce..0b5bb899768 100644 --- a/hw/pm_smbus.c +++ b/hw/pm_smbus.c @@ -18,9 +18,9 @@ * . */ #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 fef9c5d842a..c1bdb6be981 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 4b3057528c6..7292ce12900 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 b17107b7973..54efaed627b 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 a08a6b20862..4a9b8837e3d 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 2778e45879d..3acca94432d 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 cf29788c4da..444da0246d4 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 85bc821d944..fb57b42ea08 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 ba443cf8ef1..18a29dbc663 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 56bae8f6e06..82b8956ea83 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 66911b58c67..48a02183d4c 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 49ec728a7b2..d8e3dae25cd 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 30375c0c41b..585f53b912f 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 292091180d4..cceab3ead93 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 7b2a11fbe46..7a425011da9 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 ce78f0922e7..ff87ac31d13 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 diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index 22cfb7e6742..f518aee2166 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 8d500bf6be0..d2782cfb39a 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 diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c index a24e853d4de..b71b59c5cf9 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 diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c index 6eb3ab54824..4dbc31541bc 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 diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c index 41eab1697ce..db526492082 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 374da5bbfdb..8e1e85edfda 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 45c2159aa6c..1c5f04fae1e 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 854e17048f8..599539bc1dc 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 abc7ebe1bf8..5e7ad94388b 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 58df2452cd5..61302539aba 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" diff --git a/hw/ps2.c b/hw/ps2.c index 233a087a5ea..34120796b12 100644 --- a/hw/ps2.c +++ b/hw/ps2.c @@ -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 c05a14ea16f..32844b5f755 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 b2a790b683b..5bab97e95a2 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 6bc9e1a7524..0cd5e9eae01 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 10a522adbb4..0c3d8279780 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 6b8d94dd072..0aacdc2fce3 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 1db21c99ab3..6e4c1f6d623 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 32ea7a5d34c..1fd5f2076a9 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 f2b0c93661b..ee59bc2de3b 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 0df83cc1df8..2db1cabb7a7 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 66fefba58ce..323d458491c 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 c173fe4c115..8ea2416dd7b 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 diff --git a/hw/q35.c b/hw/q35.c index 6ea081aaa3b..8467f864506 100644 --- a/hw/q35.c +++ b/hw/q35.c @@ -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 a22b155b6f9..8c2e15205cf 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 168c4663e9a..9a0872d3b9c 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 b065515e672..03f92f1ab67 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 8c529c14d0f..ddf15a21d39 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 ebe87942040..c557132166c 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 ca275bd9d74..f82c0e19640 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 5dce791406e..4dec0cd8617 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 d5805102835..46e9a558af2 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 -#include -#include -#include -#include "hw/virtio-balloon.h" -#include -#include +#include +#include +#include +#include +#include +#include +#include #define VIRTUAL_CSSID 0xfe diff --git a/hw/sb16.c b/hw/sb16.c index bd51cebfd8a..783b6b4351d 100644 --- a/hw/sb16.c +++ b/hw/sb16.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" #include "qemu/host-utils.h" diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index ac2093a5ef6..6239ee14657 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 c5c7bf3dfa6..f52bd11d426 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 4d04caccce3..2a9a561127e 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 #include #include -#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 a630a7d506a..ed140d04a66 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 954657ba326..2138e358516 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 0ccc499285a..1151bf1babd 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" diff --git a/hw/sga.c b/hw/sga.c index 4b1d4e53699..5cf4b86c4f8 100644 --- a/hw/sga.c +++ b/hw/sga.c @@ -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 faa03d20693..bcc326a1e0e 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 e4d37ad6aca..d72708ee279 100644 --- a/hw/sh4/sh7750.c +++ b/hw/sh4/sh7750.c @@ -24,11 +24,11 @@ */ #include #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 389698d24af..7a3cdf3248e 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 192579d0658..c23d4afb10f 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 29e3d8f1277..050bfb63ce5 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 e3e7550ae78..d213a905801 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 462969557ca..450c7d8551b 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 b4503230a9e..f92ff4f73f6 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 b60592b35d3..b367752fd3e 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 83f22a03668..1145a87603b 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" diff --git a/hw/sm501.c b/hw/sm501.c index 93a06c90b9d..d9fcead7192 100644 --- a/hw/sm501.c +++ b/hw/sm501.c @@ -24,9 +24,9 @@ #include #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" diff --git a/hw/smbus.c b/hw/smbus.c index 9626415bcaa..25d2d04163f 100644 --- a/hw/smbus.c +++ b/hw/smbus.c @@ -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 dff8403d6ce..0154283762e 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 732ebd3bb0a..ca229789f4d 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 c2feae6eb8e..f659256d6eb 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 diff --git a/hw/soc_dma.c b/hw/soc_dma.c index db5d6093889..5e3491d3736 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 19701e7e406..34332f24526 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 diff --git a/hw/spapr_nvram.c b/hw/spapr_nvram.c index 680cdba928f..0cc6cba0e35 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 3e0d8d12fbd..62ff323f732 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 #include "trace.h" diff --git a/hw/spapr_vscsi.c b/hw/spapr_vscsi.c index 27940949ce5..e92b09a522f 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 diff --git a/hw/spapr_vty.c b/hw/spapr_vty.c index be08571d230..9df018a230d 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 bf06bf4b51c..3b27d4019a7 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 9ebda02aa13..31beb328858 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 18e368ec98c..fd21533f159 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 4c39cf66070..0d29620094c 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 68d1f24b06c..183a87835cb 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 4e407922a06..f83fc3f288a 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 49f9577e32e..0e5262d9f52 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 9d443d1b101..10963756704 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 33e77b02a3d..744b5846b17 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 f76f96d9e7e..a3929d444f8 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 79c971b4390..2d5fa89e9b6 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 47e5437e0dc..21a27a6f443 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 9a9632c54b9..9ba05ecc9c7 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 a771cd5e52a..34ee1fb3cfc 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 b93e502e058..e6c217c8dbd 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 a5251a34ac6..533938a9b4c 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 7d020c4cba0..b730d853f75 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 78ab13f9ed1..7c8fc364c84 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 b8c79b85e93..44fc43f4c41 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 97010488872..5f3a4b401e6 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 21651b36373..06f0171c46c 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 1ac5117ba77..c8c42eefb5b 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 02356d4d583..3b08720cf44 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 9e293217d01..89d7fa6c3cd 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" diff --git a/hw/vga.c b/hw/vga.c index 59bfb220f5a..dc31fd574c1 100644 --- a/hw/vga.c +++ b/hw/vga.c @@ -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 diff --git a/hw/vhost.c b/hw/vhost.c index 4d6aee3ecd8..636fad0f740 100644 --- a/hw/vhost.c +++ b/hw/vhost.c @@ -14,7 +14,7 @@ */ #include -#include "hw/vhost.h" +#include "hw/virtio/vhost.h" #include "hw/hw.h" #include "qemu/range.h" #include diff --git a/hw/vhost_net.c b/hw/vhost_net.c index d3218a07f46..8c5384cf76e 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 -#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 b382bd440df..c2c446eb9b3 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 #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 f2143fded38..6efb2f063db 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 #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 6c2aab00eb1..1596a1c92f0 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 284180f4e1c..31f672c9a31 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 5917740d9d0..bc8fd43b4b1 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 fb20722eaad..943b429d948 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -17,12 +17,12 @@ #include -#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 f99f2eb80eb..fb831550166 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 fa8e8f3f9a1..6079b2a3a95 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 06a58a6a632..ead7cda13df 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 -#include -#include "hw/virtio-bus.h" +#include +#include +#include #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 a9cb1146494..1dba8ab2c6f 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 26fbc790ecd..1c2282c54f1 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 a9d227e17d4..f4f9c9373d5 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 cc1466ae967..0d07ea1fc58 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 bdd256e9d56..5916624371b 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 9d9b64eedd4..52619276bd1 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 072d2568820..cb4e1f9e479 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 f13e507fcff..1407fbadb2e 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 6c52808ac04..b8c4be85ff2 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 0904cf496df..6b5a3499bb4 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 8f387b64033..a2eb8a159a0 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 02693d75651..2a8c9f5d1a7 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 diff --git a/hw/xen_console.c b/hw/xen_console.c index c56ef4737fb..efc32320faa 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 diff --git a/hw/xen_devconfig.c b/hw/xen_devconfig.c index cdcaf62f26f..fa998eff041 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 47a51cf014b..532347bf941 100644 --- a/hw/xen_disk.c +++ b/hw/xen_disk.c @@ -36,7 +36,7 @@ #include #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 681cbe5fd8d..29a91ea7b16 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 b6d36793b35..63918ae1a0e 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 diff --git a/hw/xen_platform.c b/hw/xen_platform.c index 5e11c950abf..b6c6793e1e2 100644 --- a/hw/xen_platform.c +++ b/hw/xen_platform.c @@ -26,11 +26,11 @@ #include #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 ce695d0e64d..0cc45387ba2 100644 --- a/hw/xen_pt.c +++ b/hw/xen_pt.c @@ -55,8 +55,8 @@ #include #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 1cd9f447041..d2cac18604f 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 55838216d9e..3ee2adfb9eb 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 a54ee2bfd96..dcdfc5c64d5 100644 --- a/hw/xen_pt_msi.c +++ b/hw/xen_pt_msi.c @@ -11,9 +11,9 @@ #include -#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 diff --git a/hw/xenfb.c b/hw/xenfb.c index 7c46a2fa1e2..8e4266142de 100644 --- a/hw/xenfb.c +++ b/hw/xenfb.c @@ -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 #include diff --git a/hw/xtensa/xtensa_lx60.c b/hw/xtensa/xtensa_lx60.c index f2a63d82da4..5695897b233 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 7d3258cc663..d853ea1310a 100644 --- a/hw/zaurus.c +++ b/hw/zaurus.c @@ -16,7 +16,7 @@ * with this program; if not, see . */ #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 similarity index 100% rename from hw/scsi-defs.h rename to include/block/scsi.h diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h index 1da240039dd..977467bb57c 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 similarity index 100% rename from hw/acpi.h rename to include/hw/acpi/acpi.h diff --git a/hw/acpi_ich9.h b/include/hw/acpi/ich9.h similarity index 98% rename from hw/acpi_ich9.h rename to include/hw/acpi/ich9.h index 91c3aeb7ea9..85b82ee50cc 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 similarity index 100% rename from hw/arm-misc.h rename to include/hw/arm.h diff --git a/hw/devices.h b/include/hw/arm/devices.h similarity index 100% rename from hw/devices.h rename to include/hw/arm/devices.h diff --git a/hw/exynos4210.h b/include/hw/arm/exynos4210.h similarity index 100% rename from hw/exynos4210.h rename to include/hw/arm/exynos4210.h diff --git a/hw/imx.h b/include/hw/arm/imx.h similarity index 100% rename from hw/imx.h rename to include/hw/arm/imx.h diff --git a/hw/omap.h b/include/hw/arm/omap.h similarity index 100% rename from hw/omap.h rename to include/hw/arm/omap.h diff --git a/hw/primecell.h b/include/hw/arm/primecell.h similarity index 100% rename from hw/primecell.h rename to include/hw/arm/primecell.h diff --git a/hw/pxa.h b/include/hw/arm/pxa.h similarity index 100% rename from hw/pxa.h rename to include/hw/arm/pxa.h diff --git a/hw/sharpsl.h b/include/hw/arm/sharpsl.h similarity index 100% rename from hw/sharpsl.h rename to include/hw/arm/sharpsl.h diff --git a/hw/soc_dma.h b/include/hw/arm/soc_dma.h similarity index 100% rename from hw/soc_dma.h rename to include/hw/arm/soc_dma.h diff --git a/hw/audiodev.h b/include/hw/audio/audio.h similarity index 100% rename from hw/audiodev.h rename to include/hw/audio/audio.h diff --git a/hw/pcspk.h b/include/hw/audio/pcspk.h similarity index 98% rename from hw/pcspk.h rename to include/hw/audio/pcspk.h index f448d221daf..ce8ef4f9ea1 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 similarity index 100% rename from hw/block-common.h rename to include/hw/block/block.h diff --git a/hw/fdc.h b/include/hw/block/fdc.h similarity index 100% rename from hw/fdc.h rename to include/hw/block/fdc.h diff --git a/hw/flash.h b/include/hw/block/flash.h similarity index 100% rename from hw/flash.h rename to include/hw/block/flash.h diff --git a/hw/boards.h b/include/hw/boards.h similarity index 100% rename from hw/boards.h rename to include/hw/boards.h diff --git a/hw/bt.h b/include/hw/bt.h similarity index 100% rename from hw/bt.h rename to include/hw/bt.h diff --git a/hw/escc.h b/include/hw/char/escc.h similarity index 100% rename from hw/escc.h rename to include/hw/char/escc.h diff --git a/hw/serial.h b/include/hw/char/serial.h similarity index 100% rename from hw/serial.h rename to include/hw/char/serial.h diff --git a/hw/etraxfs.h b/include/hw/cris/etraxfs.h similarity index 98% rename from hw/etraxfs.h rename to include/hw/cris/etraxfs.h index 0df4fdd2e99..ab30559c799 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 similarity index 100% rename from hw/etraxfs_dma.h rename to include/hw/cris/etraxfs_dma.h diff --git a/hw/elf_ops.h b/include/hw/elf_ops.h similarity index 100% rename from hw/elf_ops.h rename to include/hw/elf_ops.h diff --git a/hw/empty_slot.h b/include/hw/empty_slot.h similarity index 100% rename from hw/empty_slot.h rename to include/hw/empty_slot.h diff --git a/hw/hw.h b/include/hw/hw.h similarity index 100% rename from hw/hw.h rename to include/hw/hw.h diff --git a/hw/i2c.h b/include/hw/i2c/i2c.h similarity index 100% rename from hw/i2c.h rename to include/hw/i2c/i2c.h diff --git a/hw/pm_smbus.h b/include/hw/i2c/pm_smbus.h similarity index 100% rename from hw/pm_smbus.h rename to include/hw/i2c/pm_smbus.h diff --git a/hw/smbus.h b/include/hw/i2c/smbus.h similarity index 99% rename from hw/smbus.h rename to include/hw/i2c/smbus.h index c3db620e00c..d764d759c47 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 similarity index 100% rename from hw/apic-msidef.h rename to include/hw/i386/apic-msidef.h diff --git a/hw/apic.h b/include/hw/i386/apic.h similarity index 100% rename from hw/apic.h rename to include/hw/i386/apic.h diff --git a/hw/apic_internal.h b/include/hw/i386/apic_internal.h similarity index 100% rename from hw/apic_internal.h rename to include/hw/i386/apic_internal.h diff --git a/hw/ich9.h b/include/hw/i386/ich9.h similarity index 98% rename from hw/ich9.h rename to include/hw/i386/ich9.h index e7d2df72802..51d59819ab7 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 similarity index 100% rename from hw/ioapic.h rename to include/hw/i386/ioapic.h diff --git a/hw/ioapic_internal.h b/include/hw/i386/ioapic_internal.h similarity index 100% rename from hw/ioapic_internal.h rename to include/hw/i386/ioapic_internal.h diff --git a/hw/pc.h b/include/hw/i386/pc.h similarity index 98% rename from hw/pc.h rename to include/hw/i386/pc.h index 55964ced933..5d40914f491 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 similarity index 100% rename from hw/smbios.h rename to include/hw/i386/smbios.h diff --git a/hw/ide.h b/include/hw/ide.h similarity index 97% rename from hw/ide.h rename to include/hw/ide.h index 35444a39f94..507e6d33cbc 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 similarity index 100% rename from hw/adb.h rename to include/hw/input/adb.h diff --git a/hw/hid.h b/include/hw/input/hid.h similarity index 100% rename from hw/hid.h rename to include/hw/input/hid.h diff --git a/hw/ps2.h b/include/hw/input/ps2.h similarity index 100% rename from hw/ps2.h rename to include/hw/input/ps2.h diff --git a/hw/irq.h b/include/hw/irq.h similarity index 100% rename from hw/irq.h rename to include/hw/irq.h diff --git a/hw/apm.h b/include/hw/isa/apm.h similarity index 100% rename from hw/apm.h rename to include/hw/isa/apm.h diff --git a/hw/i8259_internal.h b/include/hw/isa/i8259_internal.h similarity index 98% rename from hw/i8259_internal.h rename to include/hw/isa/i8259_internal.h index 2813ec1baa0..d3ddb27f4f8 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 similarity index 100% rename from hw/isa.h rename to include/hw/isa/isa.h diff --git a/hw/pc87312.h b/include/hw/isa/pc87312.h similarity index 98% rename from hw/pc87312.h rename to include/hw/isa/pc87312.h index ad087c73e5a..befc8bdc626 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 similarity index 100% rename from hw/vt82c686.h rename to include/hw/isa/vt82c686.h diff --git a/hw/kvm/clock.h b/include/hw/kvm/clock.h similarity index 100% rename from hw/kvm/clock.h rename to include/hw/kvm/clock.h diff --git a/hw/lm32_juart.h b/include/hw/lm32/lm32_juart.h similarity index 100% rename from hw/lm32_juart.h rename to include/hw/lm32/lm32_juart.h diff --git a/hw/lm32_pic.h b/include/hw/lm32/lm32_pic.h similarity index 100% rename from hw/lm32_pic.h rename to include/hw/lm32/lm32_pic.h diff --git a/hw/loader.h b/include/hw/loader.h similarity index 100% rename from hw/loader.h rename to include/hw/loader.h diff --git a/hw/mcf.h b/include/hw/m68k/mcf.h similarity index 100% rename from hw/mcf.h rename to include/hw/m68k/mcf.h diff --git a/hw/mips-bios.h b/include/hw/mips/bios.h similarity index 100% rename from hw/mips-bios.h rename to include/hw/mips/bios.h diff --git a/hw/mips_cpudevs.h b/include/hw/mips/cpudevs.h similarity index 100% rename from hw/mips_cpudevs.h rename to include/hw/mips/cpudevs.h diff --git a/hw/mips.h b/include/hw/mips/mips.h similarity index 100% rename from hw/mips.h rename to include/hw/mips/mips.h diff --git a/hw/tmp105_regs.h b/include/hw/misc/tmp105_regs.h similarity index 100% rename from hw/tmp105_regs.h rename to include/hw/misc/tmp105_regs.h diff --git a/hw/eeprom93xx.h b/include/hw/nvram/eeprom93xx.h similarity index 100% rename from hw/eeprom93xx.h rename to include/hw/nvram/eeprom93xx.h diff --git a/hw/fw_cfg.h b/include/hw/nvram/fw_cfg.h similarity index 100% rename from hw/fw_cfg.h rename to include/hw/nvram/fw_cfg.h diff --git a/hw/apb_pci.h b/include/hw/pci-host/apb.h similarity index 100% rename from hw/apb_pci.h rename to include/hw/pci-host/apb.h diff --git a/hw/pam.h b/include/hw/pci-host/pam.h similarity index 100% rename from hw/pam.h rename to include/hw/pci-host/pam.h diff --git a/hw/ppce500_pci.h b/include/hw/pci-host/ppce500.h similarity index 100% rename from hw/ppce500_pci.h rename to include/hw/pci-host/ppce500.h diff --git a/hw/q35.h b/include/hw/pci-host/q35.h similarity index 97% rename from hw/q35.h rename to include/hw/pci-host/q35.h index d766bb7b023..6b50b5f34a0 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 similarity index 99% rename from hw/spapr_pci.h rename to include/hw/pci-host/spapr.h index 8bd8a663c5c..b21080cd587 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 similarity index 100% rename from hw/pci/msi.h rename to include/hw/pci/msi.h diff --git a/hw/pci/msix.h b/include/hw/pci/msix.h similarity index 100% rename from hw/pci/msix.h rename to include/hw/pci/msix.h diff --git a/hw/pci/pci.h b/include/hw/pci/pci.h similarity index 99% rename from hw/pci/pci.h rename to include/hw/pci/pci.h index 9ea67a38327..05315c0475e 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 similarity index 100% rename from hw/pci/pci_bridge.h rename to include/hw/pci/pci_bridge.h diff --git a/hw/pci/pci_bus.h b/include/hw/pci/pci_bus.h similarity index 100% rename from hw/pci/pci_bus.h rename to include/hw/pci/pci_bus.h diff --git a/hw/pci/pci_host.h b/include/hw/pci/pci_host.h similarity index 100% rename from hw/pci/pci_host.h rename to include/hw/pci/pci_host.h diff --git a/hw/pci/pci_ids.h b/include/hw/pci/pci_ids.h similarity index 100% rename from hw/pci/pci_ids.h rename to include/hw/pci/pci_ids.h diff --git a/hw/pci/pci_regs.h b/include/hw/pci/pci_regs.h similarity index 100% rename from hw/pci/pci_regs.h rename to include/hw/pci/pci_regs.h diff --git a/hw/pci/pcie.h b/include/hw/pci/pcie.h similarity index 100% rename from hw/pci/pcie.h rename to include/hw/pci/pcie.h diff --git a/hw/pci/pcie_aer.h b/include/hw/pci/pcie_aer.h similarity index 100% rename from hw/pci/pcie_aer.h rename to include/hw/pci/pcie_aer.h diff --git a/hw/pci/pcie_host.h b/include/hw/pci/pcie_host.h similarity index 100% rename from hw/pci/pcie_host.h rename to include/hw/pci/pcie_host.h diff --git a/hw/pci/pcie_port.h b/include/hw/pci/pcie_port.h similarity index 100% rename from hw/pci/pcie_port.h rename to include/hw/pci/pcie_port.h diff --git a/hw/pci/pcie_regs.h b/include/hw/pci/pcie_regs.h similarity index 100% rename from hw/pci/pcie_regs.h rename to include/hw/pci/pcie_regs.h diff --git a/hw/pci/shpc.h b/include/hw/pci/shpc.h similarity index 100% rename from hw/pci/shpc.h rename to include/hw/pci/shpc.h diff --git a/hw/pci/slotid_cap.h b/include/hw/pci/slotid_cap.h similarity index 100% rename from hw/pci/slotid_cap.h rename to include/hw/pci/slotid_cap.h diff --git a/hw/pcmcia.h b/include/hw/pcmcia.h similarity index 100% rename from hw/pcmcia.h rename to include/hw/pcmcia.h diff --git a/hw/mac_dbdma.h b/include/hw/ppc/mac_dbdma.h similarity index 100% rename from hw/mac_dbdma.h rename to include/hw/ppc/mac_dbdma.h diff --git a/hw/openpic.h b/include/hw/ppc/openpic.h similarity index 100% rename from hw/openpic.h rename to include/hw/ppc/openpic.h diff --git a/hw/ppc.h b/include/hw/ppc/ppc.h similarity index 100% rename from hw/ppc.h rename to include/hw/ppc/ppc.h diff --git a/hw/ppc4xx.h b/include/hw/ppc/ppc4xx.h similarity index 100% rename from hw/ppc4xx.h rename to include/hw/ppc/ppc4xx.h diff --git a/hw/spapr.h b/include/hw/ppc/spapr.h similarity index 99% rename from hw/spapr.h rename to include/hw/ppc/spapr.h index 3a1f69f2a9f..864bee9d00d 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 similarity index 100% rename from hw/spapr_vio.h rename to include/hw/ppc/spapr_vio.h diff --git a/hw/xics.h b/include/hw/ppc/xics.h similarity index 100% rename from hw/xics.h rename to include/hw/ppc/xics.h diff --git a/hw/ptimer.h b/include/hw/ptimer.h similarity index 100% rename from hw/ptimer.h rename to include/hw/ptimer.h diff --git a/hw/qdev-addr.h b/include/hw/qdev-addr.h similarity index 100% rename from hw/qdev-addr.h rename to include/hw/qdev-addr.h diff --git a/hw/qdev-core.h b/include/hw/qdev-core.h similarity index 100% rename from hw/qdev-core.h rename to include/hw/qdev-core.h diff --git a/hw/qdev-dma.h b/include/hw/qdev-dma.h similarity index 100% rename from hw/qdev-dma.h rename to include/hw/qdev-dma.h diff --git a/hw/qdev-properties.h b/include/hw/qdev-properties.h similarity index 100% rename from hw/qdev-properties.h rename to include/hw/qdev-properties.h diff --git a/hw/qdev.h b/include/hw/qdev.h similarity index 100% rename from hw/qdev.h rename to include/hw/qdev.h diff --git a/hw/s390x/event-facility.h b/include/hw/s390x/event-facility.h similarity index 100% rename from hw/s390x/event-facility.h rename to include/hw/s390x/event-facility.h diff --git a/hw/s390x/sclp.h b/include/hw/s390x/sclp.h similarity index 100% rename from hw/s390x/sclp.h rename to include/hw/s390x/sclp.h diff --git a/hw/esp.h b/include/hw/scsi/esp.h similarity index 99% rename from hw/esp.h rename to include/hw/scsi/esp.h index 830673be8f3..e079fb8d16c 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 similarity index 99% rename from hw/scsi.h rename to include/hw/scsi/scsi.h index 02a1497d7ad..3bda1c42c18 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 similarity index 100% rename from hw/sd.h rename to include/hw/sd.h diff --git a/hw/sh.h b/include/hw/sh4/sh.h similarity index 98% rename from hw/sh.h rename to include/hw/sh4/sh.h index 6230954eac9..87c378f1eb2 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 similarity index 100% rename from hw/sh_intc.h rename to include/hw/sh4/sh_intc.h diff --git a/hw/firmware_abi.h b/include/hw/sparc/firmware_abi.h similarity index 100% rename from hw/firmware_abi.h rename to include/hw/sparc/firmware_abi.h diff --git a/hw/grlib.h b/include/hw/sparc/grlib.h similarity index 100% rename from hw/grlib.h rename to include/hw/sparc/grlib.h diff --git a/hw/sparc32_dma.h b/include/hw/sparc/sparc32_dma.h similarity index 100% rename from hw/sparc32_dma.h rename to include/hw/sparc/sparc32_dma.h diff --git a/hw/sun4m.h b/include/hw/sparc/sun4m.h similarity index 96% rename from hw/sun4m.h rename to include/hw/sparc/sun4m.h index 0d2cfb807b1..e984671129d 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 similarity index 100% rename from hw/ssi.h rename to include/hw/ssi.h diff --git a/hw/stream.h b/include/hw/stream.h similarity index 100% rename from hw/stream.h rename to include/hw/stream.h diff --git a/hw/sysbus.h b/include/hw/sysbus.h similarity index 100% rename from hw/sysbus.h rename to include/hw/sysbus.h diff --git a/hw/hpet_emul.h b/include/hw/timer/hpet.h similarity index 100% rename from hw/hpet_emul.h rename to include/hw/timer/hpet.h diff --git a/hw/i8254.h b/include/hw/timer/i8254.h similarity index 98% rename from hw/i8254.h rename to include/hw/timer/i8254.h index 7d4432e7227..75bb530ad92 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 similarity index 98% rename from hw/i8254_internal.h rename to include/hw/timer/i8254_internal.h index 30d5b1b9501..e0cff0cf5ae 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 similarity index 100% rename from hw/nvram.h rename to include/hw/timer/m48t59.h diff --git a/hw/mc146818rtc.h b/include/hw/timer/mc146818rtc.h similarity index 80% rename from hw/mc146818rtc.h rename to include/hw/timer/mc146818rtc.h index 967403edb53..854ea3f5b5e 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 similarity index 100% rename from hw/mc146818rtc_regs.h rename to include/hw/timer/mc146818rtc_regs.h diff --git a/hw/puv3.h b/include/hw/unicore32/puv3.h similarity index 100% rename from hw/puv3.h rename to include/hw/unicore32/puv3.h diff --git a/hw/usb.h b/include/hw/usb.h similarity index 100% rename from hw/usb.h rename to include/hw/usb.h diff --git a/hw/dataplane/hostmem.h b/include/hw/virtio/dataplane/hostmem.h similarity index 100% rename from hw/dataplane/hostmem.h rename to include/hw/virtio/dataplane/hostmem.h diff --git a/hw/dataplane/vring.h b/include/hw/virtio/dataplane/vring.h similarity index 98% rename from hw/dataplane/vring.h rename to include/hw/virtio/dataplane/vring.h index defb1efcda4..9380cb54133 100644 --- a/hw/dataplane/vring.h +++ b/include/hw/virtio/dataplane/vring.h @@ -20,7 +20,7 @@ #include #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 similarity index 98% rename from hw/vhost.h rename to include/hw/virtio/vhost.h index f062d48807e..b373be03875 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 similarity index 100% rename from hw/9pfs/virtio-9p-device.h rename to include/hw/virtio/virtio-9p.h diff --git a/hw/virtio-balloon.h b/include/hw/virtio/virtio-balloon.h similarity index 98% rename from hw/virtio-balloon.h rename to include/hw/virtio/virtio-balloon.h index d8983154146..3b459bbdd79 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 similarity index 96% rename from hw/virtio-blk.h rename to include/hw/virtio/virtio-blk.h index 8c6c78b1917..c10d069b258 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 similarity index 99% rename from hw/virtio-bus.h rename to include/hw/virtio/virtio-bus.h index ae0f7078b46..311e8c78bd9 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 similarity index 99% rename from hw/virtio-net.h rename to include/hw/virtio/virtio-net.h index 4d1a8cdca03..d2cc9968723 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 similarity index 100% rename from hw/virtio-rng.h rename to include/hw/virtio/virtio-rng.h diff --git a/hw/virtio-scsi.h b/include/hw/virtio/virtio-scsi.h similarity index 97% rename from hw/virtio-scsi.h rename to include/hw/virtio/virtio-scsi.h index 31e97bbe38c..c9d92ca2e8a 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 similarity index 99% rename from hw/virtio-serial.h rename to include/hw/virtio/virtio-serial.h index 516400f22d6..098deeac4aa 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 similarity index 99% rename from hw/virtio.h rename to include/hw/virtio/virtio.h index fdbe9313a00..7e24b2b69ae 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 similarity index 100% rename from hw/xen.h rename to include/hw/xen/xen.h diff --git a/hw/xen_backend.h b/include/hw/xen/xen_backend.h similarity index 99% rename from hw/xen_backend.h rename to include/hw/xen/xen_backend.h index d04b985d109..3b7d96d7a50 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 similarity index 99% rename from hw/xen_common.h rename to include/hw/xen/xen_common.h index c37bde3f7e0..2d5a25bf40f 100644 --- a/hw/xen_common.h +++ b/include/hw/xen/xen_common.h @@ -15,7 +15,7 @@ #include #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 similarity index 100% rename from hw/xilinx.h rename to include/hw/xilinx.h diff --git a/hw/vhost_net.h b/include/net/vhost_net.h similarity index 100% rename from hw/vhost_net.h rename to include/net/vhost_net.h diff --git a/hw/watchdog.h b/include/sysemu/watchdog.h similarity index 100% rename from hw/watchdog.h rename to include/sysemu/watchdog.h diff --git a/monitor.c b/monitor.c index b4bda7777e4..c897e8033f3 100644 --- a/monitor.c +++ b/monitor.c @@ -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 diff --git a/net/tap.c b/net/tap.c index e7c84811ac3..17bdf014a90 100644 --- a/net/tap.c +++ b/net/tap.c @@ -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 3daf7da4957..ce436085d9b 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 847318d1f42..77718c4caac 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 82e2e084c35..6bfb10350b6 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 69c3570a15a..356378c1100 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 069a2e2cf9e..2b4e3193f3a 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 df30fa6ed62..397afebecbb 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 b80a5f44707..ee85e574354 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 7ff991e28e4..f106873ad82 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 e885bb3aeb9..af9ce8c3379 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 597066f5a0d..5e9dddbb544 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 0a9cb3ac987..ce10ca84ee0 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 9ab583b8601..3395d7f50bc 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 #include diff --git a/tests/tmp105-test.c b/tests/tmp105-test.c index a6ad213de80..2869129df3c 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 diff --git a/tpm/tpm_passthrough.c b/tpm/tpm_passthrough.c index 80a48d68cd1..1fdd66d3567 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 367f734dc4f..f0a45846071 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 7f216e56b21..1be4ddc8a12 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 diff --git a/vl.c b/vl.c index a8bba043a27..d694a9039b6 100644 --- a/vl.c +++ b/vl.c @@ -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" diff --git a/xen-all.c b/xen-all.c index 8c05843faf0..31f28fc1ae7 100644 --- a/xen-all.c +++ b/xen-all.c @@ -11,9 +11,9 @@ #include #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 5a626cdf845..eda914a75c9 100644 --- a/xen-mapcache.c +++ b/xen-mapcache.c @@ -12,7 +12,7 @@ #include -#include "hw/xen_backend.h" +#include "hw/xen/xen_backend.h" #include "sysemu/blockdev.h" #include "qemu/bitmap.h" diff --git a/xen-stub.c b/xen-stub.c index 1ee841137e2..6f0516aa3ea 100644 --- a/xen-stub.c +++ b/xen-stub.c @@ -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"