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 <pbonzini@redhat.com>
14 years ago · 0d09e41a51
511 changed files with 829 additions and 830 deletions
--- 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"
--- a/block/iscsi.c
+++ b/block/iscsi.c
@ -31,14 +31,14 @@
 #include "qemu/error-report.h"
 #include "block/block_int.h"
 #include "trace.h"
-#include "hw/scsi-defs.h"
+#include "block/scsi.h"

 #include <iscsi/iscsi.h>
 #include <iscsi/scsi-lowlevel.h>

 #ifdef __linux__
 #include <scsi/sg.h>
-#include <hw/scsi-defs.h>
+#include <block/scsi.h>
 #endif

 typedef struct IscsiLun {
--- 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"
--- 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"
--- 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"
--- 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)
--- 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"
--- a/hw/9pfs/virtio-9p-handle.c
+++ b/hw/9pfs/virtio-9p-handle.c
@ -11,7 +11,7 @@
 *
 */

-#include "hw/virtio.h"
+#include "hw/virtio/virtio.h"
 #include "virtio-9p.h"
 #include "virtio-9p-xattr.h"
 #include <arpa/inet.h>
--- a/hw/9pfs/virtio-9p-local.c
+++ b/hw/9pfs/virtio-9p-local.c
@ -11,7 +11,7 @@
 *
 */

-#include "hw/virtio.h"
+#include "hw/virtio/virtio.h"
 #include "virtio-9p.h"
 #include "virtio-9p-xattr.h"
 #include <arpa/inet.h>
--- a/hw/9pfs/virtio-9p-posix-acl.c
+++ b/hw/9pfs/virtio-9p-posix-acl.c
@ -13,7 +13,7 @@

 #include <sys/types.h>
 #include "qemu/xattr.h"
-#include "hw/virtio.h"
+#include "hw/virtio/virtio.h"
 #include "virtio-9p.h"
 #include "fsdev/file-op-9p.h"
 #include "virtio-9p-xattr.h"
--- a/hw/9pfs/virtio-9p-proxy.c
+++ b/hw/9pfs/virtio-9p-proxy.c
@ -11,7 +11,7 @@
 */
 #include <sys/socket.h>
 #include <sys/un.h>
-#include "hw/virtio.h"
+#include "hw/virtio/virtio.h"
 #include "virtio-9p.h"
 #include "qemu/error-report.h"
 #include "fsdev/qemu-fsdev.h"
--- 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"
--- a/hw/9pfs/virtio-9p-xattr-user.c
+++ b/hw/9pfs/virtio-9p-xattr-user.c
@ -12,7 +12,7 @@
 */

 #include <sys/types.h>
-#include "hw/virtio.h"
+#include "hw/virtio/virtio.h"
 #include "virtio-9p.h"
 #include "fsdev/file-op-9p.h"
 #include "virtio-9p-xattr.h"
--- 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"
--- 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"
--- a/hw/9pfs/virtio-9p.h
+++ b/hw/9pfs/virtio-9p.h
@ -6,7 +6,7 @@
 #include <sys/time.h>
 #include <utime.h>
 #include <sys/resource.h>
-#include "hw/virtio.h"
+#include "hw/virtio/virtio.h"
 #include "fsdev/file-op-9p.h"
 #include "fsdev/virtio-9p-marshal.h"
 #include "qemu/thread.h"
--- 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"
--- 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"
--- 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

--- 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
--- 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 */
--- 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

--- 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

--- 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"


--- 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"
--- 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"

--- a/hw/apic.c
+++ b/hw/apic.c
@ -17,14 +17,14 @@
 * License along with this library; if not, see <http://www.gnu.org/licenses/>
 */
 #include "qemu/thread.h"
-#include "hw/apic_internal.h"
-#include "hw/apic.h"
-#include "hw/ioapic.h"
+#include "hw/i386/apic_internal.h"
+#include "hw/i386/apic.h"
+#include "hw/i386/ioapic.h"
 #include "hw/pci/msi.h"
 #include "qemu/host-utils.h"
 #include "trace.h"
-#include "hw/pc.h"
-#include "hw/apic-msidef.h"
+#include "hw/i386/pc.h"
+#include "hw/i386/apic-msidef.h"

 #define MAX_APIC_WORDS 8

--- a/hw/apic_common.c
+++ b/hw/apic_common.c
@ -17,8 +17,8 @@
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, see <http://www.gnu.org/licenses/>
 */
-#include "hw/apic.h"
-#include "hw/apic_internal.h"
+#include "hw/i386/apic.h"
+#include "hw/i386/apic_internal.h"
 #include "trace.h"
 #include "sysemu/kvm.h"

--- 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"

--- 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"

--- 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"

--- 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"
--- 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"

--- 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
--- 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
--- 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"
--- 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"
--- 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"
--- 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
--- 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"
--- 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"
--- 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"
--- a/hw/arm/omap1.c
+++ b/hw/arm/omap1.c
@ -17,10 +17,10 @@
 * with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 #include "hw/hw.h"
-#include "hw/arm-misc.h"
-#include "hw/omap.h"
+#include "hw/arm.h"
+#include "hw/arm/omap.h"
 #include "sysemu/sysemu.h"
-#include "hw/soc_dma.h"
+#include "hw/arm/soc_dma.h"
 #include "sysemu/blockdev.h"
 #include "qemu/range.h"
 #include "hw/sysbus.h"
--- 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"

--- 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"

--- 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"

--- 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.  */
--- 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"
--- 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

--- 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 */
--- 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"

--- 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"
--- 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"
--- 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"
--- 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)
--- 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)
--- 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"
--- 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"
--- 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
--- 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"

--- 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;

--- 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"

--- 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)
--- 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"
--- 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 {
--- 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
--- 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)
 {
--- 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"
--- 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)

--- 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"

--- 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"

--- 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_)
 {
--- 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 {
--- 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;

--- 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 */
--- 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) \
--- 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) \
--- 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 */
--- 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

--- 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.
--- 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.
--- 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"

--- 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
--- 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"
--- 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"
--- 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"

--- 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"

--- 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)

--- a/hw/etraxfs_eth.c
+++ b/hw/etraxfs_eth.c
@ -25,7 +25,7 @@
 #include <stdio.h>
 #include "hw/sysbus.h"
 #include "net/net.h"
-#include "hw/etraxfs.h"
+#include "hw/cris/etraxfs.h"

 #define D(x)

--- 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

--- 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,
--- 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
--- 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

--- 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

--- 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

--- 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
--- 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"
--- 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"
--- 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"

--- 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