Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
commit3e5f6234b4f45a11b7c357dde2d6da36641bc6f6
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 19 Mar 2015 17:47:08 +0000 (19 17:47 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 19 Mar 2015 17:47:08 +0000 (19 17:47 +0000)
treef6770b2c458dbfeedccd2346543107971654b783
parent33a8d5b72d63fe44f08614408284fa934dee1edd
parent5b347c541017b9ced10e8e9bce02d25bcf04c7af
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

Block patches for 2.3.0-rc1

# gpg: Signature made Thu Mar 19 15:03:26 2015 GMT using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"

* remotes/kevin/tags/for-upstream:
  block: Fix blockdev-backup not to use funky error class
  raw-posix: Deprecate aio=threads fallback without O_DIRECT
  raw-posix: Deprecate host floppy passthrough

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
qemu-options.hx
qmp-commands.hx