[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 08/22] dma: Convert dma_aiocb_info.cancel to .can
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH v6 08/22] dma: Convert dma_aiocb_info.cancel to .cancel_async |
Date: |
Thu, 11 Sep 2014 13:41:14 +0800 |
Just forward the request to bdrv_aio_cancel_async.
Signed-off-by: Fam Zheng <address@hidden>
---
dma-helpers.c | 20 ++++----------------
1 file changed, 4 insertions(+), 16 deletions(-)
diff --git a/dma-helpers.c b/dma-helpers.c
index 499b52b..5a46e5c 100644
--- a/dma-helpers.c
+++ b/dma-helpers.c
@@ -73,7 +73,6 @@ typedef struct {
QEMUSGList *sg;
uint64_t sector_num;
DMADirection dir;
- bool in_cancel;
int sg_cur_index;
dma_addr_t sg_cur_byte;
QEMUIOVector iov;
@@ -125,12 +124,7 @@ static void dma_complete(DMAAIOCB *dbs, int ret)
qemu_bh_delete(dbs->bh);
dbs->bh = NULL;
}
- if (!dbs->in_cancel) {
- /* Requests may complete while dma_aio_cancel is in progress. In
- * this case, the AIOCB should not be released because it is still
- * referenced by dma_aio_cancel. */
- qemu_aio_release(dbs);
- }
+ qemu_aio_release(dbs);
}
static void dma_bdrv_cb(void *opaque, int ret)
@@ -186,19 +180,14 @@ static void dma_aio_cancel(BlockDriverAIOCB *acb)
trace_dma_aio_cancel(dbs);
if (dbs->acb) {
- BlockDriverAIOCB *acb = dbs->acb;
- dbs->acb = NULL;
- dbs->in_cancel = true;
- bdrv_aio_cancel(acb);
- dbs->in_cancel = false;
+ bdrv_aio_cancel_async(dbs->acb);
}
- dbs->common.cb = NULL;
- dma_complete(dbs, 0);
}
+
static const AIOCBInfo dma_aiocb_info = {
.aiocb_size = sizeof(DMAAIOCB),
- .cancel = dma_aio_cancel,
+ .cancel_async = dma_aio_cancel,
};
BlockDriverAIOCB *dma_bdrv_io(
@@ -217,7 +206,6 @@ BlockDriverAIOCB *dma_bdrv_io(
dbs->sg_cur_index = 0;
dbs->sg_cur_byte = 0;
dbs->dir = dir;
- dbs->in_cancel = false;
dbs->io_func = io_func;
dbs->bh = NULL;
qemu_iovec_init(&dbs->iov, sg->nsg);
--
1.9.3
- [Qemu-devel] [PATCH v6 00/22] block: Asynchronous request cancellation, Fam Zheng, 2014/09/11
- [Qemu-devel] [PATCH v6 01/22] ide/ahci: Check for -ECANCELED in aio callbacks, Fam Zheng, 2014/09/11
- [Qemu-devel] [PATCH v6 02/22] block: Add refcnt in BlockDriverAIOCB, Fam Zheng, 2014/09/11
- [Qemu-devel] [PATCH v6 03/22] block: Add bdrv_aio_cancel_async, Fam Zheng, 2014/09/11
- [Qemu-devel] [PATCH v6 04/22] block: Drop bdrv_em_co_aiocb_info.cancel, Fam Zheng, 2014/09/11
- [Qemu-devel] [PATCH v6 05/22] block: Drop bdrv_em_aiocb_info.cancel, Fam Zheng, 2014/09/11
- [Qemu-devel] [PATCH v6 06/22] thread-pool: Convert thread_pool_aiocb_info.cancel to cancel_async, Fam Zheng, 2014/09/11
- [Qemu-devel] [PATCH v6 07/22] linux-aio: Convert laio_aiocb_info.cancel to .cancel_async, Fam Zheng, 2014/09/11
- [Qemu-devel] [PATCH v6 08/22] dma: Convert dma_aiocb_info.cancel to .cancel_async,
Fam Zheng <=
- [Qemu-devel] [PATCH v6 09/22] iscsi: Convert iscsi_aiocb_info.cancel to .cancel_async, Fam Zheng, 2014/09/11
- [Qemu-devel] [PATCH v6 10/22] archipelago: Drop archipelago_aiocb_info.cancel, Fam Zheng, 2014/09/11
- [Qemu-devel] [PATCH v6 11/22] blkdebug: Drop blkdebug_aiocb_info.cancel, Fam Zheng, 2014/09/11
- [Qemu-devel] [PATCH v6 12/22] blkverify: Drop blkverify_aiocb_info.cancel, Fam Zheng, 2014/09/11
- [Qemu-devel] [PATCH v6 13/22] curl: Drop curl_aiocb_info.cancel, Fam Zheng, 2014/09/11
- [Qemu-devel] [PATCH v6 14/22] qed: Drop qed_aiocb_info.cancel, Fam Zheng, 2014/09/11
- [Qemu-devel] [PATCH v6 15/22] quorum: fix quorum_aio_cancel(), Fam Zheng, 2014/09/11
- [Qemu-devel] [PATCH v6 16/22] quorum: Convert quorum_aiocb_info.cancel to .cancel_async, Fam Zheng, 2014/09/11
- [Qemu-devel] [PATCH v6 17/22] rbd: Drop rbd_aiocb_info.cancel, Fam Zheng, 2014/09/11