ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

block/linux-aio: drop qemu_laio_completion_cb() 

.io_flush() is no longer called so drop qemu_laio_completion_cb().  It
turns out that count is now unused so drop that too.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2013-04-11 17:12:33 +02:00
parent 70ecdc6e4e
commit 94473d0c06
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
block/linux-aio.c
View File

@ -39,7 +39,6 @@ struct qemu_laiocb {
struct qemu_laio_state { struct qemu_laio_state {
io_context_t ctx; io_context_t ctx;
EventNotifier e; EventNotifier e;
int count;
}; };
static inline ssize_t io_event_ret(struct io_event *ev) static inline ssize_t io_event_ret(struct io_event *ev)
@ -55,8 +54,6 @@ static void qemu_laio_process_completion(struct qemu_laio_state *s,
{ {
int ret; int ret;
s->count--;
ret = laiocb->ret; ret = laiocb->ret;
if (ret != -ECANCELED) { if (ret != -ECANCELED) {
if (ret == laiocb->nbytes) { if (ret == laiocb->nbytes) {
@ -101,13 +98,6 @@ static void qemu_laio_completion_cb(EventNotifier *e)
} }
} }
static int qemu_laio_flush_cb(EventNotifier *e)
{
struct qemu_laio_state *s = container_of(e, struct qemu_laio_state, e);
return (s->count > 0) ? 1 : 0;
}
static void laio_cancel(BlockDriverAIOCB *blockacb) static void laio_cancel(BlockDriverAIOCB *blockacb)
{ {
struct qemu_laiocb *laiocb = (struct qemu_laiocb *)blockacb; struct qemu_laiocb *laiocb = (struct qemu_laiocb *)blockacb;
@ -177,14 +167,11 @@ BlockDriverAIOCB *laio_submit(BlockDriverState *bs, void *aio_ctx, int fd,
goto out_free_aiocb; goto out_free_aiocb;
} }
io_set_eventfd(&laiocb->iocb, event_notifier_get_fd(&s->e)); io_set_eventfd(&laiocb->iocb, event_notifier_get_fd(&s->e));
s->count++;
if (io_submit(s->ctx, 1, &iocbs) < 0) if (io_submit(s->ctx, 1, &iocbs) < 0)
goto out_dec_count; goto out_free_aiocb;
return &laiocb->common; return &laiocb->common;
out_dec_count:
s->count--;
out_free_aiocb: out_free_aiocb:
qemu_aio_release(laiocb); qemu_aio_release(laiocb);
return NULL; return NULL;
@ -204,7 +191,7 @@ void *laio_init(void)
} }
qemu_aio_set_event_notifier(&s->e, qemu_laio_completion_cb, qemu_aio_set_event_notifier(&s->e, qemu_laio_completion_cb,
qemu_laio_flush_cb); NULL);
return s; return s;