OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

linux-aio: drop return code from laio_io_unplug and ioq_submit 

These are unused.

Suggested-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-id: 1418305950-30924-5-git-send-email-pbonzini@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Paolo Bonzini 2014-12-11 14:52:29 +01:00 committed by Stefan Hajnoczi
parent 8455ce053a
commit de35464461
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
block/linux-aio.c
View File

@ -59,7 +59,7 @@ struct qemu_laio_state {
int event_max; 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) 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; 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; int ret, i, len;
struct qemu_laiocb *aiocb; 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)); } while (ret == len && !QSIMPLEQ_EMPTY(&s->io_q.pending));
s->io_q.blocked = (s->io_q.n > 0); s->io_q.blocked = (s->io_q.n > 0);
return ret;
} }
void laio_io_plug(BlockDriverState *bs, void *aio_ctx) 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++; 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; struct qemu_laio_state *s = aio_ctx;
int ret = 0;
assert(s->io_q.plugged > 0 || !unplug); assert(s->io_q.plugged > 0 || !unplug);
if (unplug && --s->io_q.plugged > 0) { if (unplug && --s->io_q.plugged > 0) {
return 0; return;
} }
if (!s->io_q.blocked && !QSIMPLEQ_EMPTY(&s->io_q.pending)) { 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, BlockAIOCB *laio_submit(BlockDriverState *bs, void *aio_ctx, int fd,

2
block/raw-aio.h
View File

@ -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_detach_aio_context(void *s, AioContext *old_context);
void laio_attach_aio_context(void *s, AioContext *new_context); void laio_attach_aio_context(void *s, AioContext *new_context);
void laio_io_plug(BlockDriverState *bs, void *aio_ctx); 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 #endif
#ifdef _WIN32 #ifdef _WIN32