hw/ide: Include 'ide-internal.h' from current path

Rename "internal.h" as "ide-internal.h", and include
it via its relative local path, instead of absolute
to the project root path.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20240226080632.9596-4-philmd@linaro.org>

diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index 54c9685495ef5ab3dd60b8b48bc0c065a3177b4b..b8123bc73d6e11197b1f226bf8f7ad197742c31e 100644 (file)
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -34,11 +34,11 @@
 #include "qemu/module.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/dma.h"
-#include "hw/ide/internal.h"
 #include "hw/ide/pci.h"
 #include "hw/ide/ahci-pci.h"
 #include "hw/ide/ahci-sysbus.h"
 #include "ahci_internal.h"
+#include "ide-internal.h"
 
 #include "trace.h"
 

diff --git a/hw/ide/ahci_internal.h b/hw/ide/ahci_internal.h
index 4e13329bb282b651ae231acc9a5e984b77ac2588..7e63ea231020dc745bf3dea0bb8d6260b76f7b0f 100644 (file)
--- a/hw/ide/ahci_internal.h
+++ b/hw/ide/ahci_internal.h
@@ -25,8 +25,8 @@
 #define HW_IDE_AHCI_INTERNAL_H
 
 #include "hw/ide/ahci.h"
-#include "hw/ide/internal.h"
 #include "hw/pci/pci_device.h"
+#include "ide-internal.h"
 
 #define AHCI_MEM_BAR_SIZE         0x1000
 #define AHCI_MAX_PORTS            32

diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c
index dcc39df9a44bd667aa9fdb917b48a9e9e0249b0d..73ec3731844846696cd7a87461c19934f7a8a1ca 100644 (file)
--- a/hw/ide/atapi.c
+++ b/hw/ide/atapi.c
@@ -24,10 +24,10 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/ide/internal.h"
 #include "hw/scsi/scsi.h"
 #include "sysemu/block-backend.h"
 #include "scsi/constants.h"
+#include "ide-internal.h"
 #include "trace.h"
 
 #define ATAPI_SECTOR_BITS (2 + BDRV_SECTOR_BITS)

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

diff --git a/hw/ide/core.c b/hw/ide/core.c
index 9c4a8129028073a809313d8c6d73c99b0114bd7b..130c4d886527941cb16697e029315e0fb12e7e2b 100644 (file)
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -41,7 +41,7 @@
 #include "qemu/cutils.h"
 #include "sysemu/replay.h"
 #include "sysemu/runstate.h"
-#include "hw/ide/internal.h"
+#include "ide-internal.h"
 #include "trace.h"
 
 /* These values were based on a Seagate ST3500418AS but have been modified

diff --git a/hw/ide/ide-bus.c b/hw/ide/ide-bus.c
index 57fe67b29cadbbef971a5875301cbca9cac45951..37d003dd9ad2d1bbb0eca85fd614abc8f2ed5def 100644 (file)
--- a/hw/ide/ide-bus.c
+++ b/hw/ide/ide-bus.c
@@ -21,10 +21,10 @@
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "qemu/module.h"
-#include "hw/ide/internal.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/blockdev.h"
 #include "sysemu/runstate.h"
+#include "ide-internal.h"
 
 static char *idebus_get_fw_dev_path(DeviceState *dev);
 static void idebus_unrealize(BusState *qdev);

diff --git a/hw/ide/ide-dev.c b/hw/ide/ide-dev.c
index c8e2033469ce118521a8e3407283faeb8437049d..799bd4b6ecffd16e132f17deda20e89b03758428 100644 (file)
--- a/hw/ide/ide-dev.c
+++ b/hw/ide/ide-dev.c
@@ -23,11 +23,11 @@
 #include "qemu/error-report.h"
 #include "qemu/module.h"
 #include "hw/ide/ide-dev.h"
-#include "hw/ide/internal.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/blockdev.h"
 #include "sysemu/sysemu.h"
 #include "qapi/visitor.h"
+#include "ide-internal.h"
 
 static Property ide_props[] = {
     DEFINE_PROP_UINT32("unit", IDEDevice, unit, -1),

diff --git a/hw/ide/internal.h b/hw/ide/ide-internal.h
similarity index 100%
rename from hw/ide/internal.h
rename to hw/ide/ide-internal.h

diff --git a/hw/ide/ioport.c b/hw/ide/ioport.c
index 0b283ac7830a056f6b2cf439a4c6cb7e0719c695..a2f457f0bd0c8869a45d82bc94ade1cfbe12a9ea 100644 (file)
--- a/hw/ide/ioport.c
+++ b/hw/ide/ioport.c
@@ -25,7 +25,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/isa/isa.h"
-#include "hw/ide/internal.h"
+#include "ide-internal.h"
 #include "trace.h"
 
 int ide_init_ioport(IDEBus *bus, ISADevice *dev, int iobase, int iobase2)

diff --git a/hw/ide/isa.c b/hw/ide/isa.c
index cc865c83dc540787e0b56f70c129a23ed3ce33ac..934c45887cccbf4a60d53e8c2c7ec15c2c6a999d 100644 (file)
--- a/hw/ide/isa.c
+++ b/hw/ide/isa.c
@@ -32,8 +32,8 @@
 #include "sysemu/dma.h"
 
 #include "hw/ide/isa.h"
-#include "hw/ide/internal.h"
 #include "qom/object.h"
+#include "ide-internal.h"
 
 /***********************************************************/
 /* ISA IDE definitions */

