|
 |
5517497 |
From 3b92e958482155404cfd134a9608041eed69622a Mon Sep 17 00:00:00 2001
|
|
|
5517497 |
From: Avi Kivity <avi@redhat.com>
|
|
|
5517497 |
Date: Fri, 20 Mar 2009 18:26:12 +0000
|
|
|
5517497 |
Subject: [STABLE][PATCH 1/4] Use vectored aiocb storage to store vector translation state
|
|
|
5517497 |
|
|
|
5517497 |
Now that we have a dedicated acb pool for vector translation acbs, we can
|
|
|
5517497 |
store the vector translation state in the acbs instead of in an external
|
|
|
5517497 |
structure.
|
|
|
5517497 |
|
|
|
5517497 |
Signed-off-by: Avi Kivity <avi@redhat.com>
|
|
|
5517497 |
|
|
|
5517497 |
---
|
|
|
5517497 |
block.c | 29 ++++++++++++++---------------
|
|
|
5517497 |
1 files changed, 14 insertions(+), 15 deletions(-)
|
|
|
5517497 |
|
|
|
5517497 |
diff --git a/block.c b/block.c
|
|
|
5517497 |
index b12318f..689ea37 100644
|
|
|
5517497 |
--- a/block.c
|
|
|
5517497 |
+++ b/block.c
|
|
|
5517497 |
@@ -1332,31 +1332,32 @@ char *bdrv_snapshot_dump(char *buf, int buf_size, QEMUSnapshotInfo *sn)
|
|
|
5517497 |
/**************************************************************/
|
|
|
5517497 |
/* async I/Os */
|
|
|
5517497 |
|
|
|
5517497 |
-typedef struct VectorTranslationState {
|
|
|
5517497 |
+typedef struct VectorTranslationAIOCB {
|
|
|
5517497 |
+ BlockDriverAIOCB common;
|
|
|
5517497 |
QEMUIOVector *iov;
|
|
|
5517497 |
uint8_t *bounce;
|
|
|
5517497 |
int is_write;
|
|
|
5517497 |
BlockDriverAIOCB *aiocb;
|
|
|
5517497 |
- BlockDriverAIOCB *this_aiocb;
|
|
|
5517497 |
-} VectorTranslationState;
|
|
|
5517497 |
+} VectorTranslationAIOCB;
|
|
|
5517497 |
|
|
|
5517497 |
-static void bdrv_aio_cancel_vector(BlockDriverAIOCB *acb)
|
|
|
5517497 |
+static void bdrv_aio_cancel_vector(BlockDriverAIOCB *_acb)
|
|
|
5517497 |
{
|
|
|
5517497 |
- VectorTranslationState *s = acb->opaque;
|
|
|
5517497 |
+ VectorTranslationAIOCB *acb
|
|
|
5517497 |
+ = container_of(_acb, VectorTranslationAIOCB, common);
|
|
|
5517497 |
|
|
|
5517497 |
- bdrv_aio_cancel(s->aiocb);
|
|
|
5517497 |
+ bdrv_aio_cancel(acb->aiocb);
|
|
|
5517497 |
}
|
|
|
5517497 |
|
|
|
5517497 |
static void bdrv_aio_rw_vector_cb(void *opaque, int ret)
|
|
|
5517497 |
{
|
|
|
5517497 |
- VectorTranslationState *s = opaque;
|
|
|
5517497 |
+ VectorTranslationAIOCB *s = (VectorTranslationAIOCB *)opaque;
|
|
|
5517497 |
|
|
|
5517497 |
if (!s->is_write) {
|
|
|
5517497 |
qemu_iovec_from_buffer(s->iov, s->bounce, s->iov->size);
|
|
|
5517497 |
}
|
|
|
5517497 |
qemu_vfree(s->bounce);
|
|
|
5517497 |
- s->this_aiocb->cb(s->this_aiocb->opaque, ret);
|
|
|
5517497 |
- qemu_aio_release(s->this_aiocb);
|
|
|
5517497 |
+ s->common.cb(s->common.opaque, ret);
|
|
|
5517497 |
+ qemu_aio_release(s);
|
|
|
5517497 |
}
|
|
|
5517497 |
|
|
|
5517497 |
static BlockDriverAIOCB *bdrv_aio_rw_vector(BlockDriverState *bs,
|
|
|
5517497 |
@@ -1368,11 +1369,9 @@ static BlockDriverAIOCB *bdrv_aio_rw_vector(BlockDriverState *bs,
|
|
|
5517497 |
int is_write)
|
|
|
5517497 |
|
|
|
5517497 |
{
|
|
|
5517497 |
- VectorTranslationState *s = qemu_mallocz(sizeof(*s));
|
|
|
5517497 |
- BlockDriverAIOCB *aiocb = qemu_aio_get_pool(&vectored_aio_pool, bs,
|
|
|
5517497 |
- cb, opaque);
|
|
|
5517497 |
+ VectorTranslationAIOCB *s = qemu_aio_get_pool(&vectored_aio_pool, bs,
|
|
|
5517497 |
+ cb, opaque);
|
|
|
5517497 |
|
|
|
5517497 |
- s->this_aiocb = aiocb;
|
|
|
5517497 |
s->iov = iov;
|
|
|
5517497 |
s->bounce = qemu_memalign(512, nb_sectors * 512);
|
|
|
5517497 |
s->is_write = is_write;
|
|
|
5517497 |
@@ -1384,7 +1383,7 @@ static BlockDriverAIOCB *bdrv_aio_rw_vector(BlockDriverState *bs,
|
|
|
5517497 |
s->aiocb = bdrv_aio_read(bs, sector_num, s->bounce, nb_sectors,
|
|
|
5517497 |
bdrv_aio_rw_vector_cb, s);
|
|
|
5517497 |
}
|
|
|
5517497 |
- return aiocb;
|
|
|
5517497 |
+ return &s->common;
|
|
|
5517497 |
}
|
|
|
5517497 |
|
|
|
5517497 |
BlockDriverAIOCB *bdrv_aio_readv(BlockDriverState *bs, int64_t sector_num,
|
|
|
5517497 |
@@ -1560,7 +1559,7 @@ static int bdrv_write_em(BlockDriverState *bs, int64_t sector_num,
|
|
|
5517497 |
|
|
|
5517497 |
void bdrv_init(void)
|
|
|
5517497 |
{
|
|
|
5517497 |
- aio_pool_init(&vectored_aio_pool, sizeof(BlockDriverAIOCB),
|
|
|
5517497 |
+ aio_pool_init(&vectored_aio_pool, sizeof(VectorTranslationAIOCB),
|
|
|
5517497 |
bdrv_aio_cancel_vector);
|
|
|
5517497 |
|
|
|
5517497 |
bdrv_register(&bdrv_raw);
|
|
|
5517497 |
--
|
|
|
5517497 |
1.6.0.6
|
|
|
5517497 |
|