diff options
Diffstat (limited to 'block')
| -rw-r--r-- | block/linux-aio.c | 15 | ||||
| -rw-r--r-- | block/raw-aio.h | 2 |
2 files changed, 6 insertions, 11 deletions
diff --git a/block/linux-aio.c b/block/linux-aio.c index b223d9e3d9..8474378fc2 100644 --- a/block/linux-aio.c +++ b/block/linux-aio.c @@ -59,7 +59,7 @@ struct qemu_laio_state { int event_max; }; -static int ioq_submit(struct qemu_laio_state *s); +static void ioq_submit(struct qemu_laio_state *s); static inline ssize_t io_event_ret(struct io_event *ev) { @@ -184,7 +184,7 @@ static void ioq_init(LaioQueue *io_q) io_q->blocked = false; } -static int ioq_submit(struct qemu_laio_state *s) +static void ioq_submit(struct qemu_laio_state *s) { int ret, i, len; struct qemu_laiocb *aiocb; @@ -213,8 +213,6 @@ static int ioq_submit(struct qemu_laio_state *s) } } while (ret == len && !QSIMPLEQ_EMPTY(&s->io_q.pending)); s->io_q.blocked = (s->io_q.n > 0); - - return ret; } void laio_io_plug(BlockDriverState *bs, void *aio_ctx) @@ -224,22 +222,19 @@ void laio_io_plug(BlockDriverState *bs, void *aio_ctx) s->io_q.plugged++; } -int laio_io_unplug(BlockDriverState *bs, void *aio_ctx, bool unplug) +void laio_io_unplug(BlockDriverState *bs, void *aio_ctx, bool unplug) { struct qemu_laio_state *s = aio_ctx; - int ret = 0; assert(s->io_q.plugged > 0 || !unplug); if (unplug && --s->io_q.plugged > 0) { - return 0; + return; } if (!s->io_q.blocked && !QSIMPLEQ_EMPTY(&s->io_q.pending)) { - ret = ioq_submit(s); + ioq_submit(s); } - - return ret; } BlockAIOCB *laio_submit(BlockDriverState *bs, void *aio_ctx, int fd, diff --git a/block/raw-aio.h b/block/raw-aio.h index 80681ce175..31d791fe67 100644 --- a/block/raw-aio.h +++ b/block/raw-aio.h @@ -41,7 +41,7 @@ BlockAIOCB *laio_submit(BlockDriverState *bs, void *aio_ctx, int fd, void laio_detach_aio_context(void *s, AioContext *old_context); void laio_attach_aio_context(void *s, AioContext *new_context); void laio_io_plug(BlockDriverState *bs, void *aio_ctx); -int laio_io_unplug(BlockDriverState *bs, void *aio_ctx, bool unplug); +void laio_io_unplug(BlockDriverState *bs, void *aio_ctx, bool unplug); #endif #ifdef _WIN32 |