summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFam Zheng2014-06-24 14:26:35 +0200
committerKevin Wolf2014-06-26 12:12:22 +0200
commitdc71ce45ded4e872e25c2de32d5e7a71842b0985 (patch)
treeaa75e25f7c562b0bf0e77ed653026d7bacaaff2e
parentMerge remote-tracking branch 'remotes/mjt/tags/trivial-patches-2014-06-24' in... (diff)
downloadqemu-dc71ce45ded4e872e25c2de32d5e7a71842b0985.tar.gz
qemu-dc71ce45ded4e872e25c2de32d5e7a71842b0985.tar.xz
qemu-dc71ce45ded4e872e25c2de32d5e7a71842b0985.zip
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>
-rw-r--r--blockjob.c14
-rw-r--r--include/block/blockjob.h8
2 files changed, 22 insertions, 0 deletions
diff --git a/blockjob.c b/blockjob.c
index 4da86cdfcd..a6db01e953 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -210,6 +210,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 e443987ea8..67ca076380 100644
--- a/include/block/blockjob.h
+++ b/include/block/blockjob.h
@@ -147,6 +147,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.