On 5/17/21 9:19 PM, John Snow wrote: > On 5/17/21 2:39 PM, Philippe Mathieu-Daudé wrote: >> Missing review: #1 >> >> 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 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é (9): >> 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 sysbus_fdc_init_drives() method >> hw/sparc/sun4m: Inline sun4m_fdctrl_init() >> hw/block/fdc-sysbus: Add 'dma-channel' property >> hw/mips/jazz: Inline fdctrl_init_sysbus() >> >> hw/block/fdc-internal.h | 156 +++++++++++ >> include/hw/block/fdc.h | 7 +- >> hw/block/fdc-isa.c | 313 +++++++++++++++++++++ >> hw/block/fdc-sysbus.c | 224 +++++++++++++++ >> hw/block/fdc.c | 608 +--------------------------------------- >> hw/mips/jazz.c | 16 ++ >> hw/sparc/sun4m.c | 16 ++ >> MAINTAINERS | 3 + >> hw/block/Kconfig | 8 + >> 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 +- >> 16 files changed, 759 insertions(+), 612 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 >> > > Hi, tentatively staged: > > https://gitlab.com/jsnow/qemu/-/commits/floppy/ > > pending CI: > > https://gitlab.com/jsnow/qemu/-/pipelines/304308461
Not good enough: qemu-system-sparc: ../hw/block/fdc.c:2356: fdctrl_realize_common: Assertion `fdctrl->dma' failed. Forget about it for your next pull request.
