diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2009-10-26 13:03:08 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-10-30 08:39:34 -0500 |
| commit | 1e5b9d2fccb205ed8fc84fb38945b8fb3d225640 (patch) | |
| tree | ccaa3ebeb0fc662822124cb29fd1559f789694a3 /block | |
| parent | fa39472763229b335bd1f4b7c9ff8ec8455f98e5 (diff) | |
| download | qemu-1e5b9d2fccb205ed8fc84fb38945b8fb3d225640.tar.gz | |
Remove aio_ctx from paio_* interface
The context parameter in paio_submit isn't used anyway, so there is no reason
why block drivers should need to remember it. This also avoids passing a Linux
AIO context to paio_submit (which doesn't do any harm as long as the parameter
is unused, but it is highly confusing).
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/raw-posix-aio.h | 4 | ||||
| -rw-r--r-- | block/raw-posix.c | 10 |
2 files changed, 6 insertions, 8 deletions
diff --git a/block/raw-posix-aio.h b/block/raw-posix-aio.h index a2d4348ee2..dfc63b89f2 100644 --- a/block/raw-posix-aio.h +++ b/block/raw-posix-aio.h @@ -26,8 +26,8 @@ /* posix-aio-compat.c - thread pool based implementation */ -void *paio_init(void); -BlockDriverAIOCB *paio_submit(BlockDriverState *bs, void *aio_ctx, int fd, +int paio_init(void); +BlockDriverAIOCB *paio_submit(BlockDriverState *bs, int fd, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, BlockDriverCompletionFunc *cb, void *opaque, int type); BlockDriverAIOCB *paio_ioctl(BlockDriverState *bs, int fd, diff --git a/block/raw-posix.c b/block/raw-posix.c index 5547fb526f..f558976845 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -107,7 +107,6 @@ typedef struct BDRVRawState { int type; unsigned int lseek_err_cnt; int open_flags; - void *aio_ctx; #if defined(__linux__) /* linux floppy specific */ int64_t fd_open_time; @@ -117,6 +116,7 @@ typedef struct BDRVRawState { #endif #ifdef CONFIG_LINUX_AIO int use_aio; + void *aio_ctx; #endif uint8_t* aligned_buf; } BDRVRawState; @@ -185,8 +185,7 @@ static int raw_open_common(BlockDriverState *bs, const char *filename, } else #endif { - s->aio_ctx = paio_init(); - if (!s->aio_ctx) { + if (paio_init() < 0) { goto out_free_buf; } #ifdef CONFIG_LINUX_AIO @@ -558,7 +557,7 @@ static BlockDriverAIOCB *raw_aio_submit(BlockDriverState *bs, } } - return paio_submit(bs, s->aio_ctx, s->fd, sector_num, qiov, nb_sectors, + return paio_submit(bs, s->fd, sector_num, qiov, nb_sectors, cb, opaque, type); } @@ -586,8 +585,7 @@ static BlockDriverAIOCB *raw_aio_flush(BlockDriverState *bs, if (fd_open(bs) < 0) return NULL; - return paio_submit(bs, s->aio_ctx, s->fd, 0, NULL, 0, - cb, opaque, QEMU_AIO_FLUSH); + return paio_submit(bs, s->fd, 0, NULL, 0, cb, opaque, QEMU_AIO_FLUSH); } static void raw_close(BlockDriverState *bs) |