From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35101) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XRaxq-0005SU-HC for qemu-devel@nongnu.org; Wed, 10 Sep 2014 02:01:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XRaxg-0003B2-NL for qemu-devel@nongnu.org; Wed, 10 Sep 2014 02:01:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39005) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XRaxg-0003As-FU for qemu-devel@nongnu.org; Wed, 10 Sep 2014 02:01:00 -0400 From: Fam Zheng Date: Wed, 10 Sep 2014 13:59:57 +0800 Message-Id: <1410328814-12560-6-git-send-email-famz@redhat.com> In-Reply-To: <1410328814-12560-1-git-send-email-famz@redhat.com> References: <1410328814-12560-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH v5 05/22] block: Convert bdrv_em_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 , Benoit Canet , Peter Lieven , Stefan Hajnoczi , Liu Yuan , Paolo Bonzini All the difference is that the old .cancel doesn't call cb, but .cancel_async does. Signed-off-by: Fam Zheng --- block.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/block.c b/block.c index 6193883..f594d56 100644 --- a/block.c +++ b/block.c @@ -4679,6 +4679,9 @@ static void bdrv_aio_cancel_em(BlockDriverAIOCB *blockacb) { BlockDriverAIOCBSync *acb = container_of(blockacb, BlockDriverAIOCBSync, common); + + acb->ret = -ECANCELED; + acb->common.cb(acb->common.opaque, acb->ret); qemu_bh_delete(acb->bh); acb->bh = NULL; qemu_aio_release(acb); @@ -4686,7 +4689,7 @@ static void bdrv_aio_cancel_em(BlockDriverAIOCB *blockacb) static const AIOCBInfo bdrv_em_aiocb_info = { .aiocb_size = sizeof(BlockDriverAIOCBSync), - .cancel = bdrv_aio_cancel_em, + .cancel_async = bdrv_aio_cancel_em, }; static void bdrv_aio_bh_cb(void *opaque) -- 1.9.3