[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 34/42] job: Add job_dismiss()
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PATCH 34/42] job: Add job_dismiss() |
Date: |
Wed, 9 May 2018 18:26:29 +0200 |
This moves block_job_dismiss() to the Job layer.
Signed-off-by: Kevin Wolf <address@hidden>
---
include/block/blockjob.h | 9 ---------
include/qemu/job.h | 7 ++++++-
blockdev.c | 8 +++++---
blockjob.c | 13 -------------
job.c | 15 ++++++++++++++-
tests/test-blockjob.c | 4 ++--
6 files changed, 27 insertions(+), 29 deletions(-)
diff --git a/include/block/blockjob.h b/include/block/blockjob.h
index 7a0d95e789..ba08bcf7c0 100644
--- a/include/block/blockjob.h
+++ b/include/block/blockjob.h
@@ -141,15 +141,6 @@ void block_job_remove_all_bdrv(BlockJob *job);
void block_job_set_speed(BlockJob *job, int64_t speed, Error **errp);
/**
- * block_job_dismiss:
- * @job: The job to be dismissed.
- * @errp: Error object.
- *
- * Remove a concluded job from the query list.
- */
-void block_job_dismiss(BlockJob **job, Error **errp);
-
-/**
* block_job_progress_update:
* @job: The job that has made progress
* @done: How much progress the job made
diff --git a/include/qemu/job.h b/include/qemu/job.h
index 5ec3e3c01d..f3acebbc17 100644
--- a/include/qemu/job.h
+++ b/include/qemu/job.h
@@ -487,6 +487,12 @@ int job_complete_sync(Job *job, Error **errp);
*/
void job_finalize(Job *job, Error **errp);
+/**
+ * Remove the concluded @job from the query list and resets the passed pointer
+ * to %NULL. Returns an error if the job is not actually concluded.
+ */
+void job_dismiss(Job **job, Error **errp);
+
typedef void JobDeferToMainLoopFn(Job *job, void *opaque);
/**
@@ -515,6 +521,5 @@ int job_finish_sync(Job *job, void (*finish)(Job *, Error
**errp), Error **errp)
/* TODO To be removed from the public interface */
void job_state_transition(Job *job, JobStatus s1);
-void job_do_dismiss(Job *job);
#endif
diff --git a/blockdev.c b/blockdev.c
index 31319a6d5a..15753d9719 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -3915,14 +3915,16 @@ void qmp_block_job_finalize(const char *id, Error
**errp)
void qmp_block_job_dismiss(const char *id, Error **errp)
{
AioContext *aio_context;
- BlockJob *job = find_block_job(id, &aio_context, errp);
+ BlockJob *bjob = find_block_job(id, &aio_context, errp);
+ Job *job;
- if (!job) {
+ if (!bjob) {
return;
}
trace_qmp_block_job_dismiss(job);
- block_job_dismiss(&job, errp);
+ job = &bjob->job;
+ job_dismiss(&job, errp);
aio_context_release(aio_context);
}
diff --git a/blockjob.c b/blockjob.c
index e8d7e85d6b..5ab22596bf 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -243,19 +243,6 @@ int64_t block_job_ratelimit_get_delay(BlockJob *job,
uint64_t n)
return ratelimit_calculate_delay(&job->limit, n);
}
-void block_job_dismiss(BlockJob **jobptr, Error **errp)
-{
- BlockJob *job = *jobptr;
- /* similarly to _complete, this is QMP-interface only. */
- assert(job->job.id);
- if (job_apply_verb(&job->job, JOB_VERB_DISMISS, errp)) {
- return;
- }
-
- job_do_dismiss(&job->job);
- *jobptr = NULL;
-}
-
void block_job_progress_update(BlockJob *job, uint64_t done)
{
job->offset += done;
diff --git a/job.c b/job.c
index 1627118c26..744490dffe 100644
--- a/job.c
+++ b/job.c
@@ -561,7 +561,7 @@ void job_user_resume(Job *job, Error **errp)
job_resume(job);
}
-void job_do_dismiss(Job *job)
+static void job_do_dismiss(Job *job)
{
assert(job);
job->busy = false;
@@ -574,6 +574,19 @@ void job_do_dismiss(Job *job)
job_unref(job);
}
+void job_dismiss(Job **jobptr, Error **errp)
+{
+ Job *job = *jobptr;
+ /* similarly to _complete, this is QMP-interface only. */
+ assert(job->id);
+ if (job_apply_verb(job, JOB_VERB_DISMISS, errp)) {
+ return;
+ }
+
+ job_do_dismiss(job);
+ *jobptr = NULL;
+}
+
void job_early_fail(Job *job)
{
assert(job->status == JOB_STATUS_CREATED);
diff --git a/tests/test-blockjob.c b/tests/test-blockjob.c
index 46a78739aa..7131cabb16 100644
--- a/tests/test-blockjob.c
+++ b/tests/test-blockjob.c
@@ -233,8 +233,8 @@ static void cancel_common(CancelJob *s)
job_cancel_sync(&job->job);
if (sts != JOB_STATUS_CREATED && sts != JOB_STATUS_CONCLUDED) {
- BlockJob *dummy = job;
- block_job_dismiss(&dummy, &error_abort);
+ Job *dummy = &job->job;
+ job_dismiss(&dummy, &error_abort);
}
assert(job->job.status == JOB_STATUS_NULL);
job_unref(&job->job);
--
2.13.6
- Re: [Qemu-block] [PATCH 26/42] job: Convert block_job_cancel_async() to Job, (continued)
- [Qemu-block] [PATCH 29/42] job: Move job_finish_sync() to Job, Kevin Wolf, 2018/05/09
- [Qemu-block] [PATCH 28/42] job: Move .complete callback to Job, Kevin Wolf, 2018/05/09
- [Qemu-block] [PATCH 30/42] job: Switch transactions to JobTxn, Kevin Wolf, 2018/05/09
- [Qemu-block] [PATCH 31/42] job: Move transactions to Job, Kevin Wolf, 2018/05/09
- [Qemu-block] [PATCH 34/42] job: Add job_dismiss(),
Kevin Wolf <=
- [Qemu-block] [PATCH 33/42] job: Add job_yield(), Kevin Wolf, 2018/05/09
- [Qemu-block] [PATCH 32/42] job: Move completion and cancellation to Job, Kevin Wolf, 2018/05/09
- [Qemu-block] [PATCH 36/42] job: Add job_transition_to_ready(), Kevin Wolf, 2018/05/09