diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2013-02-05 17:06:20 +0100 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-04-08 18:13:10 +0200 |
commit | 0d09e41a51aa0752b1ce525ce084f7cd210e461b (patch) | |
tree | dc92b5b32c1e3182afa9bfd16a46a0a089320102 /hw/ide | |
parent | bb585a784e9ad69207315d694e7dad2c422f6baa (diff) | |
download | hqemu-0d09e41a51aa0752b1ce525ce084f7cd210e461b.zip hqemu-0d09e41a51aa0752b1ce525ce084f7cd210e461b.tar.gz |
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>
Diffstat (limited to 'hw/ide')
-rw-r--r-- | hw/ide/ahci.c | 2 | ||||
-rw-r--r-- | hw/ide/atapi.c | 2 | ||||
-rw-r--r-- | hw/ide/cmd646.c | 4 | ||||
-rw-r--r-- | hw/ide/core.c | 6 | ||||
-rw-r--r-- | hw/ide/ich.c | 4 | ||||
-rw-r--r-- | hw/ide/internal.h | 6 | ||||
-rw-r--r-- | hw/ide/isa.c | 4 | ||||
-rw-r--r-- | hw/ide/macio.c | 2 | ||||
-rw-r--r-- | hw/ide/microdrive.c | 2 | ||||
-rw-r--r-- | hw/ide/pci.c | 4 | ||||
-rw-r--r-- | hw/ide/piix.c | 4 | ||||
-rw-r--r-- | hw/ide/qdev.c | 2 | ||||
-rw-r--r-- | hw/ide/via.c | 4 |
13 files changed, 23 insertions, 23 deletions
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index ad0094f..d0ae8af 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -23,7 +23,7 @@ #include <hw/hw.h> #include <hw/pci/msi.h> -#include <hw/pc.h> +#include <hw/i386/pc.h> #include <hw/pci/pci.h> #include <hw/sysbus.h> diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c index 861fd2b..05e60b1 100644 --- a/hw/ide/atapi.c +++ b/hw/ide/atapi.c @@ -24,7 +24,7 @@ */ #include "hw/ide/internal.h" -#include "hw/scsi.h" +#include "hw/scsi/scsi.h" static void ide_atapi_cmd_read_dma_cb(void *opaque, int ret); diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index 745ef94..541d4ef 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -23,9 +23,9 @@ * THE SOFTWARE. */ #include <hw/hw.h> -#include <hw/pc.h> +#include <hw/i386/pc.h> #include <hw/pci/pci.h> -#include <hw/isa.h> +#include <hw/isa/isa.h> #include "block/block.h" #include "sysemu/sysemu.h" #include "sysemu/dma.h" diff --git a/hw/ide/core.c b/hw/ide/core.c index 3743dc3..87d67b7 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -23,14 +23,14 @@ * THE SOFTWARE. */ #include <hw/hw.h> -#include <hw/pc.h> +#include <hw/i386/pc.h> #include <hw/pci/pci.h> -#include <hw/isa.h> +#include <hw/isa/isa.h> #include "qemu/error-report.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" #include "sysemu/dma.h" -#include "hw/block-common.h" +#include "hw/block/block.h" #include "sysemu/blockdev.h" #include <hw/ide/internal.h> diff --git a/hw/ide/ich.c b/hw/ide/ich.c index cc30adc..ed1f1a2 100644 --- a/hw/ide/ich.c +++ b/hw/ide/ich.c @@ -62,9 +62,9 @@ #include <hw/hw.h> #include <hw/pci/msi.h> -#include <hw/pc.h> +#include <hw/i386/pc.h> #include <hw/pci/pci.h> -#include <hw/isa.h> +#include <hw/isa/isa.h> #include "block/block.h" #include "sysemu/dma.h" diff --git a/hw/ide/internal.h b/hw/ide/internal.h index d80360e..2c89b50 100644 --- a/hw/ide/internal.h +++ b/hw/ide/internal.h @@ -7,12 +7,12 @@ * non-internal declarations are in hw/ide.h */ #include <hw/ide.h> -#include <hw/isa.h> +#include <hw/isa/isa.h> #include "exec/iorange.h" #include "sysemu/dma.h" #include "sysemu/sysemu.h" -#include "hw/block-common.h" -#include "hw/scsi-defs.h" +#include "hw/block/block.h" +#include "block/scsi.h" /* debug IDE devices */ //#define DEBUG_IDE diff --git a/hw/ide/isa.c b/hw/ide/isa.c index fb7bb82..e0d47bf 100644 --- a/hw/ide/isa.c +++ b/hw/ide/isa.c @@ -23,8 +23,8 @@ * THE SOFTWARE. */ #include <hw/hw.h> -#include <hw/pc.h> -#include <hw/isa.h> +#include <hw/i386/pc.h> +#include <hw/isa/isa.h> #include "block/block.h" #include "sysemu/dma.h" diff --git a/hw/ide/macio.c b/hw/ide/macio.c index 375c46f..64b2406 100644 --- a/hw/ide/macio.c +++ b/hw/ide/macio.c @@ -24,7 +24,7 @@ */ #include "hw/hw.h" #include "hw/ppc/mac.h" -#include "hw/mac_dbdma.h" +#include "hw/ppc/mac_dbdma.h" #include "block/block.h" #include "sysemu/dma.h" diff --git a/hw/ide/microdrive.c b/hw/ide/microdrive.c index 642774e..92c1df0 100644 --- a/hw/ide/microdrive.c +++ b/hw/ide/microdrive.c @@ -23,7 +23,7 @@ * THE SOFTWARE. */ #include <hw/hw.h> -#include <hw/pc.h> +#include <hw/i386/pc.h> #include <hw/pcmcia.h> #include "block/block.h" #include "sysemu/dma.h" diff --git a/hw/ide/pci.c b/hw/ide/pci.c index 59fd539..a310975 100644 --- a/hw/ide/pci.c +++ b/hw/ide/pci.c @@ -23,9 +23,9 @@ * THE SOFTWARE. */ #include <hw/hw.h> -#include <hw/pc.h> +#include <hw/i386/pc.h> #include <hw/pci/pci.h> -#include <hw/isa.h> +#include <hw/isa/isa.h> #include "block/block.h" #include "sysemu/dma.h" diff --git a/hw/ide/piix.c b/hw/ide/piix.c index 4d3e822..1de284d 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -24,9 +24,9 @@ */ #include <hw/hw.h> -#include <hw/pc.h> +#include <hw/i386/pc.h> #include <hw/pci/pci.h> -#include <hw/isa.h> +#include <hw/isa/isa.h> #include "sysemu/blockdev.h" #include "sysemu/sysemu.h" #include "sysemu/dma.h" diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c index fd06da7..8a9a891 100644 --- a/hw/ide/qdev.c +++ b/hw/ide/qdev.c @@ -21,7 +21,7 @@ #include "qemu/error-report.h" #include <hw/ide/internal.h> #include "sysemu/blockdev.h" -#include "hw/block-common.h" +#include "hw/block/block.h" #include "sysemu/sysemu.h" /* --------------------------------- */ diff --git a/hw/ide/via.c b/hw/ide/via.c index f40c1ad..9d6a644 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -24,9 +24,9 @@ * THE SOFTWARE. */ #include <hw/hw.h> -#include <hw/pc.h> +#include <hw/i386/pc.h> #include <hw/pci/pci.h> -#include <hw/isa.h> +#include <hw/isa/isa.h> #include "block/block.h" #include "sysemu/sysemu.h" #include "sysemu/dma.h" |