From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47937) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bD6UE-0000zV-C2 for qemu-devel@nongnu.org; Wed, 15 Jun 2016 04:47:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bD6U8-0004je-EP for qemu-devel@nongnu.org; Wed, 15 Jun 2016 04:47:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35135) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bD6U8-0004jZ-8p for qemu-devel@nongnu.org; Wed, 15 Jun 2016 04:47:40 -0400 Date: Wed, 15 Jun 2016 16:47:33 +0800 From: Fam Zheng Message-ID: <20160615084733.GC14453@ad.usersys.redhat.com> References: <1465928228-1184-1-git-send-email-stefanha@redhat.com> <1465928228-1184-2-git-send-email-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1465928228-1184-2-git-send-email-stefanha@redhat.com> Subject: Re: [Qemu-devel] [PATCH v4 1/5] blockjob: move iostatus reset out of block_job_enter() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Hajnoczi Cc: qemu-devel@nongnu.org, Kevin Wolf , jjherne@linux.vnet.ibm.com, Paolo Bonzini , Jeff Cody , mreitz@redhat.com On Tue, 06/14 19:17, Stefan Hajnoczi wrote: > The QMP block-job-resume command and cancellation may want to reset the > job's iostatus. The next patches add a user who does not want to reset > iostatus so move it up to block_job_enter() callers. > > Signed-off-by: Stefan Hajnoczi > --- > blockdev.c | 1 + > blockjob.c | 2 +- > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/blockdev.c b/blockdev.c > index 7fd515a..19b963c 100644 > --- a/blockdev.c > +++ b/blockdev.c > @@ -3799,6 +3799,7 @@ void qmp_block_job_resume(const char *device, Error **errp) > > job->user_paused = false; > trace_qmp_block_job_resume(job); > + block_job_iostatus_reset(job); > block_job_resume(job); > aio_context_release(aio_context); > } > diff --git a/blockjob.c b/blockjob.c > index c095cc5..463bccf 100644 > --- a/blockjob.c > +++ b/blockjob.c > @@ -269,7 +269,6 @@ void block_job_resume(BlockJob *job) > > void block_job_enter(BlockJob *job) > { > - block_job_iostatus_reset(job); > if (job->co && !job->busy) { > qemu_coroutine_enter(job->co, NULL); > } > @@ -278,6 +277,7 @@ void block_job_enter(BlockJob *job) > void block_job_cancel(BlockJob *job) > { > job->cancelled = true; > + block_job_iostatus_reset(job); > block_job_enter(job); > } > > -- > 2.5.5 > Reviewed-by: Fam Zheng