Skip to content

Commit

Permalink
linux-aio: drop return code from laio_io_unplug and ioq_submit
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
bonzini authored and stefanhaRH committed Dec 12, 2014
1 parent 8455ce0 commit de35464
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 11 deletions.
15 changes: 5 additions & 10 deletions block/linux-aio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion block/raw-aio.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit de35464

Please sign in to comment.