[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 23/25] hw/ide: Remove the include/hw/ide.h legacy file
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 23/25] hw/ide: Remove the include/hw/ide.h legacy file |
Date: |
Wed, 21 Feb 2024 22:16:23 +0100 |
From: Thomas Huth <thuth@redhat.com>
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é <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-7-thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
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 5535df4487..9dd98a923f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1937,7 +1937,6 @@ IDE
M: John Snow <jsnow@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.41.0
- [PULL 12/25] hw/i386/pc: Merge pc_guest_info_init() into pc_machine_initfn(), (continued)
- [PULL 12/25] hw/i386/pc: Merge pc_guest_info_init() into pc_machine_initfn(), Philippe Mathieu-Daudé, 2024/02/21
- [PULL 13/25] hw/i386/pc: Defer smbios_set_defaults() to machine_done, Philippe Mathieu-Daudé, 2024/02/21
- [PULL 14/25] hw/i386/pc: Confine system flash handling to pc_sysfw, Philippe Mathieu-Daudé, 2024/02/21
- [PULL 15/25] hw/i386/pc_sysfw: Inline pc_system_flash_create() and remove it, Philippe Mathieu-Daudé, 2024/02/21
- [PULL 16/25] hw/i386/pc_q35: Populate interrupt handlers before realizing LPC PCI function, Philippe Mathieu-Daudé, 2024/02/21
- [PULL 17/25] hw/isa/meson.build: Sort alphabetically, Philippe Mathieu-Daudé, 2024/02/21
- [PULL 18/25] hw/ide: Add the possibility to disable the CompactFlash device in the build, Philippe Mathieu-Daudé, 2024/02/21
- [PULL 19/25] hw/ide: Split qdev.c into ide-bus.c and ide-dev.c, Philippe Mathieu-Daudé, 2024/02/21
- [PULL 20/25] hw/ide: Move IDE DMA related definitions to a separate header ide-dma.h, Philippe Mathieu-Daudé, 2024/02/21
- [PULL 21/25] hw/ide: Move IDE device related definitions to ide-dev.h, Philippe Mathieu-Daudé, 2024/02/21
- [PULL 23/25] hw/ide: Remove the include/hw/ide.h legacy file,
Philippe Mathieu-Daudé <=
- [PULL 22/25] hw/ide: Move IDE bus related definitions to a new header ide-bus.h, Philippe Mathieu-Daudé, 2024/02/21
- [PULL 24/25] hw/ide: Stop exposing internal.h to non-IDE files, Philippe Mathieu-Daudé, 2024/02/21
- [PULL 25/25] hw/sparc/leon3: Fix wrong usage of DO_UPCAST macro, Philippe Mathieu-Daudé, 2024/02/21
- Re: [PULL 00/25] Misc HW patches for 2024-02-21, Philippe Mathieu-Daudé, 2024/02/22