aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2009-03-20 18:26:07 +0000
committerAnthony Liguori <aliguori@us.ibm.com>2009-05-01 11:06:12 -0500
commita2b8ec7d7d48ec85a44dbbd537cba448edb50eb7 (patch)
treefc706aca255ff545ea97794015674b5f8c8d8788
parenta95ad7bcbb66fcce022d010f8614905fd24f00a4 (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
-rw-r--r--dma-helpers.c15
-rw-r--r--dma.h1
-rw-r--r--vl.c1
3 files changed, 16 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);
+}
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 62af5387da..ca4255a86a 100644
--- a/vl.c
+++ b/vl.c
@@ -5485,6 +5485,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 */