diff options
| author | Fam Zheng <famz@redhat.com> | 2014-06-24 20:26:35 +0800 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2014-08-07 03:39:35 -0500 |
| commit | 8e09e2013d82456f074b343d8505b25c0a159dce (patch) | |
| tree | 1e7c14d01d38b572c5a0f7b65443f4a2a322875b | |
| parent | 520b3412643ed6907809a1e0711eae497aaa8b54 (diff) | |
| download | qemu-8e09e2013d82456f074b343d8505b25c0a159dce.tar.gz | |
blockjob: Add block_job_yield()
This will unset busy flag and put coroutine to sleep, can be used to
wait for QMP complete/cancel.
Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
(cherry picked from commit dc71ce45ded4e872e25c2de32d5e7a71842b0985)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| -rw-r--r-- | blockjob.c | 14 | ||||
| -rw-r--r-- | include/block/blockjob.h | 8 |
2 files changed, 22 insertions, 0 deletions
diff --git a/blockjob.c b/blockjob.c index b3ce14cebd..bf10f82b79 100644 --- a/blockjob.c +++ b/blockjob.c @@ -206,6 +206,20 @@ void block_job_sleep_ns(BlockJob *job, QEMUClockType type, int64_t ns) job->busy = true; } +void block_job_yield(BlockJob *job) +{ + assert(job->busy); + + /* Check cancellation *before* setting busy = false, too! */ + if (block_job_is_cancelled(job)) { + return; + } + + job->busy = false; + qemu_coroutine_yield(); + job->busy = true; +} + BlockJobInfo *block_job_query(BlockJob *job) { BlockJobInfo *info = g_new0(BlockJobInfo, 1); diff --git a/include/block/blockjob.h b/include/block/blockjob.h index d76de62a46..395be5b6a9 100644 --- a/include/block/blockjob.h +++ b/include/block/blockjob.h @@ -144,6 +144,14 @@ void *block_job_create(const BlockJobDriver *driver, BlockDriverState *bs, void block_job_sleep_ns(BlockJob *job, QEMUClockType type, int64_t ns); /** + * block_job_yield: + * @job: The job that calls the function. + * + * Yield the block job coroutine. + */ +void block_job_yield(BlockJob *job); + +/** * block_job_completed: * @job: The job being completed. * @ret: The status code. |