Browse Source

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>
Philippe Mathieu-Daudé 1 year ago
parent
commit
0316482e87
17 changed files with 16 additions and 16 deletions
  1. 1 1
      hw/ide/ahci.c
  2. 1 1
      hw/ide/ahci_internal.h
  3. 1 1
      hw/ide/atapi.c
  4. 1 1
      hw/ide/cmd646.c
  5. 1 1
      hw/ide/core.c
  6. 1 1
      hw/ide/ide-bus.c
  7. 1 1
      hw/ide/ide-dev.c
  8. 0 0
      hw/ide/ide-internal.h
  9. 1 1
      hw/ide/ioport.c
  10. 1 1
      hw/ide/isa.c
  11. 1 1
      hw/ide/macio.c
  12. 1 1
      hw/ide/microdrive.c
  13. 1 1
      hw/ide/mmio.c
  14. 1 1
      hw/ide/pci.c
  15. 1 1
      hw/ide/piix.c
  16. 1 1
      hw/ide/sii3112.c
  17. 1 1
      hw/ide/via.c

+ 1 - 1
hw/ide/ahci.c

@@ -34,11 +34,11 @@
 #include "qemu/module.h"
 #include "qemu/module.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/dma.h"
 #include "sysemu/dma.h"
-#include "hw/ide/internal.h"
 #include "hw/ide/pci.h"
 #include "hw/ide/pci.h"
 #include "hw/ide/ahci-pci.h"
 #include "hw/ide/ahci-pci.h"
 #include "hw/ide/ahci-sysbus.h"
 #include "hw/ide/ahci-sysbus.h"
 #include "ahci_internal.h"
 #include "ahci_internal.h"
+#include "ide-internal.h"
 
 
 #include "trace.h"
 #include "trace.h"
 
 

+ 1 - 1
hw/ide/ahci_internal.h

@@ -25,8 +25,8 @@
 #define HW_IDE_AHCI_INTERNAL_H
 #define HW_IDE_AHCI_INTERNAL_H
 
 
 #include "hw/ide/ahci.h"
 #include "hw/ide/ahci.h"
-#include "hw/ide/internal.h"
 #include "hw/pci/pci_device.h"
 #include "hw/pci/pci_device.h"
+#include "ide-internal.h"
 
 
 #define AHCI_MEM_BAR_SIZE         0x1000
 #define AHCI_MEM_BAR_SIZE         0x1000
 #define AHCI_MAX_PORTS            32
 #define AHCI_MAX_PORTS            32

+ 1 - 1
hw/ide/atapi.c

@@ -24,10 +24,10 @@
  */
  */
 
 
 #include "qemu/osdep.h"
 #include "qemu/osdep.h"
-#include "hw/ide/internal.h"
 #include "hw/scsi/scsi.h"
 #include "hw/scsi/scsi.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/block-backend.h"
 #include "scsi/constants.h"
 #include "scsi/constants.h"
+#include "ide-internal.h"
 #include "trace.h"
 #include "trace.h"
 
 
 #define ATAPI_SECTOR_BITS (2 + BDRV_SECTOR_BITS)
 #define ATAPI_SECTOR_BITS (2 + BDRV_SECTOR_BITS)

+ 1 - 1
hw/ide/cmd646.c

@@ -33,7 +33,7 @@
 #include "sysemu/reset.h"
 #include "sysemu/reset.h"
 
 
 #include "hw/ide/pci.h"
 #include "hw/ide/pci.h"
-#include "hw/ide/internal.h"
+#include "ide-internal.h"
 #include "trace.h"
 #include "trace.h"
 
 
 /* CMD646 specific */
 /* CMD646 specific */

+ 1 - 1
hw/ide/core.c

@@ -41,7 +41,7 @@
 #include "qemu/cutils.h"
 #include "qemu/cutils.h"
 #include "sysemu/replay.h"
 #include "sysemu/replay.h"
 #include "sysemu/runstate.h"
 #include "sysemu/runstate.h"
-#include "hw/ide/internal.h"
+#include "ide-internal.h"
 #include "trace.h"
 #include "trace.h"
 
 
 /* These values were based on a Seagate ST3500418AS but have been modified
 /* These values were based on a Seagate ST3500418AS but have been modified

+ 1 - 1
hw/ide/ide-bus.c

@@ -21,10 +21,10 @@
 #include "qapi/error.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "qemu/error-report.h"
 #include "qemu/module.h"
 #include "qemu/module.h"
-#include "hw/ide/internal.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/blockdev.h"
 #include "sysemu/blockdev.h"
 #include "sysemu/runstate.h"
 #include "sysemu/runstate.h"
+#include "ide-internal.h"
 
 
 static char *idebus_get_fw_dev_path(DeviceState *dev);
 static char *idebus_get_fw_dev_path(DeviceState *dev);
 static void idebus_unrealize(BusState *qdev);
 static void idebus_unrealize(BusState *qdev);

+ 1 - 1
hw/ide/ide-dev.c

@@ -23,11 +23,11 @@
 #include "qemu/error-report.h"
 #include "qemu/error-report.h"
 #include "qemu/module.h"
 #include "qemu/module.h"
 #include "hw/ide/ide-dev.h"
 #include "hw/ide/ide-dev.h"
-#include "hw/ide/internal.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/blockdev.h"
 #include "sysemu/blockdev.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/sysemu.h"
 #include "qapi/visitor.h"
 #include "qapi/visitor.h"
+#include "ide-internal.h"
 
 
 static Property ide_props[] = {
 static Property ide_props[] = {
     DEFINE_PROP_UINT32("unit", IDEDevice, unit, -1),
     DEFINE_PROP_UINT32("unit", IDEDevice, unit, -1),

+ 0 - 0
hw/ide/internal.h → hw/ide/ide-internal.h


+ 1 - 1
hw/ide/ioport.c

@@ -25,7 +25,7 @@
 
 
 #include "qemu/osdep.h"
 #include "qemu/osdep.h"
 #include "hw/isa/isa.h"
 #include "hw/isa/isa.h"
-#include "hw/ide/internal.h"
+#include "ide-internal.h"
 #include "trace.h"
 #include "trace.h"
 
 
 int ide_init_ioport(IDEBus *bus, ISADevice *dev, int iobase, int iobase2)
 int ide_init_ioport(IDEBus *bus, ISADevice *dev, int iobase, int iobase2)

+ 1 - 1
hw/ide/isa.c

@@ -32,8 +32,8 @@
 #include "sysemu/dma.h"
 #include "sysemu/dma.h"
 
 
 #include "hw/ide/isa.h"
 #include "hw/ide/isa.h"
-#include "hw/ide/internal.h"
 #include "qom/object.h"
 #include "qom/object.h"
+#include "ide-internal.h"
 
 
 /***********************************************************/
 /***********************************************************/
 /* ISA IDE definitions */
 /* ISA IDE definitions */

