Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
commit8bfa87a231a846343a33bd817ea002740d84ae51
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 5 Aug 2016 10:44:56 +0000 (5 11:44 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 5 Aug 2016 10:44:56 +0000 (5 11:44 +0100)
tree19dc3709cc4ca00b1c69ed6f01f417379898c4c8
parentfbe400d246cdcdae8d1f64f8be55111dbe4160fd
parent27d1b87688dcea8702f06b5240abf6b8d8f53346
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging

# gpg: Signature made Fri 05 Aug 2016 10:24:34 BST
# gpg:                using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/block-pull-request:
  virtio-blk: Remove stale comment about draining
  virtio-blk: Release s->rq queue at system_reset
  throttle: Test burst limits lower than the normal limits
  throttle: Don't allow burst limits to be lower than the normal limits
  block/parallels: check new image size

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