[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 12/46] job: Add job_delete()
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 12/46] job: Add job_delete() |
Date: |
Wed, 23 May 2018 15:11:21 +0200 |
This moves freeing the Job object and its fields from block_job_unref()
to job_delete().
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Reviewed-by: John Snow <address@hidden>
---
include/qemu/job.h | 3 +++
blockjob.c | 3 +--
job.c | 6 ++++++
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/include/qemu/job.h b/include/qemu/job.h
index 279ce688fd..43dc2e4a7d 100644
--- a/include/qemu/job.h
+++ b/include/qemu/job.h
@@ -62,6 +62,9 @@ struct JobDriver {
*/
void *job_create(const char *job_id, const JobDriver *driver, Error **errp);
+/** Frees the @job object. */
+void job_delete(Job *job);
+
/** Returns the JobType of a given Job. */
JobType job_type(const Job *job);
diff --git a/blockjob.c b/blockjob.c
index ea71ec0129..430a67ba63 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -261,9 +261,8 @@ void block_job_unref(BlockJob *job)
block_job_detach_aio_context, job);
blk_unref(job->blk);
error_free(job->blocker);
- g_free(job->job.id);
assert(!timer_pending(&job->sleep_timer));
- g_free(job);
+ job_delete(&job->job);
}
}
diff --git a/job.c b/job.c
index 83724a43de..cfdd008c52 100644
--- a/job.c
+++ b/job.c
@@ -56,3 +56,9 @@ void *job_create(const char *job_id, const JobDriver *driver,
Error **errp)
return job;
}
+
+void job_delete(Job *job)
+{
+ g_free(job->id);
+ g_free(job);
+}
--
2.13.6
- [Qemu-block] [PULL 00/46] Block layer patches, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 01/46] qemu-iotests: Fix paths for NFS, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 03/46] qemu-iotests: 086 doesn't work with NFS, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 10/46] job: Rename BlockJobType into JobType, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 08/46] blockjob: Improve BlockJobInfo.offset/len documentation, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 06/46] qemu-iotests: Remove MIG_SOCKET from non-migration tests, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 02/46] qemu-iotests: Filter NFS paths, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 04/46] sheepdog: Remove unnecessary NULL check in sd_prealloc(), Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 05/46] qemu-iotests: Add more tests to "migration" group, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 11/46] job: Add JobDriver.job_type, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 12/46] job: Add job_delete(),
Kevin Wolf <=
- [Qemu-block] [PULL 07/46] blockjob: Update block-job-pause/resume documentation, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 17/46] job: Add Job.aio_context, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 18/46] job: Move defer_to_main_loop to Job, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 09/46] job: Create Job, JobDriver and job_create(), Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 16/46] job: Move cancelled to Job, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 13/46] job: Maintain a list of all jobs, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 14/46] job: Move state transitions to Job, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 15/46] job: Add reference counting, Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 22/46] job: Replace BlockJob.completed with job_is_completed(), Kevin Wolf, 2018/05/23
- [Qemu-block] [PULL 21/46] job: Move pause/resume functions to Job, Kevin Wolf, 2018/05/23