From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58438) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WWwpv-0003mN-9D for qemu-devel@nongnu.org; Sun, 06 Apr 2014 19:50:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WWwpq-0000cU-5s for qemu-devel@nongnu.org; Sun, 06 Apr 2014 19:50:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51722) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WWwpp-0000cL-RP for qemu-devel@nongnu.org; Sun, 06 Apr 2014 19:50:46 -0400 Date: Sun, 6 Apr 2014 19:50:41 -0400 From: Jeff Cody Message-ID: <20140406235041.GB6752@localhost.localdomain> References: <1394436370-8908-1-git-send-email-famz@redhat.com> <1394436370-8908-5-git-send-email-famz@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1394436370-8908-5-git-send-email-famz@redhat.com> Subject: Re: [Qemu-devel] [PATCH v17 04/14] block: Move op_blocker check from block_job_create to its caller List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Fam Zheng Cc: kwolf@redhat.com, benoit.canet@irqsave.net, rjones@redhat.com, armbru@redhat.com, qemu-devel@nongnu.org, ptoscano@redhat.com, imain@redhat.com, stefanha@redhat.com, pbonzini@redhat.com On Mon, Mar 10, 2014 at 03:26:00PM +0800, Fam Zheng wrote: > It makes no sense to check for "any" blocker on bs, we are here only > because of the mechanical conversion from in_use to op_blockers. Remove > it now, and let the callers check specific operation types. Backup and > mirror already have it, add checker to stream and commit. > > Signed-off-by: Fam Zheng > Reviewed-by: Benoit Canet Reviewed-by: Jeff Cody > --- > blockdev.c | 8 ++++++++ > blockjob.c | 2 +- > 2 files changed, 9 insertions(+), 1 deletion(-) > > diff --git a/blockdev.c b/blockdev.c > index 593925e..d68fd2b 100644 > --- a/blockdev.c > +++ b/blockdev.c > @@ -1846,6 +1846,10 @@ void qmp_block_stream(const char *device, bool has_base, > return; > } > > + if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_STREAM, errp)) { > + return; > + } > + > if (base) { > base_bs = bdrv_find_backing_image(bs, base); > if (base_bs == NULL) { > @@ -1886,6 +1890,10 @@ void qmp_block_commit(const char *device, > return; > } > > + if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_COMMIT, errp)) { > + return; > + } > + > /* default top_bs is the active layer */ > top_bs = bs; > > diff --git a/blockjob.c b/blockjob.c > index f643a78..3e33051 100644 > --- a/blockjob.c > +++ b/blockjob.c > @@ -41,7 +41,7 @@ void *block_job_create(const BlockJobDriver *driver, BlockDriverState *bs, > { > BlockJob *job; > > - if (bs->job || !bdrv_op_blocker_is_empty(bs)) { > + if (bs->job) { > error_set(errp, QERR_DEVICE_IN_USE, bdrv_get_device_name(bs)); > return NULL; > } > -- > 1.9.0 > >