Browse Source

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 6 years ago
parent
commit
5a720b1ed5

+ 1 - 0
hw/arm/allwinner-a10.c

@@ -16,6 +16,7 @@
  */
  */
 
 
 #include "qemu/osdep.h"
 #include "qemu/osdep.h"
+#include "exec/address-spaces.h"
 #include "qapi/error.h"
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "qemu/module.h"
 #include "cpu.h"
 #include "cpu.h"

+ 1 - 0
hw/arm/cubieboard.c

@@ -16,6 +16,7 @@
  */
  */
 
 
 #include "qemu/osdep.h"
 #include "qemu/osdep.h"
+#include "exec/address-spaces.h"
 #include "qapi/error.h"
 #include "qapi/error.h"
 #include "cpu.h"
 #include "cpu.h"
 #include "hw/sysbus.h"
 #include "hw/sysbus.h"

+ 1 - 0
hw/arm/xlnx-zynqmp.c

@@ -24,6 +24,7 @@
 #include "hw/boards.h"
 #include "hw/boards.h"
 #include "exec/address-spaces.h"
 #include "exec/address-spaces.h"
 #include "sysemu/kvm.h"
 #include "sysemu/kvm.h"
+#include "sysemu/sysemu.h"
 #include "kvm_arm.h"
 #include "kvm_arm.h"
 
 
 #define GIC_NUM_SPI_INTR 160
 #define GIC_NUM_SPI_INTR 160

+ 1 - 0
hw/ide/ahci_internal.h

@@ -25,6 +25,7 @@
 #define HW_IDE_AHCI_INTERNAL_H
 #define HW_IDE_AHCI_INTERNAL_H
 
 
 #include "hw/ide/ahci.h"
 #include "hw/ide/ahci.h"
+#include "hw/ide/internal.h"
 #include "hw/sysbus.h"
 #include "hw/sysbus.h"
 
 
 #define AHCI_MEM_BAR_SIZE         0x1000
 #define AHCI_MEM_BAR_SIZE         0x1000

+ 0 - 1
hw/ppc/mac.h

@@ -30,7 +30,6 @@
 #include "exec/memory.h"
 #include "exec/memory.h"
 #include "hw/boards.h"
 #include "hw/boards.h"
 #include "hw/sysbus.h"
 #include "hw/sysbus.h"
-#include "hw/ide/internal.h"
 #include "hw/input/adb.h"
 #include "hw/input/adb.h"
 #include "hw/misc/mos6522.h"
 #include "hw/misc/mos6522.h"
 #include "hw/pci/pci_host.h"
 #include "hw/pci/pci_host.h"

+ 0 - 1
include/hw/arm/allwinner-a10.h

@@ -7,7 +7,6 @@
 #include "hw/timer/allwinner-a10-pit.h"
 #include "hw/timer/allwinner-a10-pit.h"
 #include "hw/intc/allwinner-a10-pic.h"
 #include "hw/intc/allwinner-a10-pic.h"
 #include "hw/net/allwinner_emac.h"
 #include "hw/net/allwinner_emac.h"
-#include "hw/ide/pci.h"
 #include "hw/ide/ahci.h"
 #include "hw/ide/ahci.h"
 
 
 #include "sysemu/sysemu.h"
 #include "sysemu/sysemu.h"

+ 0 - 1
include/hw/arm/xlnx-zynqmp.h

@@ -22,7 +22,6 @@
 #include "hw/intc/arm_gic.h"
 #include "hw/intc/arm_gic.h"
 #include "hw/net/cadence_gem.h"
 #include "hw/net/cadence_gem.h"
 #include "hw/char/cadence_uart.h"
 #include "hw/char/cadence_uart.h"
-#include "hw/ide/pci.h"
 #include "hw/ide/ahci.h"
 #include "hw/ide/ahci.h"
 #include "hw/sd/sdhci.h"
 #include "hw/sd/sdhci.h"
 #include "hw/ssi/xilinx_spips.h"
 #include "hw/ssi/xilinx_spips.h"

+ 0 - 1
include/hw/misc/mos6522.h

@@ -29,7 +29,6 @@
 
 
 #include "exec/memory.h"
 #include "exec/memory.h"
 #include "hw/sysbus.h"
 #include "hw/sysbus.h"
-#include "hw/ide/internal.h"
 #include "hw/input/adb.h"
 #include "hw/input/adb.h"
 
 
 /* Bits in ACR */
 /* Bits in ACR */