diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2009-08-20 15:22:26 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-08-27 20:46:50 -0500 |
| commit | 59f2a78793b6d17634f39646d604e84af51e0919 (patch) | |
| tree | da46ccf772b699b442b81147ded89cf75e97cb3b /hw | |
| parent | 2bcbf7e4dd73fb7811ee0899f7a578412d045e81 (diff) | |
ide: move code to hw/ide/
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/ide/core.c (renamed from hw/ide.c) | 13 | ||||
| -rw-r--r-- | hw/ide/internal.h (renamed from hw/ide-internal.h) | 4 | ||||
| -rw-r--r-- | hw/ide/isa.c (renamed from hw/ide-isa.c) | 7 | ||||
| -rw-r--r-- | hw/ide/macio.c (renamed from hw/ide-macio.c) | 9 | ||||
| -rw-r--r-- | hw/ide/microdrive.c (renamed from hw/ide-microdrive.c) | 9 | ||||
| -rw-r--r-- | hw/ide/mmio.c (renamed from hw/ide-mmio.c) | 5 | ||||
| -rw-r--r-- | hw/ide/pci.c (renamed from hw/ide-pci.c) | 9 |
7 files changed, 31 insertions, 25 deletions
diff --git a/hw/ide.c b/hw/ide/core.c index 7064e6d0ac..79a3a9c7ad 100644 --- a/hw/ide.c +++ b/hw/ide/core.c @@ -22,17 +22,18 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" -#include "pc.h" -#include "pci.h" -#include "scsi-disk.h" +#include <hw/hw.h> +#include <hw/pc.h> +#include <hw/pci.h> +#include <hw/scsi-disk.h> +#include <hw/sh.h> #include "block.h" #include "block_int.h" #include "qemu-timer.h" #include "sysemu.h" -#include "sh.h" #include "dma.h" -#include "ide-internal.h" + +#include <hw/ide/internal.h> static int smart_attributes[][5] = { /* id, flags, val, wrst, thrsh */ diff --git a/hw/ide-internal.h b/hw/ide/internal.h index 4f3f86ceb5..65991a8b07 100644 --- a/hw/ide-internal.h +++ b/hw/ide/internal.h @@ -3,10 +3,10 @@ /* * QEMU IDE Emulation -- internal header file - * only hw/ide*.c is supposed to include this file. + * only files in hw/ide/ are supposed to include this file. * non-internal declarations are in hw/ide.h */ -#include "ide.h" +#include <hw/ide.h> /* debug IDE devices */ //#define DEBUG_IDE diff --git a/hw/ide-isa.c b/hw/ide/isa.c index 279474b30e..aa026c7a62 100644 --- a/hw/ide-isa.c +++ b/hw/ide/isa.c @@ -22,13 +22,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" -#include "pc.h" +#include <hw/hw.h> +#include <hw/pc.h> #include "block.h" #include "block_int.h" #include "sysemu.h" #include "dma.h" -#include "ide-internal.h" + +#include <hw/ide/internal.h> /***********************************************************/ /* ISA IDE definitions */ diff --git a/hw/ide-macio.c b/hw/ide/macio.c index d4135efe3a..4dc35682f1 100644 --- a/hw/ide-macio.c +++ b/hw/ide/macio.c @@ -22,14 +22,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" +#include <hw/hw.h> +#include <hw/ppc_mac.h> +#include <hw/mac_dbdma.h> #include "block.h" #include "block_int.h" #include "sysemu.h" #include "dma.h" -#include "ppc_mac.h" -#include "mac_dbdma.h" -#include "ide-internal.h" + +#include <hw/ide/internal.h> /***********************************************************/ /* MacIO based PowerPC IDE */ diff --git a/hw/ide-microdrive.c b/hw/ide/microdrive.c index f055425fae..a735452e50 100644 --- a/hw/ide-microdrive.c +++ b/hw/ide/microdrive.c @@ -22,14 +22,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" -#include "pc.h" +#include <hw/hw.h> +#include <hw/pc.h> +#include <hw/pcmcia.h> #include "block.h" #include "block_int.h" #include "sysemu.h" #include "dma.h" -#include "ide-internal.h" -#include "pcmcia.h" + +#include <hw/ide/internal.h> /***********************************************************/ /* CF-ATA Microdrive */ diff --git a/hw/ide-mmio.c b/hw/ide/mmio.c index ba4363049e..99ddf9d4d9 100644 --- a/hw/ide-mmio.c +++ b/hw/ide/mmio.c @@ -22,12 +22,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" +#include <hw/hw.h> #include "block.h" #include "block_int.h" #include "sysemu.h" #include "dma.h" -#include "ide-internal.h" + +#include <hw/ide/internal.h> /***********************************************************/ /* MMIO based ide port diff --git a/hw/ide-pci.c b/hw/ide/pci.c index e3826bfec0..a3d6bd0dc6 100644 --- a/hw/ide-pci.c +++ b/hw/ide/pci.c @@ -22,14 +22,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" -#include "pc.h" +#include <hw/hw.h> +#include <hw/pc.h> +#include <hw/pci.h> #include "block.h" #include "block_int.h" #include "sysemu.h" #include "dma.h" -#include "pci.h" -#include "ide-internal.h" + +#include <hw/ide/internal.h> /***********************************************************/ /* PCI IDE definitions */ |