summary refs log tree commit diff stats
path: root/migration/qemu-file-buf.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-01-26 09:16:07 +0000
committerPeter Maydell <peter.maydell@linaro.org>2016-01-26 09:16:07 +0000
commit1535a6d699487740b490369e44f9ca8d305463cd (patch)
tree6e26639d54ebf2ceadb8b60a889f5f87a3a42307 /migration/qemu-file-buf.c
parent6ee06cc3dc7e8eb238e2f60cfd04f094d5c6b948 (diff)
parent4812fa27fa75bce89738a82a191755853dd88408 (diff)
downloadfocaccia-qemu-1535a6d699487740b490369e44f9ca8d305463cd.tar.gz
focaccia-qemu-1535a6d699487740b490369e44f9ca8d305463cd.zip
Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging
# gpg: Signature made Mon 25 Jan 2016 19:39:58 GMT using RSA key ID AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>"

* remotes/jnsnow/tags/ide-pull-request:
  fdc: change auto fallback drive for ISA FDC to 288
  qtest/fdc: Support for 2.88MB drives
  fdc: rework pick_geometry
  fdc: add physical disk sizes
  fdc: add drive type option
  fdc: Add fallback option
  fdc: add pick_drive
  fdc: Throw an assertion on misconfigured fd_formats table
  fdc: add disk field
  fdc: add drive type qapi enum
  fdc: reduce number of pick_geometry arguments
  fdc: move pick_geometry
  ide: Correct the CHS 'cyls_max' limit to be 65535

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'migration/qemu-file-buf.c')
0 files changed, 0 insertions, 0 deletions