aboutsummaryrefslogtreecommitdiff
path: root/dma-helpers.c
diff options
context:
space:
mode:
authoraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2009-03-20 18:26:07 +0000
committeraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2009-03-20 18:26:07 +0000
commit6512a2a7106480c19183d6466a6845bc9bdf6ec0 (patch)
treeb4daf0c207341fbad1316ed5c5128e836764c4e0 /dma-helpers.c
parentc07a9008ac6985cd5a15909c2b9977d982defc12 (diff)
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 <avi@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6872 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'dma-helpers.c')
-rw-r--r--dma-helpers.c15
1 files changed, 14 insertions, 1 deletions
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);
+}