Commit 30c070a5 authored by Kevin Wolf's avatar Kevin Wolf
Browse files

test-blockjob: Acquire AioContext around job_cancel_sync() 



All callers in QEMU proper hold the AioContext lock when calling
job_finish_sync(). test-blockjob should do the same when it calls the
function indirectly through job_cancel_sync().

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarFam Zheng <famz@redhat.com>
parent f62c1729

include/qemu/job.h

+6 −0
Original line number Diff line number Diff line
@@ -524,6 +524,8 @@ void job_user_cancel(Job *job, bool force, Error **errp); 
 *

 * Returns the return value from the job if the job actually completed

 * during the call, or -ECANCELED if it was canceled.

 *

 * Callers must hold the AioContext lock of job->aio_context.

 */

int job_cancel_sync(Job *job);
@@ -541,6 +543,8 @@ void job_cancel_sync_all(void); 
 * function).

 *

 * Returns the return value from the job.

 *

 * Callers must hold the AioContext lock of job->aio_context.

 */

int job_complete_sync(Job *job, Error **errp);
@@ -566,6 +570,8 @@ void job_dismiss(Job **job, Error **errp); 
 *

 * Returns 0 if the job is successfully completed, -ECANCELED if the job was

 * cancelled before completing, and -errno in other error cases.

 *

 * Callers must hold the AioContext lock of job->aio_context.

 */

int job_finish_sync(Job *job, void (*finish)(Job *, Error **errp), Error **errp);

tests/test-blockjob.c

+6 −0
Original line number Diff line number Diff line
@@ -223,6 +223,10 @@ static void cancel_common(CancelJob *s) 
    BlockJob *job = &s->common;

    BlockBackend *blk = s->blk;

    JobStatus sts = job->job.status;

    AioContext *ctx;



    ctx = job->job.aio_context;

    aio_context_acquire(ctx);



    job_cancel_sync(&job->job);

    if (sts != JOB_STATUS_CREATED && sts != JOB_STATUS_CONCLUDED) {
@@ -232,6 +236,8 @@ static void cancel_common(CancelJob *s) 
    assert(job->job.status == JOB_STATUS_NULL);

    job_unref(&job->job);

    destroy_blk(blk);



    aio_context_release(ctx);

}



static void test_cancel_created(void)