From c6ff8bde8d359ab53ba906d803ad49bd5b192fea Mon Sep 17 00:00:00 2001 From: BALATON Zoltan Date: Fri, 23 Feb 2024 15:26:33 +0100 Subject: [PATCH] hw/ide: Remove last two uses of ide/internal.h outside of hw/ide/ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Message-ID: <20240223142633.933694E6004@zero.eik.bme.hu> Signed-off-by: Philippe Mathieu-Daudé --- 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 4a59e2fd37..13dde50cba 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-sysbus.h" #include "hw/intc/arm_gicv3_common.h" #include "hw/intc/arm_gicv3_its_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"