From: Kevin Wolf <kwolf@redhat.com>
Date: Fri, 3 May 2019 17:17:43 +0000 (+0200)
Subject: blockjob: Fix coroutine thread after AioContext change
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=13726123ba916dd8ead23156a61db8d2c8bd42e8;p=qemu.git

blockjob: Fix coroutine thread after AioContext change

Commit 463e0be10 ('blockjob: add AioContext attached callback') tried to
make block jobs robust against AioContext changes of their main node,
but it never made sure that the job coroutine actually runs in the new
thread.

Instead of waking up the job coroutine in whatever thread it ran before,
let's always pass the AioContext where it should be running now.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---

diff --git a/job.c b/job.c
index da8e4b7bf2..2167d53717 100644
--- a/job.c
+++ b/job.c
@@ -432,7 +432,7 @@ void job_enter_cond(Job *job, bool(*fn)(Job *job))
     timer_del(&job->sleep_timer);
     job->busy = true;
     job_unlock();
-    aio_co_wake(job->co);
+    aio_co_enter(job->aio_context, job->co);
 }
 
 void job_enter(Job *job)