tree 90d4dace696dbff6d0414de85353fdc6b6d39bc6
parent b3a9e57d92dff7dd5822f322e4eb49af9e1b70b8
parent 84aa0140dd4f04f5d993f0db14c40da8d3de2706
author Peter Maydell <peter.maydell@linaro.org> 1447068051 +0000
committer Peter Maydell <peter.maydell@linaro.org> 1447068051 +0000
mergetag object 84aa0140dd4f04f5d993f0db14c40da8d3de2706
 type commit
 tag block-pull-request
 tagger Stefan Hajnoczi <stefanha@redhat.com> 1447063697 +0000
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJWQHCRAAoJEJykq7OBq3PIAg4IALM8DkGUhQSf/9t5gD/laqhE
 TaIaxuKyzFsqmRBKje6flVNkeghwcvT2WTbQDIgl75GNLvhVcG4sCvptgs+xXjst
 BCY4bxapiM2n7HEIcL3eOVgzwV4z2DPl/wDVxCFKqGd5ROTV2W/Zy7H4Unxg1Td9
 vUaagxeHJeaQJS3Fw4r5QyyCRWN45paNfwdvCBFZ7GCIVQU/yDWDeYCnqzxjkSd8
 mM42HxXJRHzQynPqOsWTohj4ci3/I6ox+zIMDnH1xsH0Bkeid/oMVtyk62+jTx0L
 qXqmFH72lxsgIWY+knwuISZDoBpL95pPbgD3fsJg1nmSy/doGikU6LJpS/7mHGQ=
 =EO5+
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging

# gpg: Signature made Mon 09 Nov 2015 10:08:17 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:
  blockdev: acquire AioContext in hmp_commit()
  monitor: add missed aio_context_acquire into vm_completion call
  aio: Introduce aio-epoll.c
  aio: Introduce aio_context_setup
  aio: Introduce aio_external_disabled
  dataplane: support non-contigious s/g
  dataplane: simplify indirect descriptor read

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