[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [RFC PATCH 10/33] job: Add job_delete()
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [RFC PATCH 10/33] job: Add job_delete() |
Date: |
Tue, 24 Apr 2018 17:24:52 +0200 |
This moves freeing the Job object and its fields from block_job_unref()
to job_delete().
Signed-off-by: Kevin Wolf <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 c87e951c8a..ee1f5d1ef4 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(Job *job);
diff --git a/blockjob.c b/blockjob.c
index 5e766057e1..041a1e58d2 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -247,9 +247,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 f00f401502..a36425498d 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
- Re: [Qemu-block] [Qemu-devel] [RFC PATCH 01/33] blockjob: Wrappers for progress counter access, (continued)
- [Qemu-block] [RFC PATCH 02/33] blockjob: Move RateLimit to BlockJob, Kevin Wolf, 2018/04/24
- [Qemu-block] [RFC PATCH 03/33] blockjob: Implement block_job_set_speed() centrally, Kevin Wolf, 2018/04/24
- [Qemu-block] [RFC PATCH 04/33] blockjob: Introduce block_job_ratelimit_get_delay(), Kevin Wolf, 2018/04/24
- [Qemu-block] [RFC PATCH 05/33] blockjob: Add block_job_driver(), Kevin Wolf, 2018/04/24
- [Qemu-block] [RFC PATCH 06/33] blockjob: Remove block_job_pause/resume_all(), Kevin Wolf, 2018/04/24
- [Qemu-block] [RFC PATCH 10/33] job: Add job_delete(),
Kevin Wolf <=
- [Qemu-block] [RFC PATCH 09/33] job: Add JobDriver.job_type, Kevin Wolf, 2018/04/24
- [Qemu-block] [RFC PATCH 08/33] job: Rename BlockJobType into JobType, Kevin Wolf, 2018/04/24
- [Qemu-block] [RFC PATCH 11/33] job: Maintain a list of all jobs, Kevin Wolf, 2018/04/24
- [Qemu-block] [RFC PATCH 07/33] job: Create Job, JobDriver and job_create(), Kevin Wolf, 2018/04/24
- [Qemu-block] [RFC PATCH 15/33] job: Add Job.aio_context, Kevin Wolf, 2018/04/24
- [Qemu-block] [RFC PATCH 12/33] job: Move state transitions to Job, Kevin Wolf, 2018/04/24
- [Qemu-block] [RFC PATCH 14/33] job: Move cancelled to Job, Kevin Wolf, 2018/04/24
- [Qemu-block] [RFC PATCH 13/33] job: Add reference counting, Kevin Wolf, 2018/04/24