jcs.org / qemu
qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio
fork atom

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>

Markus Armbruster 5a720b1e ca77ee28

+4 -4
+1
hw/arm/allwinner-a10.c
··· 16 16 */ 17 17 18 18 #include "qemu/osdep.h" 19 + #include "exec/address-spaces.h" 19 20 #include "qapi/error.h" 20 21 #include "qemu/module.h" 21 22 #include "cpu.h"
+1
hw/arm/cubieboard.c
··· 16 16 */ 17 17 18 18 #include "qemu/osdep.h" 19 + #include "exec/address-spaces.h" 19 20 #include "qapi/error.h" 20 21 #include "cpu.h" 21 22 #include "hw/sysbus.h"
+1
hw/arm/xlnx-zynqmp.c
··· 24 24 #include "hw/boards.h" 25 25 #include "exec/address-spaces.h" 26 26 #include "sysemu/kvm.h" 27 + #include "sysemu/sysemu.h" 27 28 #include "kvm_arm.h" 28 29 29 30 #define GIC_NUM_SPI_INTR 160
+1
hw/ide/ahci_internal.h
··· 25 25 #define HW_IDE_AHCI_INTERNAL_H 26 26 27 27 #include "hw/ide/ahci.h" 28 + #include "hw/ide/internal.h" 28 29 #include "hw/sysbus.h" 29 30 30 31 #define AHCI_MEM_BAR_SIZE 0x1000
-1
hw/ppc/mac.h
··· 30 30 #include "exec/memory.h" 31 31 #include "hw/boards.h" 32 32 #include "hw/sysbus.h" 33 - #include "hw/ide/internal.h" 34 33 #include "hw/input/adb.h" 35 34 #include "hw/misc/mos6522.h" 36 35 #include "hw/pci/pci_host.h"
-1
include/hw/arm/allwinner-a10.h
··· 7 7 #include "hw/timer/allwinner-a10-pit.h" 8 8 #include "hw/intc/allwinner-a10-pic.h" 9 9 #include "hw/net/allwinner_emac.h" 10 - #include "hw/ide/pci.h" 11 10 #include "hw/ide/ahci.h" 12 11 13 12 #include "sysemu/sysemu.h"
-1
include/hw/arm/xlnx-zynqmp.h
··· 22 22 #include "hw/intc/arm_gic.h" 23 23 #include "hw/net/cadence_gem.h" 24 24 #include "hw/char/cadence_uart.h" 25 - #include "hw/ide/pci.h" 26 25 #include "hw/ide/ahci.h" 27 26 #include "hw/sd/sdhci.h" 28 27 #include "hw/ssi/xilinx_spips.h"
-1
include/hw/misc/mos6522.h
··· 29 29 30 30 #include "exec/memory.h" 31 31 #include "hw/sysbus.h" 32 - #include "hw/ide/internal.h" 33 32 #include "hw/input/adb.h" 34 33 35 34 /* Bits in ACR */