From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39301) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHt19-0002No-Na for qemu-devel@nongnu.org; Tue, 28 Jun 2016 09:25:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bHt15-0007u3-OX for qemu-devel@nongnu.org; Tue, 28 Jun 2016 09:25:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53733) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHt15-0007tz-It for qemu-devel@nongnu.org; Tue, 28 Jun 2016 09:25:27 -0400 From: Stefan Hajnoczi Date: Tue, 28 Jun 2016 14:23:24 +0100 Message-Id: <1467120211-26495-3-git-send-email-stefanha@redhat.com> In-Reply-To: <1467120211-26495-1-git-send-email-stefanha@redhat.com> References: <1467120211-26495-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 2/9] dma-helpers: dma_blk_io() cancel support List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Stefan Hajnoczi Attempting to cancel a dma_blk_io() request causes an abort(3): void bdrv_aio_cancel(BlockAIOCB *acb) { ... while (acb->refcnt > 1) { if (acb->aiocb_info->get_aio_context) { aio_poll(acb->aiocb_info->get_aio_context(acb), true); } else if (acb->bs) { aio_poll(bdrv_get_aio_context(acb->bs), true); } else { abort(); } } ... } This happens because DMAAIOCB->bs is NULL and dma_aiocb_info.get_aio_context() is also NULL. This patch trivially implements dma_aiocb_info.get_aio_context() by fetching the DMAAIOCB->ctx field. Signed-off-by: Stefan Hajnoczi Reviewed-by: Fam Zheng Message-id: 1466451417-27988-1-git-send-email-stefanha@redhat.com Signed-off-by: Stefan Hajnoczi --- dma-helpers.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dma-helpers.c b/dma-helpers.c index b521d84..9defc10 100644 --- a/dma-helpers.c +++ b/dma-helpers.c @@ -185,10 +185,17 @@ static void dma_aio_cancel(BlockAIOCB *acb) } } +static AioContext *dma_get_aio_context(BlockAIOCB *acb) +{ + DMAAIOCB *dbs = container_of(acb, DMAAIOCB, common); + + return dbs->ctx; +} static const AIOCBInfo dma_aiocb_info = { .aiocb_size = sizeof(DMAAIOCB), .cancel_async = dma_aio_cancel, + .get_aio_context = dma_get_aio_context, }; BlockAIOCB *dma_blk_io(AioContext *ctx, -- 2.7.4