aboutsummaryrefslogtreecommitdiff
path: root/block/null.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2014-10-07 13:59:14 +0200
committerKevin Wolf <kwolf@redhat.com>2014-10-20 13:41:27 +0200
commit7c84b1b8310cd634825c77d45b4db89bb44c5cee (patch)
tree4fc5f70d87acefb337144bad5df4326a06e269c5 /block/null.c
parentfa1d36df7466ebbef0331b79d0ce3c5e140695c9 (diff)
block: Rename BlockDriverAIOCB* to BlockAIOCB*
I'll use BlockDriverAIOCB with block backends shortly, and the name is going to fit badly there. It's a block layer thing anyway, not just a block driver thing. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Max Reitz <mreitz@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block/null.c')
-rw-r--r--block/null.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/block/null.c b/block/null.c
index 828441999c..e9547d785a 100644
--- a/block/null.c
+++ b/block/null.c
@@ -78,7 +78,7 @@ static coroutine_fn int null_co_flush(BlockDriverState *bs)
}
typedef struct {
- BlockDriverAIOCB common;
+ BlockAIOCB common;
QEMUBH *bh;
} NullAIOCB;
@@ -94,9 +94,9 @@ static void null_bh_cb(void *opaque)
qemu_aio_unref(acb);
}
-static inline BlockDriverAIOCB *null_aio_common(BlockDriverState *bs,
- BlockDriverCompletionFunc *cb,
- void *opaque)
+static inline BlockAIOCB *null_aio_common(BlockDriverState *bs,
+ BlockDriverCompletionFunc *cb,
+ void *opaque)
{
NullAIOCB *acb;
@@ -106,27 +106,27 @@ static inline BlockDriverAIOCB *null_aio_common(BlockDriverState *bs,
return &acb->common;
}
-static BlockDriverAIOCB *null_aio_readv(BlockDriverState *bs,
- int64_t sector_num, QEMUIOVector *qiov,
- int nb_sectors,
- BlockDriverCompletionFunc *cb,
- void *opaque)
+static BlockAIOCB *null_aio_readv(BlockDriverState *bs,
+ int64_t sector_num, QEMUIOVector *qiov,
+ int nb_sectors,
+ BlockDriverCompletionFunc *cb,
+ void *opaque)
{
return null_aio_common(bs, cb, opaque);
}
-static BlockDriverAIOCB *null_aio_writev(BlockDriverState *bs,
- int64_t sector_num, QEMUIOVector *qiov,
- int nb_sectors,
- BlockDriverCompletionFunc *cb,
- void *opaque)
+static BlockAIOCB *null_aio_writev(BlockDriverState *bs,
+ int64_t sector_num, QEMUIOVector *qiov,
+ int nb_sectors,
+ BlockDriverCompletionFunc *cb,
+ void *opaque)
{
return null_aio_common(bs, cb, opaque);
}
-static BlockDriverAIOCB *null_aio_flush(BlockDriverState *bs,
- BlockDriverCompletionFunc *cb,
- void *opaque)
+static BlockAIOCB *null_aio_flush(BlockDriverState *bs,
+ BlockDriverCompletionFunc *cb,
+ void *opaque)
{
return null_aio_common(bs, cb, opaque);
}