OSDN Git Service

Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 14 Nov 2017 16:11:19 +0000 (16:11 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 14 Nov 2017 16:11:19 +0000 (16:11 +0000)
commit191b5fbfa66e5b23e2150f3c6981d30eb84418a9
treedf2fa0a21490630f50e81cbb03d5db0a93e32d0f
parent0dc8874aded76e2b6c73d95df5651e3c8a31a9ec
parent0761562687e0d8135310a94b1d3e08376387c027
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging

Pull request

The following disk I/O throttling fixes solve recent bugs.

# gpg: Signature made Tue 14 Nov 2017 10:37:12 GMT
# 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:
  qemu-iotests: Test I/O limits with removable media
  block: Leave valid throttle timers when removing a BDS from a backend
  block: Check for inserted BlockDriverState in blk_io_limits_disable()
  throttle-groups: drain before detaching ThrottleState
  block: all I/O should be completed before removing throttle timers.

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