mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qemu-img: call aio_context_acquire/release around block job

Browse Source 
This will be needed by bdrv_reopen_multiple, which calls
bdrv_drain_all and thus will *release* the AioContext.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Message-Id: <1477565348-5458-17-git-send-email-pbonzini@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
This commit is contained in:
Paolo Bonzini 2016-10-27 12:49:04 +02:00 committed by Fam Zheng
parent 15afd94a04
commit 9e944cb474
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qemu-img.c
View File

@ -795,6 +795,7 @@ static void run_block_job(BlockJob *job, Error **errp)
{ {
AioContext *aio_context = blk_get_aio_context(job->blk); AioContext *aio_context = blk_get_aio_context(job->blk);
aio_context_acquire(aio_context);
do { do {
aio_poll(aio_context, true); aio_poll(aio_context, true);
qemu_progress_print(job->len ? qemu_progress_print(job->len ?
@ -802,6 +803,7 @@ static void run_block_job(BlockJob *job, Error **errp)
} while (!job->ready); } while (!job->ready);
block_job_complete_sync(job, errp); block_job_complete_sync(job, errp);
aio_context_release(aio_context);
/* A block job may finish instantaneously without publishing any progress, /* A block job may finish instantaneously without publishing any progress,
* so just signal completion here */ * so just signal completion here */
@ -819,6 +821,7 @@ static int img_commit(int argc, char **argv)
Error *local_err = NULL; Error *local_err = NULL;
CommonBlockJobCBInfo cbi; CommonBlockJobCBInfo cbi;
bool image_opts = false; bool image_opts = false;
AioContext *aio_context;
fmt = NULL; fmt = NULL;
cache = BDRV_DEFAULT_CACHE; cache = BDRV_DEFAULT_CACHE;
@ -928,8 +931,11 @@ static int img_commit(int argc, char **argv)
.bs = bs, .bs = bs,
}; };
aio_context = bdrv_get_aio_context(bs);
aio_context_acquire(aio_context);
commit_active_start("commit", bs, base_bs, 0, BLOCKDEV_ON_ERROR_REPORT, commit_active_start("commit", bs, base_bs, 0, BLOCKDEV_ON_ERROR_REPORT,
common_block_job_cb, &cbi, &local_err, false); common_block_job_cb, &cbi, &local_err, false);
aio_context_release(aio_context);
if (local_err) { if (local_err) {
goto done; goto done;
} }