瀏覽代碼

hw/ide: Remove now unneded #include "hw/pci/pci.h" from hw/ide.h

After previous patches we don't need hw/pci/pci.h any more in
hw/ide.h. Some files depended on implicit inclusion by this header
which are also fixed up here.

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-id: 444a5e34331bf1f7880541b8d46e0353f470f5a6.1584457537.git.balaton@eik.bme.hu
Signed-off-by: John Snow <jsnow@redhat.com>
BALATON Zoltan 5 年之前
父節點
當前提交
5a6ac100f6
共有 4 個文件被更改,包括 3 次插入1 次删除
  1. 1 0
      hw/ide/ahci_internal.h
  2. 0 1
      include/hw/ide.h
  3. 1 0
      include/hw/ide/pci.h
  4. 1 0
      include/hw/misc/macio/macio.h

+ 1 - 0
hw/ide/ahci_internal.h

@@ -27,6 +27,7 @@
 #include "hw/ide/ahci.h"
 #include "hw/ide/ahci.h"
 #include "hw/ide/internal.h"
 #include "hw/ide/internal.h"
 #include "hw/sysbus.h"
 #include "hw/sysbus.h"
+#include "hw/pci/pci.h"
 
 
 #define AHCI_MEM_BAR_SIZE         0x1000
 #define AHCI_MEM_BAR_SIZE         0x1000
 #define AHCI_MAX_PORTS            32
 #define AHCI_MAX_PORTS            32

+ 0 - 1
include/hw/ide.h

@@ -2,7 +2,6 @@
 #define HW_IDE_H
 #define HW_IDE_H
 
 
 #include "hw/isa/isa.h"
 #include "hw/isa/isa.h"
-#include "hw/pci/pci.h"
 #include "exec/memory.h"
 #include "exec/memory.h"
 
 
 #define MAX_IDE_DEVS	2
 #define MAX_IDE_DEVS	2

+ 1 - 0
include/hw/ide/pci.h

@@ -2,6 +2,7 @@
 #define HW_IDE_PCI_H
 #define HW_IDE_PCI_H
 
 
 #include "hw/ide/internal.h"
 #include "hw/ide/internal.h"
+#include "hw/pci/pci.h"
 
 
 #define BM_STATUS_DMAING 0x01
 #define BM_STATUS_DMAING 0x01
 #define BM_STATUS_ERROR  0x02
 #define BM_STATUS_ERROR  0x02

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

@@ -27,6 +27,7 @@
 #define MACIO_H
 #define MACIO_H
 
 
 #include "hw/char/escc.h"
 #include "hw/char/escc.h"
+#include "hw/pci/pci.h"
 #include "hw/ide/internal.h"
 #include "hw/ide/internal.h"
 #include "hw/intc/heathrow_pic.h"
 #include "hw/intc/heathrow_pic.h"
 #include "hw/misc/macio/cuda.h"
 #include "hw/misc/macio/cuda.h"