blockjob: reimplement block_job_sleep_ns to allow cancellation
commitfc24908e7d232b79c2a6f0363f52bda18dedb57b
authorPaolo Bonzini <pbonzini@redhat.com>
Wed, 29 Nov 2017 10:25:13 +0000 (29 11:25 +0100)
committerKevin Wolf <kwolf@redhat.com>
Wed, 29 Nov 2017 14:26:21 +0000 (29 15:26 +0100)
treec9845836381e9ca9745e01b7e3e00c820dee6af3
parent356f59b8757f47c0aca3e2e4e51d6010f64cade1
blockjob: reimplement block_job_sleep_ns to allow cancellation

This reverts the effects of commit 4afeffc857 ("blockjob: do not allow
coroutine double entry or entry-after-completion", 2017-11-21)

This fixed the symptom of a bug rather than the root cause. Canceling the
wait on a sleeping blockjob coroutine is generally fine, we just need to
make it work correctly across AioContexts.  To do so, use a QEMUTimer
that calls block_job_enter.  Use a mutex to ensure that block_job_enter
synchronizes correctly with block_job_sleep_ns.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Tested-By: Jeff Cody <jcody@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
blockjob.c
include/block/blockjob.h
include/block/blockjob_int.h