hw/ide: Stop exposing internal.h to non-IDE files

include/hw/ide/internal.h is currently included by include/hw/ide/pci.h
and thus exposed to a lot of files that are not part of the IDE subsystem.
Stop including internal.h there and use the appropriate new headers
ide-bus.h and ide-dma.h instead.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Acked-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-ID: <20240220085505.30255-8-thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>

diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 1ee41a5e56933010e3927c6590eb3d41cefb2027..f8eb684a492689d7f6519b7f3cfb7f8ec7ed3bab 100644 (file)
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -31,7 +31,7 @@
 #include "hw/i386/fw_cfg.h"
 #include "hw/i386/vmport.h"
 #include "sysemu/cpus.h"
-#include "hw/ide/internal.h"
+#include "hw/ide/ide-bus.h"
 #include "hw/timer/hpet.h"
 #include "hw/loader.h"
 #include "hw/rtc/mc146818rtc.h"

diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c
index c0bcfa44143780a91d8d4f5d41af6ef9535260bc..23d213ff01e7e6b7e87b33124318c747debb6989 100644 (file)
--- a/hw/ide/cmd646.c
+++ b/hw/ide/cmd646.c
@@ -33,6 +33,7 @@
 #include "sysemu/reset.h"
 
 #include "hw/ide/pci.h"
+#include "hw/ide/internal.h"
 #include "trace.h"
 
 /* CMD646 specific */

diff --git a/hw/ide/pci.c b/hw/ide/pci.c
index ca85d8474c14e8afb7aa2a3355f463cbb47779d4..73efeec7f40842703bfdde88dd4692373975bb1d 100644 (file)
--- a/hw/ide/pci.c
+++ b/hw/ide/pci.c
@@ -30,6 +30,7 @@
 #include "sysemu/dma.h"
 #include "qemu/error-report.h"
 #include "qemu/module.h"
+#include "hw/ide/internal.h"
 #include "hw/ide/pci.h"
 #include "trace.h"
 

diff --git a/hw/ide/piix.c b/hw/ide/piix.c
index 4e5e12935f59b1d7a256d49ae119d7649e1119d3..1773a068c35bcdd51a0103d9a147142ab2bb8314 100644 (file)
--- a/hw/ide/piix.c
+++ b/hw/ide/piix.c
@@ -30,6 +30,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "hw/pci/pci.h"
+#include "hw/ide/internal.h"
 #include "hw/ide/piix.h"
 #include "hw/ide/pci.h"
 #include "trace.h"

diff --git a/hw/ide/sii3112.c b/hw/ide/sii3112.c
index 63dc4a0494fc5d3a92beadc2d1a673afc10dad98..321b9e46a1cd1f59b20671b23b8df7be3ec7f44f 100644 (file)
--- a/hw/ide/sii3112.c
+++ b/hw/ide/sii3112.c
@@ -13,6 +13,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "hw/ide/internal.h"
 #include "hw/ide/pci.h"
 #include "qemu/module.h"
 #include "trace.h"

diff --git a/hw/ide/via.c b/hw/ide/via.c
index 3f3c484253d1742968ad253a54f87da3cbc8fb7c..cf151e70ec7da3ea05f37db48a9cceb027c7c1b7 100644 (file)
--- a/hw/ide/via.c
+++ b/hw/ide/via.c
@@ -25,6 +25,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "hw/ide/internal.h"
 #include "hw/pci/pci.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"

diff --git a/include/hw/ide/pci.h b/include/hw/ide/pci.h
index a814a0a7c367a450ed0154dd3693a67a48e38dbe..ef03764caaf003ce368eeef169572fbe5ebf2ce9 100644 (file)
--- a/include/hw/ide/pci.h
+++ b/include/hw/ide/pci.h
@@ -1,7 +1,7 @@
 #ifndef HW_IDE_PCI_H
 #define HW_IDE_PCI_H
 
-#include "hw/ide/internal.h"
+#include "hw/ide/ide-bus.h"
 #include "hw/pci/pci_device.h"
 #include "qom/object.h"