@@ -1948,7 +1948,7 @@ F: hw/block/fdc.c
F: hw/block/fdc-internal.h
F: hw/block/fdc-isa.c
F: hw/block/fdc-sysbus.c
-F: include/hw/block/fdc.h
+F: include/hw/block/fdc-isa.h
F: tests/qtest/fdc-test.c
T: git https://gitlab.com/jsnow/qemu.git ide
@@ -28,7 +28,7 @@
#include "exec/memory.h"
#include "exec/ioport.h"
#include "hw/block/block.h"
-#include "hw/block/fdc.h"
+#include "hw/block/fdc-isa.h"
#include "qapi/qapi-types-block.h"
typedef struct FDCtrl FDCtrl;
similarity index 92%
rename from include/hw/block/fdc.h
rename to include/hw/block/fdc-isa.h
@@ -1,5 +1,5 @@
-#ifndef HW_FDC_H
-#define HW_FDC_H
+#ifndef HW_FDC_ISA_H
+#define HW_FDC_ISA_H
#include "exec/hwaddr.h"
#include "qapi/qapi-types-block.h"
@@ -28,7 +28,7 @@
*/
#include "qemu/osdep.h"
-#include "hw/block/fdc.h"
+#include "hw/block/fdc-isa.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "qemu/timer.h"
@@ -27,7 +27,7 @@
#include "qapi/error.h"
#include "qom/object.h"
#include "hw/sysbus.h"
-#include "hw/block/fdc.h"
+#include "hw/block/fdc-isa.h"
#include "migration/vmstate.h"
#include "fdc-internal.h"
#include "trace.h"
@@ -28,7 +28,7 @@
*/
#include "qemu/osdep.h"
-#include "hw/block/fdc.h"
+#include "hw/block/fdc-isa.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "qemu/timer.h"
@@ -25,7 +25,7 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
#include "hw/i386/pc.h"
-#include "hw/block/fdc.h"
+#include "hw/block/fdc-isa.h"
#include "hw/char/serial.h"
#include "hw/char/parallel.h"
#include "hw/hyperv/hv-balloon.h"
@@ -17,7 +17,7 @@
#include "sysemu/blockdev.h"
#include "chardev/char.h"
#include "hw/char/parallel.h"
-#include "hw/block/fdc.h"
+#include "hw/block/fdc-isa.h"
#include "hw/isa/superio.h"
#include "hw/qdev-properties.h"
#include "hw/input/i8042.h"
@@ -31,7 +31,7 @@
#include "hw/char/serial.h"
#include "hw/char/parallel.h"
#include "hw/isa/isa.h"
-#include "hw/block/fdc.h"
+#include "hw/block/fdc-isa.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
#include "net/net.h"
@@ -34,7 +34,7 @@
#include "hw/rtc/m48t59.h"
#include "migration/vmstate.h"
#include "hw/sparc/sparc32_dma.h"
-#include "hw/block/fdc.h"
+#include "hw/block/fdc-isa.h"
#include "sysemu/reset.h"
#include "sysemu/runstate.h"
#include "sysemu/sysemu.h"
@@ -39,7 +39,7 @@
#include "hw/rtc/m48t59.h"
#include "migration/vmstate.h"
#include "hw/input/i8042.h"
-#include "hw/block/fdc.h"
+#include "hw/block/fdc-isa.h"
#include "net/net.h"
#include "qemu/timer.h"
#include "sysemu/runstate.h"
@@ -1,5 +1,5 @@
#include "qemu/osdep.h"
-#include "hw/block/fdc.h"
+#include "hw/block/fdc-isa.h"
int cmos_get_fd_drive_type(FloppyDriveType fd0)
{
Rename the header which allows for exposing fdc-internal.h (dropping the -internal suffix) which in turn allows for exposing struct FDCtrlISABus. Exposing a device struct is in line with OOM/qdev guidelines. Signed-off-by: Bernhard Beschow <shentey@gmail.com> --- MAINTAINERS | 2 +- hw/block/fdc-internal.h | 2 +- include/hw/block/{fdc.h => fdc-isa.h} | 4 ++-- hw/block/fdc-isa.c | 2 +- hw/block/fdc-sysbus.c | 2 +- hw/block/fdc.c | 2 +- hw/i386/pc.c | 2 +- hw/isa/isa-superio.c | 2 +- hw/mips/jazz.c | 2 +- hw/sparc/sun4m.c | 2 +- hw/sparc64/sun4u.c | 2 +- stubs/cmos.c | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) rename include/hw/block/{fdc.h => fdc-isa.h} (92%)