| Message ID | 3d9011151512326b890d22bdab3530244ef349d7.1464346103.git.berto@igalia.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 27.05.2016 12:53, Alberto Garcia wrote: > If we pause a block job and drain its BlockDriverState we want that > the job remains inactive until we call block_job_resume() again. > > However if we pause the job while it is sleeping then it will resume > when the sleep timer fires. > > This patch prevents that from happening by checking if the job has > been paused after it comes back from sleeping. > > Signed-off-by: Alberto Garcia <berto@igalia.com> > Suggested-by: Kevin Wolf <kwolf@redhat.com> > --- > blockjob.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) Reviewed-by: Max Reitz <mreitz@redhat.com>
diff --git a/blockjob.c b/blockjob.c index c095cc5..01b896b 100644 --- a/blockjob.c +++ b/blockjob.c @@ -361,10 +361,12 @@ void block_job_sleep_ns(BlockJob *job, QEMUClockType type, int64_t ns) } job->busy = false; + if (!block_job_is_paused(job)) { + co_aio_sleep_ns(blk_get_aio_context(job->blk), type, ns); + } + /* The job can be paused while sleeping, so check this again */ if (block_job_is_paused(job)) { qemu_coroutine_yield(); - } else { - co_aio_sleep_ns(blk_get_aio_context(job->blk), type, ns); } job->busy = true; }
If we pause a block job and drain its BlockDriverState we want that the job remains inactive until we call block_job_resume() again. However if we pause the job while it is sleeping then it will resume when the sleep timer fires. This patch prevents that from happening by checking if the job has been paused after it comes back from sleeping. Signed-off-by: Alberto Garcia <berto@igalia.com> Suggested-by: Kevin Wolf <kwolf@redhat.com> --- blockjob.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)