[Qemu-devel] [PATCH 02/13] block: linux-aio: rename 'ctx' of qemu_laiocb as 'laio_state'

[Ming Lei]

So that it can be distinguished from the 'ctx' in qemu_laio_state.

Signed-off-by: Ming Lei <ming....@canonical.com>
---
 block/linux-aio.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/block/linux-aio.c b/block/linux-aio.c
index b9db28e..cf8691e 100644
--- a/block/linux-aio.c
+++ b/block/linux-aio.c
@@ -29,7 +29,7 @@
 
 struct qemu_laiocb {
     BlockAIOCB common;
-    struct qemu_laio_state *ctx;
+    struct qemu_laio_state *aio_state;
     struct iocb iocb;
     ssize_t ret;
     size_t nbytes;
@@ -169,7 +169,7 @@ static void laio_cancel(BlockAIOCB *blockacb)
     if (laiocb->ret != -EINPROGRESS) {
         return;
     }
-    ret = io_cancel(laiocb->ctx->ctx, &laiocb->iocb, &event);
+    ret = io_cancel(laiocb->aio_state->ctx, &laiocb->iocb, &event);
     laiocb->ret = -ECANCELED;
     if (ret != 0) {
         /* iocb is not cancelled, cb will be called by the event loop later */
@@ -179,7 +179,7 @@ static void laio_cancel(BlockAIOCB *blockacb)
     laiocb->common.cb(laiocb->common.opaque, laiocb->ret);
 
     /* check if there are requests in io queue */
-    qemu_laio_start_retry(laiocb->ctx);
+    qemu_laio_start_retry(laiocb->aio_state);
 }
 
 static const AIOCBInfo laio_aiocb_info = {
@@ -311,7 +311,7 @@ BlockAIOCB *laio_submit(BlockDriverState *bs, void 
*aio_ctx, int fd,
 
     laiocb = qemu_aio_get(&laio_aiocb_info, bs, cb, opaque);
     laiocb->nbytes = nb_sectors * 512;
-    laiocb->ctx = s;
+    laiocb->aio_state = s;
     laiocb->ret = -EINPROGRESS;
     laiocb->is_read = (type == QEMU_AIO_READ);
     laiocb->qiov = qiov;
-- 
1.7.9.5