Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
commitdba5c337c83290d9559c171052c0a0de69fbab2f
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 9 Jan 2017 13:54:31 +0000 (9 13:54 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 9 Jan 2017 13:54:31 +0000 (9 13:54 +0000)
tree67ae4fd0f45b3f111a7d5dcff7fdf61326affe46
parent8305f9bdf7ca41ee5cabe018fb37b73472c1162d
parentc1bb86cd8ae67c14f79422b6e544d1e2bf40eeb2
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

Block layer patches

# gpg: Signature made Mon 09 Jan 2017 13:43:44 GMT
# gpg:                using RSA key 0x7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream:
  block: Rename raw-{posix,win32} to file-*.c
  block: Rename raw_bsd to raw-format.c
  blkverify: Implement bdrv_co_preadv/pwritev/flush
  blkdebug: Implement bdrv_co_preadv/pwritev/flush
  quorum: Clean up quorum_aio_get()
  quorum: Inline quorum_fifo_aio_cb()
  quorum: Implement .bdrv_co_preadv/pwritev()
  quorum: Avoid bdrv_aio_writev() for rewrites
  quorum: Inline quorum_aio_cb()
  quorum: Do cleanup in caller coroutine
  quorum: Implement .bdrv_co_readv/writev
  quorum: Remove s from quorum_aio_get() arguments
  coroutine: Introduce qemu_coroutine_enter_if_inactive()
  qemu-img: fix in-flight count for qemu-img bench

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