From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54278) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fq3Gz-0000gl-Hk for qemu-devel@nongnu.org; Wed, 15 Aug 2018 17:24:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fq3Gv-0004iO-PR for qemu-devel@nongnu.org; Wed, 15 Aug 2018 17:24:07 -0400 References: From: John Snow Message-ID: Date: Wed, 15 Aug 2018 17:23:43 -0400 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] block: for jobs, do not clear user_paused until after the resume List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jeff Cody , qemu-devel@nongnu.org Cc: qemu-block@nongnu.org On 08/15/2018 11:59 AM, Jeff Cody wrote: > The function job_cancel_async() will always cause an assert for blockjob > user resume. We set job->user_paused to false, and then call > job->driver->user_resume(). In the case of blockjobs, this is the > block_job_user_resume() function. > > In that function, we assert that job.user_paused is set to true. > Unfortunately, right before calling this function, it has explicitly > been set to false. > > The fix is pretty simple: set job->user_paused to false only after the > job user_resume() function has been called. > > Signed-off-by: Jeff Cody > --- > job.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/job.c b/job.c > index fa671b431a..e36ebaafd8 100644 > --- a/job.c > +++ b/job.c > @@ -732,10 +732,10 @@ static void job_cancel_async(Job *job, bool force) > { > if (job->user_paused) { > /* Do not call job_enter here, the caller will handle it. */ > - job->user_paused = false; > if (job->driver->user_resume) { > job->driver->user_resume(job); > } > + job->user_paused = false; > assert(job->pause_count > 0); > job->pause_count--; > } > Looks right to me; are you going to make good on your threat of a v2 with a unit test? Reviewed-by: John Snow