From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:57853)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <benoit.canet@irqsave.net>) id 1WG94A-00057v-32
	for qemu-devel@nongnu.org; Wed, 19 Feb 2014 10:28:11 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <benoit.canet@irqsave.net>) id 1WG944-0008C9-VJ
	for qemu-devel@nongnu.org; Wed, 19 Feb 2014 10:28:06 -0500
Received: from lnantes-156-75-100-125.w80-12.abo.wanadoo.fr
	([80.12.84.125]:50333 helo=paradis.irqsave.net)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <benoit.canet@irqsave.net>) id 1WG944-0008Bv-Oz
	for qemu-devel@nongnu.org; Wed, 19 Feb 2014 10:28:00 -0500
Date: Wed, 19 Feb 2014 16:28:00 +0100
From: =?iso-8859-1?Q?Beno=EEt?= Canet <benoit.canet@irqsave.net>
Message-ID: <20140219152800.GE20622@irqsave.net>
References: <1392817351-22148-1-git-send-email-famz@redhat.com>
	<1392817351-22148-5-git-send-email-famz@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
In-Reply-To: <1392817351-22148-5-git-send-email-famz@redhat.com>
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH v14 04/14] block: Move op_blocker check
 from block_job_create to its caller
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Fam Zheng <famz@redhat.com>
Cc: kwolf@redhat.com, benoit.canet@irqsave.net, rjones@redhat.com, qemu-devel@nongnu.org, armbru@redhat.com, imain@redhat.com, stefanha@redhat.com, pbonzini@redhat.com

The Wednesday 19 Feb 2014 =E0 21:42:21 (+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.
>=20
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
>  blockdev.c | 8 ++++++++
>  blockjob.c | 2 +-
>  2 files changed, 9 insertions(+), 1 deletion(-)
>=20
> diff --git a/blockdev.c b/blockdev.c
> index 53dce70..306aad5 100644
> --- a/blockdev.c
> +++ b/blockdev.c
> @@ -1840,6 +1840,10 @@ void qmp_block_stream(const char *device, bool h=
as_base,
>          return;
>      }
> =20
> +    if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_STREAM, errp)) {
> +        return;
> +    }
> +
>      if (base) {
>          base_bs =3D bdrv_find_backing_image(bs, base);
>          if (base_bs =3D=3D NULL) {
> @@ -1880,6 +1884,10 @@ void qmp_block_commit(const char *device,
>          return;
>      }
> =20
> +    if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_COMMIT, errp)) {
> +        return;
> +    }
> +
>      /* default top_bs is the active layer */
>      top_bs =3D bs;
> =20
> diff --git a/blockjob.c b/blockjob.c
> index f1ff036..21e21c0 100644
> --- a/blockjob.c
> +++ b/blockjob.c
> @@ -41,7 +41,7 @@ void *block_job_create(const BlockJobDriver *driver, =
BlockDriverState *bs,
>  {
>      BlockJob *job;
> =20
> -    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;
>      }
> --=20
> 1.8.5.4
>=20
>=20
Reviewed-by: Benoit Canet <benoit@irqsave.net>