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

job: Move cancelled to Job 



We cannot yet move the whole logic around job cancelling to Job because
it depends on quite a few other things that are still only in BlockJob,
but we can move the cancelled field at least.

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 80fa2c75

block/backup.c

+3 −3
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ static bool coroutine_fn yield_and_check(BackupBlockJob *job) 
{

    uint64_t delay_ns;



    if (block_job_is_cancelled(&job->common)) {

    if (job_is_cancelled(&job->common.job)) {

        return true;

    }
@@ -339,7 +339,7 @@ static bool coroutine_fn yield_and_check(BackupBlockJob *job) 
    job->bytes_read = 0;

    block_job_sleep_ns(&job->common, delay_ns);



    if (block_job_is_cancelled(&job->common)) {

    if (job_is_cancelled(&job->common.job)) {

        return true;

    }
@@ -441,7 +441,7 @@ static void coroutine_fn backup_run(void *opaque) 
    if (job->sync_mode == MIRROR_SYNC_MODE_NONE) {

        /* All bits are set in copy_bitmap to allow any cluster to be copied.

         * This does not actually require them to be copied. */

        while (!block_job_is_cancelled(&job->common)) {

        while (!job_is_cancelled(&job->common.job)) {

            /* Yield until the job is cancelled.  We just let our before_write

             * notify callback service CoW requests. */

            block_job_yield(&job->common);

block/commit.c

+2 −2
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ static void commit_complete(BlockJob *job, void *opaque) 
     * the normal backing chain can be restored. */

    blk_unref(s->base);



    if (!block_job_is_cancelled(&s->common) && ret == 0) {

    if (!job_is_cancelled(&s->common.job) && ret == 0) {

        /* success */

        ret = bdrv_drop_intermediate(s->commit_top_bs, base,

                                     s->backing_file_str);
@@ -172,7 +172,7 @@ static void coroutine_fn commit_run(void *opaque) 
         * with no pending I/O here so that bdrv_drain_all() returns.

         */

        block_job_sleep_ns(&s->common, delay_ns);

        if (block_job_is_cancelled(&s->common)) {

        if (job_is_cancelled(&s->common.job)) {

            break;

        }

        /* Copy if allocated above the base */

block/mirror.c

+10 −10
Original line number Diff line number Diff line
@@ -622,7 +622,7 @@ static int coroutine_fn mirror_dirty_init(MirrorBlockJob *s) 


            mirror_throttle(s);



            if (block_job_is_cancelled(&s->common)) {

            if (job_is_cancelled(&s->common.job)) {

                s->initial_zeroing_ongoing = false;

                return 0;

            }
@@ -650,7 +650,7 @@ static int coroutine_fn mirror_dirty_init(MirrorBlockJob *s) 


        mirror_throttle(s);



        if (block_job_is_cancelled(&s->common)) {

        if (job_is_cancelled(&s->common.job)) {

            return 0;

        }
@@ -695,7 +695,7 @@ static void coroutine_fn mirror_run(void *opaque) 
                                 checking for a NULL string */

    int ret = 0;



    if (block_job_is_cancelled(&s->common)) {

    if (job_is_cancelled(&s->common.job)) {

        goto immediate_exit;

    }
@@ -729,10 +729,10 @@ static void coroutine_fn mirror_run(void *opaque) 
        /* Report BLOCK_JOB_READY and wait for complete. */

        block_job_event_ready(&s->common);

        s->synced = true;

        while (!block_job_is_cancelled(&s->common) && !s->should_complete) {

        while (!job_is_cancelled(&s->common.job) && !s->should_complete) {

            block_job_yield(&s->common);

        }

        s->common.cancelled = false;

        s->common.job.cancelled = false;

        goto immediate_exit;

    }
@@ -768,7 +768,7 @@ static void coroutine_fn mirror_run(void *opaque) 
    s->last_pause_ns = qemu_clock_get_ns(QEMU_CLOCK_REALTIME);

    if (!s->is_none_mode) {

        ret = mirror_dirty_init(s);

        if (ret < 0 || block_job_is_cancelled(&s->common)) {

        if (ret < 0 || job_is_cancelled(&s->common.job)) {

            goto immediate_exit;

        }

    }
@@ -828,7 +828,7 @@ static void coroutine_fn mirror_run(void *opaque) 
            }



            should_complete = s->should_complete ||

                block_job_is_cancelled(&s->common);

                job_is_cancelled(&s->common.job);

            cnt = bdrv_get_dirty_count(s->dirty_bitmap);

        }
@@ -856,7 +856,7 @@ static void coroutine_fn mirror_run(void *opaque) 
             * completion.

             */

            assert(QLIST_EMPTY(&bs->tracked_requests));

            s->common.cancelled = false;

            s->common.job.cancelled = false;

            need_drain = false;

            break;

        }
@@ -869,7 +869,7 @@ static void coroutine_fn mirror_run(void *opaque) 
        }

        trace_mirror_before_sleep(s, cnt, s->synced, delay_ns);

        block_job_sleep_ns(&s->common, delay_ns);

        if (block_job_is_cancelled(&s->common) &&

        if (job_is_cancelled(&s->common.job) &&

            (!s->synced || s->common.force))

        {

            break;
@@ -884,7 +884,7 @@ immediate_exit: 
         * the target is a copy of the source.

         */

        assert(ret < 0 || ((s->common.force || !s->synced) &&

               block_job_is_cancelled(&s->common)));

               job_is_cancelled(&s->common.job)));

        assert(need_drain);

        mirror_wait_for_all_io(s);

    }

block/stream.c

+2 −2
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ static void stream_complete(BlockJob *job, void *opaque) 
    BlockDriverState *base = s->base;

    Error *local_err = NULL;



    if (!block_job_is_cancelled(&s->common) && bs->backing &&

    if (!job_is_cancelled(&s->common.job) && bs->backing &&

        data->ret == 0) {

        const char *base_id = NULL, *base_fmt = NULL;

        if (base) {
@@ -141,7 +141,7 @@ static void coroutine_fn stream_run(void *opaque) 
         * with no pending I/O here so that bdrv_drain_all() returns.

         */

        block_job_sleep_ns(&s->common, delay_ns);

        if (block_job_is_cancelled(&s->common)) {

        if (job_is_cancelled(&s->common.job)) {

            break;

        }

blockjob.c

+13 −15
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ static void block_job_conclude(BlockJob *job) 


static void block_job_update_rc(BlockJob *job)

{

    if (!job->ret && block_job_is_cancelled(job)) {

    if (!job->ret && job_is_cancelled(&job->job)) {

        job->ret = -ECANCELED;

    }

    if (job->ret) {
@@ -438,7 +438,7 @@ static int block_job_finalize_single(BlockJob *job) 


    /* Emit events only if we actually started */

    if (block_job_started(job)) {

        if (block_job_is_cancelled(job)) {

        if (job_is_cancelled(&job->job)) {

            block_job_event_cancelled(job);

        } else {

            const char *msg = NULL;
@@ -464,7 +464,7 @@ static void block_job_cancel_async(BlockJob *job, bool force) 
        job->user_paused = false;

        job->pause_count--;

    }

    job->cancelled = true;

    job->job.cancelled = true;

    /* To prevent 'force == false' overriding a previous 'force == true' */

    job->force |= force;

}
@@ -519,7 +519,8 @@ static int block_job_finish_sync(BlockJob *job, 
    while (!job->completed) {

        aio_poll(qemu_get_aio_context(), true);

    }

    ret = (job->cancelled && job->ret == 0) ? -ECANCELED : job->ret;

    ret = (job_is_cancelled(&job->job) && job->ret == 0)

          ? -ECANCELED : job->ret;

    job_unref(&job->job);

    return ret;

}
@@ -557,7 +558,7 @@ static void block_job_completed_txn_abort(BlockJob *job) 
        other_job = QLIST_FIRST(&txn->jobs);

        ctx = blk_get_aio_context(other_job->blk);

        if (!other_job->completed) {

            assert(other_job->cancelled);

            assert(job_is_cancelled(&other_job->job));

            block_job_finish_sync(other_job, NULL, NULL);

        }

        block_job_finalize_single(other_job);
@@ -651,7 +652,9 @@ void block_job_complete(BlockJob *job, Error **errp) 
    if (job_apply_verb(&job->job, JOB_VERB_COMPLETE, errp)) {

        return;

    }

    if (job->pause_count || job->cancelled || !job->driver->complete) {

    if (job->pause_count || job_is_cancelled(&job->job) ||

        !job->driver->complete)

    {

        error_setg(errp, "The active block job '%s' cannot be completed",

                   job->job.id);

        return;
@@ -1006,7 +1009,7 @@ void coroutine_fn block_job_pause_point(BlockJob *job) 
    if (!block_job_should_pause(job)) {

        return;

    }

    if (block_job_is_cancelled(job)) {

    if (job_is_cancelled(&job->job)) {

        return;

    }
@@ -1014,7 +1017,7 @@ void coroutine_fn block_job_pause_point(BlockJob *job) 
        job->driver->pause(job);

    }



    if (block_job_should_pause(job) && !block_job_is_cancelled(job)) {

    if (block_job_should_pause(job) && !job_is_cancelled(&job->job)) {

        JobStatus status = job->job.status;

        job_state_transition(&job->job, status == JOB_STATUS_READY

                                        ? JOB_STATUS_STANDBY
@@ -1066,17 +1069,12 @@ void block_job_enter(BlockJob *job) 
    block_job_enter_cond(job, NULL);

}



bool block_job_is_cancelled(BlockJob *job)

{

    return job->cancelled;

}



void block_job_sleep_ns(BlockJob *job, int64_t ns)

{

    assert(job->busy);



    /* Check cancellation *before* setting busy = false, too!  */

    if (block_job_is_cancelled(job)) {

    if (job_is_cancelled(&job->job)) {

        return;

    }
@@ -1092,7 +1090,7 @@ void block_job_yield(BlockJob *job) 
    assert(job->busy);



    /* Check cancellation *before* setting busy = false, too!  */

    if (block_job_is_cancelled(job)) {

    if (job_is_cancelled(&job->job)) {

        return;

    }