This patchset updates the ancient pxa2xx_mmci device to something resembling modern standards for devices. In particular it makes it a proper sysbus device and switches to VMStateDescription structs.
The major issue I have with this is in patch 1: I wanted the device to have a property so its users can set the BlockBackend* it should use. Unfortunately, DEFINE_PROP_DRIVE() is no good here, because setting a drive property results in a call to blk_attach_dev() which attaches the BlockBackend to this device. That then means that the call in sd_init() to attach the BlockBackend to the SD card object aborts. I needed a way to have a drive property which didn't mean "and this device claims the drive", and the best I could come up with was to use a pointer property. Suggestions for better approaches welcome. (The other SD controller devices are either also ancient non-QOM devices, or use drive_get_next() in the init function...) There are clearly further cleanup opportunities for this device, like making the sd callbacks into sysbus gpio input lines rather than having an ad-hoc pxa2xx_mmci_handlers() function to set them, but one thing at a time. Peter Maydell (3): hw/sd/pxa2xx_mmci: convert to SysBusDevice object hw/sd/pxa2xx_mmci: Convert to VMStateDescription hw/sd/pxa2xx_mmci: Add reset function hw/sd/pxa2xx_mmci.c | 261 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 159 insertions(+), 102 deletions(-) -- 1.9.1