+ 1 - 1
hw/ide/macio.c

@@ -33,7 +33,7 @@
 #include "sysemu/block-backend.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/dma.h"
 #include "sysemu/dma.h"
 
 
-#include "hw/ide/internal.h"
+#include "ide-internal.h"
 
 
 /* debug MACIO */
 /* debug MACIO */
 // #define DEBUG_MACIO
 // #define DEBUG_MACIO

+ 1 - 1
hw/ide/microdrive.c

@@ -31,8 +31,8 @@
 #include "sysemu/dma.h"
 #include "sysemu/dma.h"
 #include "hw/irq.h"
 #include "hw/irq.h"
 
 
-#include "hw/ide/internal.h"
 #include "qom/object.h"
 #include "qom/object.h"
+#include "ide-internal.h"
 
 
 #define TYPE_MICRODRIVE "microdrive"
 #define TYPE_MICRODRIVE "microdrive"
 OBJECT_DECLARE_SIMPLE_TYPE(MicroDriveState, MICRODRIVE)
 OBJECT_DECLARE_SIMPLE_TYPE(MicroDriveState, MICRODRIVE)

+ 1 - 1
hw/ide/mmio.c

@@ -30,8 +30,8 @@
 #include "sysemu/dma.h"
 #include "sysemu/dma.h"
 
 
 #include "hw/ide/mmio.h"
 #include "hw/ide/mmio.h"
-#include "hw/ide/internal.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties.h"
+#include "ide-internal.h"
 
 
 /***********************************************************/
 /***********************************************************/
 /* MMIO based ide port
 /* MMIO based ide port

+ 1 - 1
hw/ide/pci.c

@@ -30,8 +30,8 @@
 #include "sysemu/dma.h"
 #include "sysemu/dma.h"
 #include "qemu/error-report.h"
 #include "qemu/error-report.h"
 #include "qemu/module.h"
 #include "qemu/module.h"
-#include "hw/ide/internal.h"
 #include "hw/ide/pci.h"
 #include "hw/ide/pci.h"
+#include "ide-internal.h"
 #include "trace.h"
 #include "trace.h"
 
 
 #define BMDMA_PAGE_SIZE 4096
 #define BMDMA_PAGE_SIZE 4096

+ 1 - 1
hw/ide/piix.c

@@ -30,9 +30,9 @@
 #include "qemu/osdep.h"
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qapi/error.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci.h"
-#include "hw/ide/internal.h"
 #include "hw/ide/piix.h"
 #include "hw/ide/piix.h"
 #include "hw/ide/pci.h"
 #include "hw/ide/pci.h"
+#include "ide-internal.h"
 #include "trace.h"
 #include "trace.h"
 
 
 static uint64_t bmdma_read(void *opaque, hwaddr addr, unsigned size)
 static uint64_t bmdma_read(void *opaque, hwaddr addr, unsigned size)

+ 1 - 1
hw/ide/sii3112.c

@@ -13,11 +13,11 @@
  */
  */
 
 
 #include "qemu/osdep.h"
 #include "qemu/osdep.h"
-#include "hw/ide/internal.h"
 #include "hw/ide/pci.h"
 #include "hw/ide/pci.h"
 #include "qemu/module.h"
 #include "qemu/module.h"
 #include "trace.h"
 #include "trace.h"
 #include "qom/object.h"
 #include "qom/object.h"
+#include "ide-internal.h"
 
 
 #define TYPE_SII3112_PCI "sii3112"
 #define TYPE_SII3112_PCI "sii3112"
 OBJECT_DECLARE_SIMPLE_TYPE(SiI3112PCIState, SII3112_PCI)
 OBJECT_DECLARE_SIMPLE_TYPE(SiI3112PCIState, SII3112_PCI)

+ 1 - 1
hw/ide/via.c

@@ -25,7 +25,6 @@
  */
  */
 
 
 #include "qemu/osdep.h"
 #include "qemu/osdep.h"
-#include "hw/ide/internal.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci.h"
 #include "migration/vmstate.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"
 #include "qemu/module.h"
@@ -34,6 +33,7 @@
 #include "hw/isa/vt82c686.h"
 #include "hw/isa/vt82c686.h"
 #include "hw/ide/pci.h"
 #include "hw/ide/pci.h"
 #include "hw/irq.h"
 #include "hw/irq.h"
+#include "ide-internal.h"
 #include "trace.h"
 #include "trace.h"
 
 
 static uint64_t bmdma_read(void *opaque, hwaddr addr,
 static uint64_t bmdma_read(void *opaque, hwaddr addr,