[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] Remove aio_ctx from paio_* interface
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH] Remove aio_ctx from paio_* interface |
Date: |
Mon, 26 Oct 2009 13:03:08 +0100 |
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 <address@hidden>
---
To be applied on top of the bdrv_read/write emulation fix.
block/raw-posix-aio.h | 4 ++--
block/raw-posix.c | 10 ++++------
posix-aio-compat.c | 11 +++++------
3 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/block/raw-posix-aio.h b/block/raw-posix-aio.h
index a2d4348..dfc63b8 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 20b37a7..f396247 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;
@@ -181,8 +181,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
@@ -554,7 +553,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);
}
@@ -582,8 +581,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)
diff --git a/posix-aio-compat.c b/posix-aio-compat.c
index ec58288..7f391c9 100644
--- a/posix-aio-compat.c
+++ b/posix-aio-compat.c
@@ -556,7 +556,7 @@ static AIOPool raw_aio_pool = {
.cancel = paio_cancel,
};
-BlockDriverAIOCB *paio_submit(BlockDriverState *bs, void *aio_ctx, int fd,
+BlockDriverAIOCB *paio_submit(BlockDriverState *bs, int fd,
int64_t sector_num, QEMUIOVector *qiov, int nb_sectors,
BlockDriverCompletionFunc *cb, void *opaque, int type)
{
@@ -607,7 +607,7 @@ BlockDriverAIOCB *paio_ioctl(BlockDriverState *bs, int fd,
return &acb->common;
}
-void *paio_init(void)
+int paio_init(void)
{
struct sigaction act;
PosixAioState *s;
@@ -615,7 +615,7 @@ void *paio_init(void)
int ret;
if (posix_aio_state)
- return posix_aio_state;
+ return 0;
s = qemu_malloc(sizeof(PosixAioState));
@@ -627,7 +627,7 @@ void *paio_init(void)
s->first_aio = NULL;
if (pipe(fds) == -1) {
fprintf(stderr, "failed to create pipe\n");
- return NULL;
+ return -1;
}
s->rfd = fds[0];
@@ -650,6 +650,5 @@ void *paio_init(void)
QTAILQ_INIT(&request_list);
posix_aio_state = s;
-
- return posix_aio_state;
+ return 0;
}
--
1.6.2.5
- [Qemu-devel] [PATCH] Remove aio_ctx from paio_* interface,
Kevin Wolf <=