mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement cancellation method for dma async I/O (Avi Kivity)

Browse Source 
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
This commit is contained in:
aliguori 2009-03-20 18:26:07 +00:00
parent c07a9008ac
commit 6512a2a710
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dma-helpers.c
View File

@ -10,6 +10,8 @@
#include "dma.h" #include "dma.h"
#include "block_int.h" #include "block_int.h"
static AIOPool dma_aio_pool;
void qemu_sglist_init(QEMUSGList *qsg, int alloc_hint) void qemu_sglist_init(QEMUSGList *qsg, int alloc_hint)
{ {
qsg->sg = qemu_malloc(alloc_hint * sizeof(ScatterGatherEntry)); qsg->sg = qemu_malloc(alloc_hint * sizeof(ScatterGatherEntry));
@ -126,7 +128,7 @@ static BlockDriverAIOCB *dma_bdrv_io(
DMABlockState *dbs = qemu_malloc(sizeof(*dbs)); DMABlockState *dbs = qemu_malloc(sizeof(*dbs));
dbs->bs = bs; 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->sg = sg;
dbs->sector_num = sector_num; dbs->sector_num = sector_num;
dbs->sg_cur_index = 0; 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); 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);
}

1
dma.h
View File

@ -37,5 +37,6 @@ BlockDriverAIOCB *dma_bdrv_read(BlockDriverState *bs,
BlockDriverAIOCB *dma_bdrv_write(BlockDriverState *bs, BlockDriverAIOCB *dma_bdrv_write(BlockDriverState *bs,
QEMUSGList *sg, uint64_t sector, QEMUSGList *sg, uint64_t sector,
BlockDriverCompletionFunc *cb, void *opaque); BlockDriverCompletionFunc *cb, void *opaque);
void dma_helper_init(void);
#endif #endif

1
vl.c
View File

@ -5515,6 +5515,7 @@ int main(int argc, char **argv, char **envp)
cpu_exec_init_all(tb_size * 1024 * 1024); cpu_exec_init_all(tb_size * 1024 * 1024);
bdrv_init(); bdrv_init();
dma_helper_init();
/* we always create the cdrom drive, even if no disk is there */ /* we always create the cdrom drive, even if no disk is there */