From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56135) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WY51k-0002uO-BI for qemu-devel@nongnu.org; Wed, 09 Apr 2014 22:47:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WY51f-00070v-8g for qemu-devel@nongnu.org; Wed, 09 Apr 2014 22:47:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:31055) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WY51e-00070p-VM for qemu-devel@nongnu.org; Wed, 09 Apr 2014 22:47:39 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s3A2lc99014707 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 9 Apr 2014 22:47:38 -0400 From: Fam Zheng Date: Thu, 10 Apr 2014 10:47:05 +0800 Message-Id: <1397098036-20605-5-git-send-email-famz@redhat.com> In-Reply-To: <1397098036-20605-1-git-send-email-famz@redhat.com> References: <1397098036-20605-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH v18 04/15] 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: qemu-devel@nongnu.org Cc: kwolf@redhat.com, jcody@redhat.com, hbrock@redhat.com, rjones@redhat.com, imain@redhat.com, stefanha@redhat.com, pbonzini@redhat.com 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.1