Re: [PATCH] hw/ide: Remove last two uses of ide/internal.h outside of hw/ide

[Thomas Huth]

On 23/02/2024 15.26, BALATON Zoltan wrote:
> Remove last two includes of hw/ide/intarnal.h outside of hw/ide and
> replace them with newly added public header to allow moving internal.h
> into hw/ide to really stop exposing it.
>
> Fixes: a11f439a0e (hw/ide: Stop exposing internal.h to non-IDE files)
> Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
> ---
>   hw/arm/sbsa-ref.c                 | 2 +-
>   {include/hw => hw}/ide/internal.h | 0
>   include/hw/misc/macio/macio.h     | 2 +-
>   3 files changed, 2 insertions(+), 2 deletions(-)
>   rename {include/hw => hw}/ide/internal.h (100%)
>
> diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c
> index 5d3a574664..f027622a75 100644
> --- a/hw/arm/sbsa-ref.c
> +++ b/hw/arm/sbsa-ref.c
> @@ -36,7 +36,7 @@
>   #include "hw/arm/smmuv3.h"
>   #include "hw/block/flash.h"
>   #include "hw/boards.h"
> -#include "hw/ide/internal.h"
> +#include "hw/ide/ide-bus.h"
>   #include "hw/ide/ahci_internal.h"
>   #include "hw/ide/ahci-sysbus.h"
>   #include "hw/intc/arm_gicv3_common.h"
> diff --git a/include/hw/ide/internal.h b/hw/ide/internal.h
> similarity index 100%
> rename from include/hw/ide/internal.h
> rename to hw/ide/internal.h
> diff --git a/include/hw/misc/macio/macio.h b/include/hw/misc/macio/macio.h
> index 86df2c2b60..2b54da6b31 100644
> --- a/include/hw/misc/macio/macio.h
> +++ b/include/hw/misc/macio/macio.h
> @@ -28,7 +28,7 @@
>   
>   #include "hw/char/escc.h"
>   #include "hw/pci/pci_device.h"
> -#include "hw/ide/internal.h"
> +#include "hw/ide/ide-bus.h"
>   #include "hw/intc/heathrow_pic.h"
>   #include "hw/misc/macio/cuda.h"
>   #include "hw/misc/macio/gpio.h"

Oh, I was sure that I got them all ... thanks for double checking!

Reviewed-by: Thomas Huth <thuth@redhat.com>