On 18/04/2019 14.35, Philippe Mathieu-Daudé wrote: > Hi Thomas, > > On 4/18/19 1:10 PM, Thomas Huth wrote: >> Some machines (like the pxa2xx-based ARM machines) only have a sysbus >> OHCI controller, but no PCI. With the new Kconfig-style build system, >> it will soon be possible to create QEMU binaries that only contain >> such PCI-less machines. However, the two OHCI controllers, for sysbus >> and for PCI, are currently both located in one file, so the PCI code >> is still required for linking here. Move the OHCI-PCI device code >> into a separate file, so that it is possible to use the sysbus OHCI >> device also without the PCI dependency. >> >> Apart from moving code to a new file (and a new header), this patch >> might also fix one subtle bug: The ohci_die() function always assumed >> to be running with a OHCI-PCI controller and called some PCI-specific >> functions - but if I got the code right, ohci_die() might also get >> called for the sysbus-OHCI device, so it likely failed in that case. >> I've changed this part of the code now, so that there are two ohci_die() >> implementations now, one for sysbus and one for PCI. > > Can this be done in 2 patches?
Yeah, maybe that's cleaner... I'll send a v2... Thomas
