diff options
| author | Zhengui <lizhengui@huawei.com> | 2017-10-21 13:34:00 +0800 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2017-11-13 14:02:05 +0000 |
| commit | 632a77354317df32c7ff2d23424f0559c23fee51 (patch) | |
| tree | e7e4ffa39703050dce5a67b90e5c8d83ef421c4e /block | |
| parent | 508ba0f7e2092d3ca56e3f75e894d52d8b94818e (diff) | |
| download | qemu-632a77354317df32c7ff2d23424f0559c23fee51.zip qemu-632a77354317df32c7ff2d23424f0559c23fee51.tar.gz qemu-632a77354317df32c7ff2d23424f0559c23fee51.tar.bz2 | |
block: all I/O should be completed before removing throttle timers.
In blk_remove_bs, all I/O should be completed before removing throttle
timers. If there has inflight I/O, removing throttle timers here will
cause the inflight I/O never return.
This patch add bdrv_drained_begin before throttle_timers_detach_aio_context
to let all I/O completed before removing throttle timers.
[Moved declaration of bs as suggested by Alberto Garcia
<berto@igalia.com>.
--Stefan]
Signed-off-by: Zhengui <lizhengui@huawei.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Message-id: 1508564040-120700-1-git-send-email-lizhengui@huawei.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/block-backend.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/block/block-backend.c b/block/block-backend.c index 45d9101..18e5437 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -655,12 +655,16 @@ BlockBackend *blk_by_public(BlockBackendPublic *public) */ void blk_remove_bs(BlockBackend *blk) { + BlockDriverState *bs; ThrottleTimers *tt; notifier_list_notify(&blk->remove_bs_notifiers, blk); if (blk->public.throttle_group_member.throttle_state) { tt = &blk->public.throttle_group_member.throttle_timers; + bs = blk_bs(blk); + bdrv_drained_begin(bs); throttle_timers_detach_aio_context(tt); + bdrv_drained_end(bs); } blk_update_root_state(blk); |