Skip to content

Commit

Permalink
block/block-backend: blk_iostatus_reset: drop usage of bs->job
Browse files Browse the repository at this point in the history
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: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
  • Loading branch information
Vladimir Sementsov-Ogievskiy authored and kevmw committed Jun 18, 2019
1 parent cc19f17 commit 68d00e4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
4 changes: 0 additions & 4 deletions block/block-backend.c
Expand Up @@ -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);
}
}
}

Expand Down
5 changes: 5 additions & 0 deletions monitor/qmp-cmds.c
Expand Up @@ -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
Expand All @@ -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.
*
Expand Down

0 comments on commit 68d00e4

Please sign in to comment.