commit fce991b23724752081f653dc49fd6769f729ba74
Author: aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Fri Mar 20 18:26:07 2009 +0000
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@xxxxxxxxxx>
Signed-off-by: Anthony Liguori <aliguori@xxxxxxxxxx>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6872
c046a42c-6fe2-441c-8c8c-71466251a162
(cherry picked from commit 6512a2a7106480c19183d6466a6845bc9bdf6ec0)
(cherry picked from commit 798e5374e78fe11dc8d1993b2318756f222878dd)
---
dma-helpers.c | 15 ++++++++++++++-
dma.h | 1 +
vl.c | 1 +
3 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/dma-helpers.c b/dma-helpers.c
index 0523dc8..a6b129d 100644
--- a/dma-helpers.c
+++ b/dma-helpers.c
@@ -11,6 +11,8 @@
#include "block_int.h"
#include "cache-utils.h"
+static AIOPool dma_aio_pool;
+
void qemu_sglist_init(QEMUSGList *qsg, int alloc_hint)
{
qsg->sg = qemu_malloc(alloc_hint * sizeof(ScatterGatherEntry));
@@ -127,7 +129,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;
@@ -167,3 +169,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 d596717..7d2ab45 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 476d36b..c837d7b 100644
--- a/vl.c
+++ b/vl.c
@@ -5708,6 +5708,7 @@ int main(int argc, char **argv, char **envp)
cpu_exec_init_all(tb_size * 1024 * 1024);
bdrv_init();
+ dma_helper_init();
xc_handle = xc_interface_open();
#ifdef CONFIG_STUBDOM
--
generated by git-patchbot for /home/xen/git/qemu-xen-3.4-testing.git
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home