Commit 0824afda authored May 27, 2016 by Alberto Garcia Committed by Max Reitz Jun 16, 2016

block: Prevent sleeping jobs from resuming if they have been paused



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>
Message-id: 3d9011151512326b890d22bdab3530244ef349d7.1464346103.git.berto@igalia.com
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>

parent f0f55ded

blockjob.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}