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

linux-aio: rename LaioQueue idx field to "n" 

It does not identify an index in an array anymore.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-id: 1418305950-30924-4-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:28 +01:00 committed by Stefan Hajnoczi
parent 43f2376e09
commit 8455ce053a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
block/linux-aio.c
View File

@ -40,7 +40,7 @@ struct qemu_laiocb {
typedef struct { typedef struct {
int plugged; int plugged;
unsigned int idx; unsigned int n;
bool blocked; bool blocked;
QSIMPLEQ_HEAD(, qemu_laiocb) pending; QSIMPLEQ_HEAD(, qemu_laiocb) pending;
} LaioQueue; } LaioQueue;
@ -180,7 +180,7 @@ static void ioq_init(LaioQueue *io_q)
{ {
QSIMPLEQ_INIT(&io_q->pending); QSIMPLEQ_INIT(&io_q->pending);
io_q->plugged = 0; io_q->plugged = 0;
io_q->idx = 0; io_q->n = 0;
io_q->blocked = false; io_q->blocked = false;
} }
@ -208,11 +208,11 @@ static int ioq_submit(struct qemu_laio_state *s)
} }
for (i = 0; i < ret; i++) { for (i = 0; i < ret; i++) {
s->io_q.idx--; s->io_q.n--;
QSIMPLEQ_REMOVE_HEAD(&s->io_q.pending, next); QSIMPLEQ_REMOVE_HEAD(&s->io_q.pending, next);
} }
} 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.idx > 0); s->io_q.blocked = (s->io_q.n > 0);
return ret; return ret;
} }
@ -276,9 +276,9 @@ BlockAIOCB *laio_submit(BlockDriverState *bs, void *aio_ctx, int fd,
io_set_eventfd(&laiocb->iocb, event_notifier_get_fd(&s->e)); io_set_eventfd(&laiocb->iocb, event_notifier_get_fd(&s->e));
QSIMPLEQ_INSERT_TAIL(&s->io_q.pending, laiocb, next); QSIMPLEQ_INSERT_TAIL(&s->io_q.pending, laiocb, next);
s->io_q.idx++; s->io_q.n++;
if (!s->io_q.blocked && if (!s->io_q.blocked &&
(!s->io_q.plugged || s->io_q.idx >= MAX_QUEUED_IO)) { (!s->io_q.plugged || s->io_q.n >= MAX_QUEUED_IO)) {
ioq_submit(s); ioq_submit(s);
} }
return &laiocb->common; return &laiocb->common;