diff --git a/hw/ide/macio.c b/hw/ide/macio.c
index 0d2c6ba910bd4ac298c039f007bf44c4007955f2..aca90d04f0e86f494ac308357c646e8154396335 100644 (file)
--- a/hw/ide/macio.c
+++ b/hw/ide/macio.c
@@ -33,7 +33,7 @@
 #include "sysemu/block-backend.h"
 #include "sysemu/dma.h"
 
-#include "hw/ide/internal.h"
+#include "ide-internal.h"
 
 /* debug MACIO */
 // #define DEBUG_MACIO

diff --git a/hw/ide/microdrive.c b/hw/ide/microdrive.c
index a7f415f0fce389020dd2708acb2488d38ac361ca..3bb152b5d338e3f19e5d2da3b716ad7329f3e61b 100644 (file)
--- a/hw/ide/microdrive.c
+++ b/hw/ide/microdrive.c
@@ -31,8 +31,8 @@
 #include "sysemu/dma.h"
 #include "hw/irq.h"
 
-#include "hw/ide/internal.h"
 #include "qom/object.h"
+#include "ide-internal.h"
 
 #define TYPE_MICRODRIVE "microdrive"
 OBJECT_DECLARE_SIMPLE_TYPE(MicroDriveState, MICRODRIVE)

diff --git a/hw/ide/mmio.c b/hw/ide/mmio.c
index e8f41c0610356f5dc3e83a6528601fda314f1b01..87362813056fd7f13c3f3d412bd5dd28209a165b 100644 (file)
--- a/hw/ide/mmio.c
+++ b/hw/ide/mmio.c
@@ -30,8 +30,8 @@
 #include "sysemu/dma.h"
 
 #include "hw/ide/mmio.h"
-#include "hw/ide/internal.h"
 #include "hw/qdev-properties.h"
+#include "ide-internal.h"
 
 /***********************************************************/
 /* MMIO based ide port

diff --git a/hw/ide/pci.c b/hw/ide/pci.c
index 73efeec7f40842703bfdde88dd4692373975bb1d..4675d079a17cbecad460d8f8976c2cb0bce4ff99 100644 (file)
--- a/hw/ide/pci.c
+++ b/hw/ide/pci.c
@@ -30,8 +30,8 @@
 #include "sysemu/dma.h"
 #include "qemu/error-report.h"
 #include "qemu/module.h"
-#include "hw/ide/internal.h"
 #include "hw/ide/pci.h"
+#include "ide-internal.h"
 #include "trace.h"
 
 #define BMDMA_PAGE_SIZE 4096

diff --git a/hw/ide/piix.c b/hw/ide/piix.c
index 1773a068c35bcdd51a0103d9a147142ab2bb8314..80efc633d3c2c6a6e5af59de4f553ec7d9711e45 100644 (file)
--- a/hw/ide/piix.c
+++ b/hw/ide/piix.c
@@ -30,9 +30,9 @@
 #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 "ide-internal.h"
 #include "trace.h"
 
 static uint64_t bmdma_read(void *opaque, hwaddr addr, unsigned size)

diff --git a/hw/ide/sii3112.c b/hw/ide/sii3112.c
index 321b9e46a1cd1f59b20671b23b8df7be3ec7f44f..af17384ff205790ce380d03a037a18f241a901e2 100644 (file)
--- a/hw/ide/sii3112.c
+++ b/hw/ide/sii3112.c
@@ -13,11 +13,11 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/ide/internal.h"
 #include "hw/ide/pci.h"
 #include "qemu/module.h"
 #include "trace.h"
 #include "qom/object.h"
+#include "ide-internal.h"
 
 #define TYPE_SII3112_PCI "sii3112"
 OBJECT_DECLARE_SIMPLE_TYPE(SiI3112PCIState, SII3112_PCI)

diff --git a/hw/ide/via.c b/hw/ide/via.c
index cf151e70ec7da3ea05f37db48a9cceb027c7c1b7..a32f56b0e791f57e9391419e0f18c6df20c30d28 100644 (file)
--- a/hw/ide/via.c
+++ b/hw/ide/via.c
@@ -25,7 +25,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/ide/internal.h"
 #include "hw/pci/pci.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"
@@ -34,6 +33,7 @@
 #include "hw/isa/vt82c686.h"
 #include "hw/ide/pci.h"
 #include "hw/irq.h"
+#include "ide-internal.h"
 #include "trace.h"
 
 static uint64_t bmdma_read(void *opaque, hwaddr addr,