From 6512a2a7106480c19183d6466a6845bc9bdf6ec0 Mon Sep 17 00:00:00 2001 From: aliguori Date: Fri, 20 Mar 2009 18:26:07 +0000 Subject: [PATCH] Implement cancellation method for dma async I/O (Avi Kivity) Move the dma helpers to a private aio pool, and implement a cancellation method for them. Should prevent issues when cancelling I/O while dma is in progress. Signed-off-by: Avi Kivity Signed-off-by: Anthony Liguori git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6872 c046a42c-6fe2-441c-8c8c-71466251a162 --- dma-helpers.c | 15 ++++++++++++++- dma.h | 1 + vl.c | 1 + 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dma-helpers.c b/dma-helpers.c index b2ade19acb..19fa4f01fd 100644 --- a/dma-helpers.c +++ b/dma-helpers.c @@ -10,6 +10,8 @@ #include "dma.h" #include "block_int.h" +static AIOPool dma_aio_pool; + void qemu_sglist_init(QEMUSGList *qsg, int alloc_hint) { qsg->sg = qemu_malloc(alloc_hint * sizeof(ScatterGatherEntry)); @@ -126,7 +128,7 @@ static BlockDriverAIOCB *dma_bdrv_io( DMABlockState *dbs = qemu_malloc(sizeof(*dbs)); dbs->bs = bs; - dbs->acb = qemu_aio_get(bs, cb, opaque); + dbs->acb = qemu_aio_get_pool(&dma_aio_pool, bs, cb, opaque); dbs->sg = sg; dbs->sector_num = sector_num; dbs->sg_cur_index = 0; @@ -153,3 +155,14 @@ BlockDriverAIOCB *dma_bdrv_write(BlockDriverState *bs, return dma_bdrv_io(bs, sg, sector, cb, opaque, 1); } +static void dma_aio_cancel(BlockDriverAIOCB *acb) +{ + DMABlockState *dbs = (DMABlockState *)acb->opaque; + + bdrv_aio_cancel(dbs->acb); +} + +void dma_helper_init(void) +{ + aio_pool_init(&dma_aio_pool, sizeof(BlockDriverAIOCB), dma_aio_cancel); +} diff --git a/dma.h b/dma.h index d596717f14..7d2ab45b02 100644 --- a/dma.h +++ b/dma.h @@ -37,5 +37,6 @@ BlockDriverAIOCB *dma_bdrv_read(BlockDriverState *bs, BlockDriverAIOCB *dma_bdrv_write(BlockDriverState *bs, QEMUSGList *sg, uint64_t sector, BlockDriverCompletionFunc *cb, void *opaque); +void dma_helper_init(void); #endif diff --git a/vl.c b/vl.c index b62a2d4378..abc7f5d0e8 100644 --- a/vl.c +++ b/vl.c @@ -5515,6 +5515,7 @@ int main(int argc, char **argv, char **envp) cpu_exec_init_all(tb_size * 1024 * 1024); bdrv_init(); + dma_helper_init(); /* we always create the cdrom drive, even if no disk is there */