As reported by Philippe Mathieu-Daudé, including AHCI headers can quickly pull in more dependencies than is sane. To remedy this, split the AHCI headers into public and private areas as best as we can and move the private information back into hw/ide/.
The only code movement is performed in patch 2. Patch 3 looks terrible, but all it is doing are two different moves, renaming one include directive. If you have suggestions for doing this diffstat differently, please advise. John Snow (3): ahci: add ahci_get_num_ports ahci: Isolate public AHCI interface ahci: split public and private interface hw/i386/pc_q35.c | 4 +- hw/ide/ahci.c | 10 +- hw/ide/ahci_internal.h | 359 +++++++++++++++++++++++++++++++++++++++++++++++++ hw/ide/ich.c | 2 +- hw/mips/boston.c | 4 +- include/hw/ide/ahci.h | 320 +------------------------------------------ 6 files changed, 376 insertions(+), 323 deletions(-) create mode 100644 hw/ide/ahci_internal.h -- 2.9.4
