The following changes since commit 6ee06cc3dc7e8eb238e2f60cfd04f094d5c6b948:
Merge remote-tracking branch 'remotes/lalrae/tags/mips-20160125' into staging (2016-01-25 10:42:52 +0000) are available in the git repository at: https://github.com/jnsnow/qemu.git tags/ide-pull-request for you to fetch changes up to 4812fa27fa75bce89738a82a191755853dd88408: fdc: change auto fallback drive for ISA FDC to 288 (2016-01-25 14:36:01 -0500) ---------------------------------------------------------------- ---------------------------------------------------------------- John Snow (12): fdc: move pick_geometry fdc: reduce number of pick_geometry arguments fdc: add drive type qapi enum fdc: add disk field fdc: Throw an assertion on misconfigured fd_formats table fdc: add pick_drive fdc: Add fallback option fdc: add drive type option fdc: add physical disk sizes fdc: rework pick_geometry qtest/fdc: Support for 2.88MB drives fdc: change auto fallback drive for ISA FDC to 288 Shmulik Ladkani (1): ide: Correct the CHS 'cyls_max' limit to be 65535 hw/block/fdc.c | 326 ++++++++++++++++++++++++++++++------------- hw/core/qdev-properties.c | 11 ++ hw/i386/pc.c | 17 +-- hw/ide/qdev.c | 2 +- include/hw/block/fdc.h | 9 +- include/hw/compat.h | 4 + include/hw/qdev-properties.h | 1 + qapi/block.json | 16 +++ tests/fdc-test.c | 2 +- 9 files changed, 271 insertions(+), 117 deletions(-) -- 2.4.3
