Commit 68d00e42 authored by Vladimir Sementsov-Ogievskiy's avatar Vladimir Sementsov-Ogievskiy Committed by Kevin Wolf
Browse files

block/block-backend: blk_iostatus_reset: drop usage of bs->job 



We are going to remove bs->job pointer. Drop it's usage in
blk_iostatus_reset.

blk_iostatus_reset() has only two callers:

1. blk_attach_dev(). This doesn't have anything to do with jobs and
    attaching a new guest device won't solve any problem the job
    encountered, so no reason to reset the iostatus for the job.

2. qmp_cont(). This resets the iostatus for everything. We can just
    call block_job_iostatus_reset() for all block jobs instead of going
    through BlockBackend.

Suggested-by: default avatarKevin Wolf <kwolf@redhat.com>
Signed-off-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent cc19f177

block/block-backend.c

+0 −4
Original line number Diff line number Diff line
@@ -1073,11 +1073,7 @@ void blk_iostatus_disable(BlockBackend *blk) 
void blk_iostatus_reset(BlockBackend *blk)

{

    if (blk_iostatus_is_enabled(blk)) {

        BlockDriverState *bs = blk_bs(blk);

        blk->iostatus = BLOCK_DEVICE_IO_STATUS_OK;

        if (bs && bs->job) {

            block_job_iostatus_reset(bs->job);

        }

    }

}

monitor/qmp-cmds.c

+5 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ void qmp_x_exit_preconfig(Error **errp) 
void qmp_cont(Error **errp)

{

    BlockBackend *blk;

    BlockJob *job;

    Error *local_err = NULL;



    /* if there is a dump in background, we should wait until the dump
@@ -166,6 +167,10 @@ void qmp_cont(Error **errp) 
        blk_iostatus_reset(blk);

    }



    for (job = block_job_next(NULL); job; job = block_job_next(job)) {

        block_job_iostatus_reset(job);

    }



    /* Continuing after completed migration. Images have been inactivated to

     * allow the destination to take control. Need to get control back now.

     *