diff options
author | Markus Armbruster <armbru@redhat.com> | 2019-08-12 07:23:40 +0200 |
---|---|---|
committer | Markus Armbruster <armbru@redhat.com> | 2019-08-16 13:31:52 +0200 |
commit | 5a720b1ed55a80672fdacf340fda0224f17146f3 (patch) | |
tree | c0cb3b2a5f053c4ff8a6e881a933505634d74bac /hw | |
parent | ca77ee28e03fb5052be01b9237b0a7cef5d90d4a (diff) |
ide: Include hw/ide/internal a bit less outside hw/ide/
According to hw/ide/internal's file comment, only files in hw/ide/ are
supposed to include it. Drag reality slightly closer to supposition.
Three includes outside hw/ide remain: hw/arm/sbsa-ref.c,
include/hw/ide/pci.h, and include/hw/misc/macio/macio.h. Turns out
board code needs ide-internal.h to wire up IDE stuff. More cleanup is
needed. Left for another day.
Cc: John Snow <jsnow@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190812052359.30071-11-armbru@redhat.com>
Diffstat (limited to 'hw')
-rw-r--r-- | hw/arm/allwinner-a10.c | 1 | ||||
-rw-r--r-- | hw/arm/cubieboard.c | 1 | ||||
-rw-r--r-- | hw/arm/xlnx-zynqmp.c | 1 | ||||
-rw-r--r-- | hw/ide/ahci_internal.h | 1 | ||||
-rw-r--r-- | hw/ppc/mac.h | 1 |
5 files changed, 4 insertions, 1 deletions
diff --git a/hw/arm/allwinner-a10.c b/hw/arm/allwinner-a10.c index 35e906ca54..3b0d3eccdd 100644 --- a/hw/arm/allwinner-a10.c +++ b/hw/arm/allwinner-a10.c @@ -16,6 +16,7 @@ */ #include "qemu/osdep.h" +#include "exec/address-spaces.h" #include "qapi/error.h" #include "qemu/module.h" #include "cpu.h" diff --git a/hw/arm/cubieboard.c b/hw/arm/cubieboard.c index f7c8a5985a..38e0ca0f53 100644 --- a/hw/arm/cubieboard.c +++ b/hw/arm/cubieboard.c @@ -16,6 +16,7 @@ */ #include "qemu/osdep.h" +#include "exec/address-spaces.h" #include "qapi/error.h" #include "cpu.h" #include "hw/sysbus.h" diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index a60830d37a..0f587e63d3 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -24,6 +24,7 @@ #include "hw/boards.h" #include "exec/address-spaces.h" #include "sysemu/kvm.h" +#include "sysemu/sysemu.h" #include "kvm_arm.h" #define GIC_NUM_SPI_INTR 160 diff --git a/hw/ide/ahci_internal.h b/hw/ide/ahci_internal.h index 95ecddcd3c..73424516da 100644 --- a/hw/ide/ahci_internal.h +++ b/hw/ide/ahci_internal.h @@ -25,6 +25,7 @@ #define HW_IDE_AHCI_INTERNAL_H #include "hw/ide/ahci.h" +#include "hw/ide/internal.h" #include "hw/sysbus.h" #define AHCI_MEM_BAR_SIZE 0x1000 diff --git a/hw/ppc/mac.h b/hw/ppc/mac.h index a741300ac9..6af87d1fa0 100644 --- a/hw/ppc/mac.h +++ b/hw/ppc/mac.h @@ -30,7 +30,6 @@ #include "exec/memory.h" #include "hw/boards.h" #include "hw/sysbus.h" -#include "hw/ide/internal.h" #include "hw/input/adb.h" #include "hw/misc/mos6522.h" #include "hw/pci/pci_host.h" |