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
This commit is contained in:
parent
c07a9008ac
commit
6512a2a710
@ -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);
|
||||
}
|
||||
|
1
dma.h
1
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
|
||||
|
Loading…
Reference in New Issue
Block a user