[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [6871] Convert vectored aio emulation to use a dedicated po
From: |
Anthony Liguori |
Subject: |
[Qemu-devel] [6871] Convert vectored aio emulation to use a dedicated pool (Avi Kivity) |
Date: |
Fri, 20 Mar 2009 18:26:03 +0000 |
Revision: 6871
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6871
Author: aliguori
Date: 2009-03-20 18:26:03 +0000 (Fri, 20 Mar 2009)
Log Message:
-----------
Convert vectored aio emulation to use a dedicated pool (Avi Kivity)
This allows us to remove a hack in the vectored aio cancellation code.
Signed-off-by: Avi Kivity <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>
Modified Paths:
--------------
trunk/block.c
Modified: trunk/block.c
===================================================================
--- trunk/block.c 2009-03-20 18:25:59 UTC (rev 6870)
+++ trunk/block.c 2009-03-20 18:26:03 UTC (rev 6871)
@@ -47,6 +47,8 @@
#define SECTOR_BITS 9
#define SECTOR_SIZE (1 << SECTOR_BITS)
+static AIOPool vectored_aio_pool;
+
typedef struct BlockDriverAIOCBSync {
BlockDriverAIOCB common;
QEMUBH *bh;
@@ -1261,6 +1263,13 @@
BlockDriverAIOCB *this_aiocb;
} VectorTranslationState;
+static void bdrv_aio_cancel_vector(BlockDriverAIOCB *acb)
+{
+ VectorTranslationState *s = acb->opaque;
+
+ bdrv_aio_cancel(s->aiocb);
+}
+
static void bdrv_aio_rw_vector_cb(void *opaque, int ret)
{
VectorTranslationState *s = opaque;
@@ -1283,7 +1292,8 @@
{
VectorTranslationState *s = qemu_mallocz(sizeof(*s));
- BlockDriverAIOCB *aiocb = qemu_aio_get(bs, cb, opaque);
+ BlockDriverAIOCB *aiocb = qemu_aio_get_pool(&vectored_aio_pool, bs,
+ cb, opaque);
s->this_aiocb = aiocb;
s->iov = iov;
@@ -1372,11 +1382,6 @@
void bdrv_aio_cancel(BlockDriverAIOCB *acb)
{
- if (acb->cb == bdrv_aio_rw_vector_cb) {
- VectorTranslationState *s = acb->opaque;
- acb = s->aiocb;
- }
-
acb->pool->cancel(acb);
}
@@ -1478,6 +1483,9 @@
void bdrv_init(void)
{
+ aio_pool_init(&vectored_aio_pool, sizeof(BlockDriverAIOCB),
+ bdrv_aio_cancel_vector);
+
bdrv_register(&bdrv_raw);
bdrv_register(&bdrv_host_device);
#ifndef _WIN32
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [6871] Convert vectored aio emulation to use a dedicated pool (Avi Kivity),
Anthony Liguori <=