path: root/blockjob.c
diff options
authorKevin Wolf <kwolf@redhat.com>2016-04-08 18:26:37 +0200
committerKevin Wolf <kwolf@redhat.com>2016-05-25 19:04:21 +0200
commita1a2af075647bb61e1435ce4c78d99e3f36d928b (patch)
treef7278838924299de61dac499e820d7e18c0accce /blockjob.c
parenta7112795c14d99b81600f8809fda5ce18b430830 (diff)
block: Cancel jobs first in bdrv_close_all()
So far, bdrv_close_all() first removed all root BlockDriverStates of BlockBackends and monitor owned BDSes, and then assumed that the remaining BDSes must be related to jobs and cancelled these jobs. This order doesn't work that well any more when block jobs use BlockBackends internally because then they will lose their BDS before being cancelled. This patch changes bdrv_close_all() to first cancel all jobs and then remove all root BDSes from the remaining BBs. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Alberto Garcia <berto@igalia.com> Reviewed-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'blockjob.c')
1 files changed, 13 insertions, 0 deletions
diff --git a/blockjob.c b/blockjob.c
index 0f1bc77b1d..e916b41030 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -331,6 +331,19 @@ int block_job_cancel_sync(BlockJob *job)
return block_job_finish_sync(job, &block_job_cancel_err, NULL);
+void block_job_cancel_sync_all(void)
+ BlockJob *job;
+ AioContext *aio_context;
+ while ((job = QLIST_FIRST(&block_jobs))) {
+ aio_context = bdrv_get_aio_context(job->bs);
+ aio_context_acquire(aio_context);
+ block_job_cancel_sync(job);
+ aio_context_release(aio_context);
+ }
int block_job_complete_sync(BlockJob *job, Error **errp)
return block_job_finish_sync(job, &block_job_complete, errp);