From 69da3b0b47c8f6016e9109fcfa608e9e7e99bc05 Mon Sep 17 00:00:00 2001 From: Fam Zheng Date: Fri, 3 Apr 2015 22:05:19 +0800 Subject: [PATCH] block: Pause block jobs in bdrv_drain_all This is necessary to suppress more IO requests from being generated from block job coroutines. Signed-off-by: Fam Zheng Reviewed-by: Stefan Hajnoczi Reviewed-by: Paolo Bonzini Reviewed-by: Alberto Garcia Message-id: 1428069921-2957-3-git-send-email-famz@redhat.com Signed-off-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf --- block.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/block.c b/block.c index 670d7e4fc2..70aed80089 100644 --- a/block.c +++ b/block.c @@ -2040,6 +2040,16 @@ void bdrv_drain_all(void) bool busy = true; BlockDriverState *bs; + QTAILQ_FOREACH(bs, &bdrv_states, device_list) { + AioContext *aio_context = bdrv_get_aio_context(bs); + + aio_context_acquire(aio_context); + if (bs->job) { + block_job_pause(bs->job); + } + aio_context_release(aio_context); + } + while (busy) { busy = false; @@ -2051,6 +2061,16 @@ void bdrv_drain_all(void) aio_context_release(aio_context); } } + + QTAILQ_FOREACH(bs, &bdrv_states, device_list) { + AioContext *aio_context = bdrv_get_aio_context(bs); + + aio_context_acquire(aio_context); + if (bs->job) { + block_job_resume(bs->job); + } + aio_context_release(aio_context); + } } /* make a BlockDriverState anonymous by removing from bdrv_state and