]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 9 Feb 2016 17:56:45 +0000 (17:56 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 9 Feb 2016 17:56:46 +0000 (17:56 +0000)
commitf075c89f0a9cb31daf38892371d2822177505706
tree72296f7ce1446b3809c749a2e15f4eb76f1aa61f
parent84c0781103dcbe9b5e5433ba16fbeb55d69d6cb7
parent9dcf8ecd9e74804aa1687e5688386001a1f3f89f
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging

# gpg: Signature made Tue 09 Feb 2016 15:11:25 GMT using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"

* remotes/stefanha/tags/block-pull-request:
  block: add missing call to bdrv_drain_recurse
  blockjob: Fix hang in block_job_finish_sync
  iov: avoid memcpy for "simple" iov_from_buf/iov_to_buf

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>