Re: [PATCH 3/8] hw/ide: Remove now unneded #include "hw/pci/pci.h" from hw/ide.h

[Philippe Mathieu-Daudé]

On 3/13/20 10:14 PM, BALATON Zoltan wrote:
> 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 <address@hidden>

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>

> ---
>   hw/ide/ahci_internal.h        | 1 +
>   include/hw/ide.h              | 1 -
>   include/hw/ide/pci.h          | 1 +
>   include/hw/misc/macio/macio.h | 1 +
>   4 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/hw/ide/ahci_internal.h b/hw/ide/ahci_internal.h
> index 73424516da..bab0459774 100644
> --- a/hw/ide/ahci_internal.h
> +++ b/hw/ide/ahci_internal.h
> @@ -27,6 +27,7 @@
>   #include "hw/ide/ahci.h"
>   #include "hw/ide/internal.h"
>   #include "hw/sysbus.h"
> +#include "hw/pci/pci.h"
>   
>   #define AHCI_MEM_BAR_SIZE         0x1000
>   #define AHCI_MAX_PORTS            32
> diff --git a/include/hw/ide.h b/include/hw/ide.h
> index 21bd8f23f1..d52c211f32 100644
> --- a/include/hw/ide.h
> +++ b/include/hw/ide.h
> @@ -2,7 +2,6 @@
>   #define HW_IDE_H
>   
>   #include "hw/isa/isa.h"
> -#include "hw/pci/pci.h"
>   #include "exec/memory.h"
>   
>   #define MAX_IDE_DEVS	2
> diff --git a/include/hw/ide/pci.h b/include/hw/ide/pci.h
> index a9f2c33e68..98ffa7dfcd 100644
> --- a/include/hw/ide/pci.h
> +++ b/include/hw/ide/pci.h
> @@ -2,6 +2,7 @@
>   #define HW_IDE_PCI_H
>   
>   #include "hw/ide/internal.h"
> +#include "hw/pci/pci.h"
>   
>   #define BM_STATUS_DMAING 0x01
>   #define BM_STATUS_ERROR  0x02
> diff --git a/include/hw/misc/macio/macio.h b/include/hw/misc/macio/macio.h
> index 070a694eb5..87335a991c 100644
> --- a/include/hw/misc/macio/macio.h
> +++ b/include/hw/misc/macio/macio.h
> @@ -27,6 +27,7 @@
>   #define MACIO_H
>   
>   #include "hw/char/escc.h"
> +#include "hw/pci/pci.h"
>   #include "hw/ide/internal.h"
>   #include "hw/intc/heathrow_pic.h"
>   #include "hw/misc/macio/cuda.h"