From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:37926)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <benoit.canet@irqsave.net>) id 1XPYrd-0002fy-Fg
	for qemu-devel@nongnu.org; Thu, 04 Sep 2014 11:22:27 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <benoit.canet@irqsave.net>) id 1XPYrW-0004pb-Ov
	for qemu-devel@nongnu.org; Thu, 04 Sep 2014 11:22:21 -0400
Received: from lputeaux-656-01-25-125.w80-12.abo.wanadoo.fr
	([80.12.84.125]:47101 helo=paradis.irqsave.net)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <benoit.canet@irqsave.net>) id 1XPYrW-0004pV-JJ
	for qemu-devel@nongnu.org; Thu, 04 Sep 2014 11:22:14 -0400
Date: Thu, 4 Sep 2014 17:21:27 +0200
From: =?iso-8859-1?Q?Beno=EEt?= Canet <benoit.canet@irqsave.net>
Message-ID: <20140904152126.GC8094@irqsave.net>
References: <1409743435-21155-1-git-send-email-famz@redhat.com>
	<1409743435-21155-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: <1409743435-21155-5-git-send-email-famz@redhat.com>
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH v4 04/20] block: Convert
 bdrv_em_aiocb_info.cancel to .cancel_async
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: Kevin Wolf <kwolf@redhat.com>, Chrysostomos Nanakos <cnanakos@grnet.gr>, Ronnie Sahlberg <ronniesahlberg@gmail.com>, Peter Lieven <pl@kamp.de>, qemu-devel@nongnu.org, Paolo Bonzini <pbonzini@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>, Josh Durgin <josh.durgin@inktank.com>, Liu Yuan <namei.unix@gmail.com>, MORITA Kazutaka <morita.kazutaka@lab.ntt.co.jp>

The Wednesday 03 Sep 2014 =E0 19:23:39 (+0800), Fam Zheng wrote :
> All the difference is that the old .cancel doesn't call cb, but
> .cancel_async does.
>=20
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
>  block.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>=20
> diff --git a/block.c b/block.c
> index 4aa1bd7..b7253af 100644
> --- a/block.c
> +++ b/block.c
> @@ -4679,6 +4679,9 @@ static void bdrv_aio_cancel_em(BlockDriverAIOCB *=
blockacb)
>  {
>      BlockDriverAIOCBSync *acb =3D
>          container_of(blockacb, BlockDriverAIOCBSync, common);
> +
> +    acb->ret =3D -ECANCELED;
> +    acb->common.cb(acb->common.opaque, acb->ret);
>      qemu_bh_delete(acb->bh);
>      acb->bh =3D NULL;
>      qemu_aio_release(acb);
> @@ -4686,7 +4689,7 @@ static void bdrv_aio_cancel_em(BlockDriverAIOCB *=
blockacb)
> =20
>  static const AIOCBInfo bdrv_em_aiocb_info =3D {
>      .aiocb_size         =3D sizeof(BlockDriverAIOCBSync),
> -    .cancel             =3D bdrv_aio_cancel_em,
> +    .cancel_async       =3D bdrv_aio_cancel_em,
>  };

Note from an AIO noob. Could we explain somewhere in the block layer what=
 the _em suffix means ?

> =20
>  static void bdrv_aio_bh_cb(void *opaque)
> --=20
> 2.1.0.27.g96db324
>=20
>=20