Commit 5a720b1e authored by Markus Armbruster's avatar Markus Armbruster
Browse files

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: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarJohn Snow <jsnow@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190812052359.30071-11-armbru@redhat.com>
parent ca77ee28

hw/arm/allwinner-a10.c

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
 */



#include "qemu/osdep.h"

#include "exec/address-spaces.h"

#include "qapi/error.h"

#include "qemu/module.h"

#include "cpu.h"

hw/arm/cubieboard.c

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
 */



#include "qemu/osdep.h"

#include "exec/address-spaces.h"

#include "qapi/error.h"

#include "cpu.h"

#include "hw/sysbus.h"

hw/arm/xlnx-zynqmp.c

+1 −0
Original line number Diff line number Diff line
@@ -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

hw/ide/ahci_internal.h

+1 −0
Original line number Diff line number Diff line
@@ -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

hw/ppc/mac.h

+0 −1
Original line number Diff line number Diff line
@@ -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"