+Mark On 8/4/21 4:27 PM, Gerd Hoffmann wrote: > Some code shuffling needed beforehand due to floppy being part of > several platforms. While being at it also make floppy optional > in pc machine type.
> floppy: move fdctrl_init_sysbus > floppy: move sun4m_fdctrl_init https://www.mail-archive.com/qemu-block@nongnu.org/msg84008.html Mark suggested: You may be able to simplify this further by removing the global legacy init functions fdctrl_init_sysbus() and sun4m_fdctrl_init(): from what I can see fdctrl_init_sysbus() is only used in hw/mips/jazz.c and sun4m_fdctrl_init() is only used in hw/sparc/sun4m.c so you might as well inline them or move the functions to the relevant files. I did it and plan to send during 6.2. Sounds simpler than module. You could easily rebase your series on top (or I can include your patches while sending).