[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 24/46] blockjob: Split block_job_event_pending()
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 24/46] blockjob: Split block_job_event_pending() |
Date: |
Wed, 23 May 2018 15:11:33 +0200 |
block_job_event_pending() doesn't only send a QMP event, but it also
transitions to the PENDING state. Split the function so that we get one
part only sending the event (like other block_job_event_* functions) and
another part that does the state transition.
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
---
blockjob.c | 27 ++++++++++++++++++---------
1 file changed, 18 insertions(+), 9 deletions(-)
diff --git a/blockjob.c b/blockjob.c
index d9d8ff7f5c..b4334fb1bf 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -38,7 +38,7 @@
static void block_job_event_cancelled(BlockJob *job);
static void block_job_event_completed(BlockJob *job, const char *msg);
-static int block_job_event_pending(BlockJob *job);
+static void block_job_event_pending(BlockJob *job);
/* Transactional group of block jobs */
struct BlockJobTxn {
@@ -500,6 +500,15 @@ static void block_job_do_finalize(BlockJob *job)
}
}
+static int block_job_transition_to_pending(BlockJob *job)
+{
+ job_state_transition(&job->job, JOB_STATUS_PENDING);
+ if (!job->job.auto_finalize) {
+ block_job_event_pending(job);
+ }
+ return 0;
+}
+
static void block_job_completed_txn_success(BlockJob *job)
{
BlockJobTxn *txn = job->txn;
@@ -518,7 +527,7 @@ static void block_job_completed_txn_success(BlockJob *job)
assert(other_job->ret == 0);
}
- block_job_txn_apply(txn, block_job_event_pending, false);
+ block_job_txn_apply(txn, block_job_transition_to_pending, false);
/* If no jobs need manual finalization, automatically do so */
if (block_job_txn_apply(txn, block_job_needs_finalize, false) == 0) {
@@ -733,15 +742,15 @@ static void block_job_event_completed(BlockJob *job,
const char *msg)
&error_abort);
}
-static int block_job_event_pending(BlockJob *job)
+static void block_job_event_pending(BlockJob *job)
{
- job_state_transition(&job->job, JOB_STATUS_PENDING);
- if (!job->job.auto_finalize && !block_job_is_internal(job)) {
- qapi_event_send_block_job_pending(job_type(&job->job),
- job->job.id,
- &error_abort);
+ if (block_job_is_internal(job)) {
+ return;
}
- return 0;
+
+ qapi_event_send_block_job_pending(job_type(&job->job),
+ job->job.id,
+ &error_abort);
}
/*
--
2.13.6
- [Qemu-devel] [PULL 13/46] job: Maintain a list of all jobs, (continued)
- [Qemu-devel] [PULL 13/46] job: Maintain a list of all jobs, Kevin Wolf, 2018/05/23
- [Qemu-devel] [PULL 11/46] job: Add JobDriver.job_type, Kevin Wolf, 2018/05/23
- [Qemu-devel] [PULL 04/46] sheepdog: Remove unnecessary NULL check in sd_prealloc(), Kevin Wolf, 2018/05/23
- [Qemu-devel] [PULL 08/46] blockjob: Improve BlockJobInfo.offset/len documentation, Kevin Wolf, 2018/05/23
- [Qemu-devel] [PULL 12/46] job: Add job_delete(), Kevin Wolf, 2018/05/23
- [Qemu-devel] [PULL 05/46] qemu-iotests: Add more tests to "migration" group, Kevin Wolf, 2018/05/23
- [Qemu-devel] [PULL 10/46] job: Rename BlockJobType into JobType, Kevin Wolf, 2018/05/23
- [Qemu-devel] [PULL 07/46] blockjob: Update block-job-pause/resume documentation, Kevin Wolf, 2018/05/23
- [Qemu-devel] [PULL 17/46] job: Add Job.aio_context, Kevin Wolf, 2018/05/23
- [Qemu-devel] [PULL 18/46] job: Move defer_to_main_loop to Job, Kevin Wolf, 2018/05/23
- [Qemu-devel] [PULL 24/46] blockjob: Split block_job_event_pending(),
Kevin Wolf <=
- [Qemu-devel] [PULL 14/46] job: Move state transitions to Job, Kevin Wolf, 2018/05/23
- [Qemu-devel] [PULL 21/46] job: Move pause/resume functions to Job, Kevin Wolf, 2018/05/23
- [Qemu-devel] [PULL 29/46] job: Move .complete callback to Job, Kevin Wolf, 2018/05/23
- [Qemu-devel] [PULL 09/46] job: Create Job, JobDriver and job_create(), Kevin Wolf, 2018/05/23
- [Qemu-devel] [PULL 28/46] job: Add job_drain(), Kevin Wolf, 2018/05/23
- [Qemu-devel] [PULL 15/46] job: Add reference counting, Kevin Wolf, 2018/05/23
- [Qemu-devel] [PULL 23/46] job: Move BlockJobCreateFlags to Job, Kevin Wolf, 2018/05/23
- [Qemu-devel] [PULL 22/46] job: Replace BlockJob.completed with job_is_completed(), Kevin Wolf, 2018/05/23
- [Qemu-devel] [PULL 27/46] job: Convert block_job_cancel_async() to Job, Kevin Wolf, 2018/05/23
- [Qemu-devel] [PULL 16/46] job: Move cancelled to Job, Kevin Wolf, 2018/05/23