On 6/14/21 3:32 PM, Philippe Mathieu-Daudé wrote:
Hi,
The floppy disc controllers pulls in irrelevant devices (sysbus in
an ISA-only machine, ISA bus + isa devices on a sysbus-only machine).
This series clean that by extracting each device in its own file,
adding the corresponding Kconfig symbols: FDC_ISA and FDC_SYSBUS.
Since v6:
- Rebased
- Added A-b/R-b tags
- Removed stub (thuth)
Since v5:
- Added stub (thuth)
Since v4:
- Dropped machine patches for later due to DMA jazz issue
Since v3:
- Fix ISA_SUPERIO -> FDC Kconfig dependency (jsnow)
Since v2:
- rebased
Since v1:
- added missing "hw/block/block.h" header (jsnow)
- inlined hardware specific calls (Mark)
- added R-b/A-b tags
Regards,
Phil.
Philippe Mathieu-Daudé (6):
hw/isa/Kconfig: Fix missing dependency ISA_SUPERIO -> FDC
hw/block/fdc: Replace disabled fprintf() by trace event
hw/block/fdc: Declare shared prototypes in fdc-internal.h
hw/block/fdc: Extract ISA floppy controllers to fdc-isa.c
hw/block/fdc: Extract SysBus floppy controllers to fdc-sysbus.c
hw/block/fdc: Add description to floppy controllers
hw/block/fdc-internal.h | 158 ++++++++++
hw/block/fdc-isa.c | 320 +++++++++++++++++++++
hw/block/fdc-sysbus.c | 251 ++++++++++++++++
hw/block/fdc.c | 621 +---------------------------------------
MAINTAINERS | 3 +
hw/block/Kconfig | 12 +-
hw/block/meson.build | 2 +
hw/block/trace-events | 3 +
hw/i386/Kconfig | 2 +-
hw/isa/Kconfig | 7 +-
hw/mips/Kconfig | 2 +-
hw/sparc/Kconfig | 2 +-
hw/sparc64/Kconfig | 2 +-
13 files changed, 763 insertions(+), 622 deletions(-)
create mode 100644 hw/block/fdc-internal.h
create mode 100644 hw/block/fdc-isa.c
create mode 100644 hw/block/fdc-sysbus.c
Staged again,
https://gitlab.com/jsnow/qemu/-/pipelines/326076557
will send PR as soon as the CI is done.
--js
