Commit fd61a701 authored by Kevin Wolf's avatar Kevin Wolf
Browse files

job: Add job_delete() 



This moves freeing the Job object and its fields from block_job_unref()
to job_delete().

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarJohn Snow <jsnow@redhat.com>
parent 252291ea

blockjob.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

    }

}

include/qemu/job.h

+3 −0
Original line number Diff line number Diff line
@@ -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);

job.c

+6 −0
Original line number Diff line number Diff line
@@ -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);

}