diff options
| author | Stefan Hajnoczi | 2016-06-16 18:56:22 +0200 |
|---|---|---|
| committer | Stefan Hajnoczi | 2016-06-20 12:44:12 +0200 |
| commit | 17bd51f936ac0719ef7a93fb77e30313b55c83b5 (patch) | |
| tree | 3885a7878db5ad84a4f85090ce94135ed723bdd0 /blockjob.c | |
| parent | block: process before_write_notifiers in bdrv_co_discard (diff) | |
| download | qemu-17bd51f936ac0719ef7a93fb77e30313b55c83b5.tar.gz qemu-17bd51f936ac0719ef7a93fb77e30313b55c83b5.tar.xz qemu-17bd51f936ac0719ef7a93fb77e30313b55c83b5.zip | |
blockjob: move iostatus reset out of block_job_enter()
The QMP block-job-resume command and cancellation may want to reset the
job's iostatus. The next patches add a user who does not want to reset
iostatus so move it up to block_job_enter() callers.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1466096189-6477-2-git-send-email-stefanha@redhat.com
Diffstat (limited to 'blockjob.c')
| -rw-r--r-- | blockjob.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/blockjob.c b/blockjob.c index 01b896b7e7..5137dce808 100644 --- a/blockjob.c +++ b/blockjob.c @@ -269,7 +269,6 @@ void block_job_resume(BlockJob *job) void block_job_enter(BlockJob *job) { - block_job_iostatus_reset(job); if (job->co && !job->busy) { qemu_coroutine_enter(job->co, NULL); } @@ -278,6 +277,7 @@ void block_job_enter(BlockJob *job) void block_job_cancel(BlockJob *job) { job->cancelled = true; + block_job_iostatus_reset(job); block_job_enter(job); } |