There was only one prototype left in this legacy file. Move it to
ide-dev.h to finally get rid of it.
Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org>
Signed-off-by: Thomas Huth <th...@redhat.com>
---
MAINTAINERS | 1 -
include/hw/ide.h | 9 ---------
include/hw/ide/ide-dev.h | 2 ++
include/hw/ide/internal.h | 3 +--
4 files changed, 3 insertions(+), 12 deletions(-)
delete mode 100644 include/hw/ide.h
diff --git a/MAINTAINERS b/MAINTAINERS
index 7d61fb9319..f3cbfb8818 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1936,7 +1936,6 @@ IDE
M: John Snow <js...@redhat.com>
L: qemu-block@nongnu.org
S: Odd Fixes
-F: include/hw/ide.h
F: include/hw/ide/
F: hw/ide/
F: hw/block/block.c
diff --git a/include/hw/ide.h b/include/hw/ide.h
deleted file mode 100644
index db963bdb77..0000000000
--- a/include/hw/ide.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef HW_IDE_H
-#define HW_IDE_H
-
-#include "exec/memory.h"
-
-/* ide/core.c */
-void ide_drive_get(DriveInfo **hd, int max_bus);
-
-#endif /* HW_IDE_H */
diff --git a/include/hw/ide/ide-dev.h b/include/hw/ide/ide-dev.h
index 1f62e58ebc..708cc0fda3 100644
--- a/include/hw/ide/ide-dev.h
+++ b/include/hw/ide/ide-dev.h
@@ -179,4 +179,6 @@ typedef struct IDEDrive {
void ide_dev_initfn(IDEDevice *dev, IDEDriveKind kind, Error **errp);
+void ide_drive_get(DriveInfo **hd, int max_bus);
+
#endif
diff --git a/include/hw/ide/internal.h b/include/hw/ide/internal.h
index d3ec16a945..20dde37f45 100644
--- a/include/hw/ide/internal.h
+++ b/include/hw/ide/internal.h
@@ -4,10 +4,9 @@
/*
* QEMU IDE Emulation -- internal header file
* only files in hw/ide/ are supposed to include this file.
- * non-internal declarations are in hw/ide.h
+ * non-internal declarations are in hw/include/ide-*.h
*/
-#include "hw/ide.h"
#include "hw/ide/ide-bus.h"
/* debug IDE devices */
--
2.43.2
