As suggested in the recent discussion on Marcks' patchset to suppress unused default drives, this patchset cleans up the omap and pxa2xx SD card controllers to behave like the other controllers: * the init function looks for the next IF_SD drive * if there isn't one, we start up as a controller with no card present
This then allows us to drop the QEMUMachine no_sdcard flag and the vl.c code which creates a dummy IF_SD drive. Not intended for 1.2, obviously. Peter Maydell (3): omap: Get BlockDriverState* in mmc controller init, not board init pxa2xx: Get BlockDriverState* in mmc controller init, not board init Drop default SD card creation hw/boards.h | 3 +-- hw/omap.h | 3 +-- hw/omap1.c | 8 +------- hw/omap2.c | 8 +------- hw/omap_mmc.c | 12 ++++++++---- hw/pxa.h | 2 +- hw/pxa2xx.c | 16 ++-------------- hw/pxa2xx_mmci.c | 7 +++++-- hw/s390-virtio.c | 1 - hw/xilinx_zynq.c | 1 - vl.c | 7 ------- 11 files changed, 20 insertions(+), 48 deletions(-) -- 1.7.9.5
