From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55183) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XP8hI-0006uj-UV for qemu-devel@nongnu.org; Wed, 03 Sep 2014 07:26:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XP8hC-0007AA-EW for qemu-devel@nongnu.org; Wed, 03 Sep 2014 07:25:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:24496) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XP8hC-0007A2-2b for qemu-devel@nongnu.org; Wed, 03 Sep 2014 07:25:50 -0400 From: Fam Zheng Date: Wed, 3 Sep 2014 19:23:46 +0800 Message-Id: <1409743435-21155-12-git-send-email-famz@redhat.com> In-Reply-To: <1409743435-21155-1-git-send-email-famz@redhat.com> References: <1409743435-21155-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH v4 11/20] blkdebug: Convert blkdebug_aiocb_info.cancel to .cancel_async List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Chrysostomos Nanakos , Stefan Hajnoczi , Liu Yuan , Peter Lieven , Ronnie Sahlberg , Josh Durgin , Paolo Bonzini , MORITA Kazutaka , Benoit Canet Signed-off-by: Fam Zheng --- block/blkdebug.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/block/blkdebug.c b/block/blkdebug.c index 69b330e..9f23530 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -55,8 +55,8 @@ typedef struct BlkdebugSuspendedReq { static void blkdebug_aio_cancel(BlockDriverAIOCB *blockacb); static const AIOCBInfo blkdebug_aiocb_info = { - .aiocb_size = sizeof(BlkdebugAIOCB), - .cancel = blkdebug_aio_cancel, + .aiocb_size = sizeof(BlkdebugAIOCB), + .cancel_async = blkdebug_aio_cancel, }; enum { @@ -453,6 +453,8 @@ static void error_callback_bh(void *opaque) static void blkdebug_aio_cancel(BlockDriverAIOCB *blockacb) { BlkdebugAIOCB *acb = container_of(blockacb, BlkdebugAIOCB, common); + acb->ret = -ECANCELED; + acb->common.cb(acb->common.opaque, acb->ret); if (acb->bh) { qemu_bh_delete(acb->bh); acb->bh = NULL; -- 2.1.0.27.g96db324