diff options
| author | Kevin Wolf | 2016-04-18 11:36:38 +0200 |
|---|---|---|
| committer | Kevin Wolf | 2016-05-19 16:45:31 +0200 |
| commit | 81e254dc8349795d17c585a997f9076b77a863fc (patch) | |
| tree | c3f3b3668627b4600426f46850282f856072b940 /blockjob.c | |
| parent | block: User BdrvChild callback for device name (diff) | |
| download | qemu-81e254dc8349795d17c585a997f9076b77a863fc.tar.gz qemu-81e254dc8349795d17c585a997f9076b77a863fc.tar.xz qemu-81e254dc8349795d17c585a997f9076b77a863fc.zip | |
blockjob: Don't set iostatus of target
When block job errors were introduced, we assigned the iostatus of the
target BDS "just in case". The field has never been accessible for the
user because the target isn't listed in query-block.
Before we can allow the user to have a second BlockBackend on the
target, we need to clean this up. If anything, we would want to set the
iostatus for the internal BB of the job (which we can always do later),
but certainly not for a separate BB which the job doesn't even use.
As a nice side effect, this gets us rid of another bs->blk use.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'blockjob.c')
| -rw-r--r-- | blockjob.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/blockjob.c b/blockjob.c index 9fc37ca965..5b840a7df6 100644 --- a/blockjob.c +++ b/blockjob.c @@ -411,8 +411,7 @@ void block_job_event_ready(BlockJob *job) job->speed, &error_abort); } -BlockErrorAction block_job_error_action(BlockJob *job, BlockDriverState *bs, - BlockdevOnError on_err, +BlockErrorAction block_job_error_action(BlockJob *job, BlockdevOnError on_err, int is_read, int error) { BlockErrorAction action; @@ -443,9 +442,6 @@ BlockErrorAction block_job_error_action(BlockJob *job, BlockDriverState *bs, job->user_paused = true; block_job_pause(job); block_job_iostatus_set_err(job, error); - if (bs->blk && bs != job->bs) { - blk_iostatus_set_err(bs->blk, error); - } } return action; } |