diff options
Diffstat (limited to 'block')
| -rw-r--r-- | block/archipelago.c | 8 | ||||
| -rw-r--r-- | block/backup.c | 2 | ||||
| -rw-r--r-- | block/blkdebug.c | 8 | ||||
| -rw-r--r-- | block/blkverify.c | 8 | ||||
| -rw-r--r-- | block/commit.c | 2 | ||||
| -rw-r--r-- | block/curl.c | 2 | ||||
| -rw-r--r-- | block/iscsi.c | 2 | ||||
| -rw-r--r-- | block/linux-aio.c | 2 | ||||
| -rw-r--r-- | block/mirror.c | 6 | ||||
| -rw-r--r-- | block/null.c | 8 | ||||
| -rw-r--r-- | block/qed-gencb.c | 4 | ||||
| -rw-r--r-- | block/qed-table.c | 10 | ||||
| -rw-r--r-- | block/qed.c | 18 | ||||
| -rw-r--r-- | block/qed.h | 10 | ||||
| -rw-r--r-- | block/quorum.c | 6 | ||||
| -rw-r--r-- | block/raw-aio.h | 4 | ||||
| -rw-r--r-- | block/raw-posix.c | 16 | ||||
| -rw-r--r-- | block/raw-win32.c | 8 | ||||
| -rw-r--r-- | block/raw_bsd.c | 2 | ||||
| -rw-r--r-- | block/rbd.c | 10 | ||||
| -rw-r--r-- | block/stream.c | 2 | ||||
| -rw-r--r-- | block/win32-aio.c | 2 |
22 files changed, 70 insertions, 70 deletions
diff --git a/block/archipelago.c b/block/archipelago.c index 4c468aaf04..a8114b528b 100644 --- a/block/archipelago.c +++ b/block/archipelago.c @@ -860,7 +860,7 @@ static BlockAIOCB *qemu_archipelago_aio_rw(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, - BlockDriverCompletionFunc *cb, + BlockCompletionFunc *cb, void *opaque, int op) { @@ -896,7 +896,7 @@ err_exit: static BlockAIOCB *qemu_archipelago_aio_readv(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, - BlockDriverCompletionFunc *cb, void *opaque) + BlockCompletionFunc *cb, void *opaque) { return qemu_archipelago_aio_rw(bs, sector_num, qiov, nb_sectors, cb, opaque, ARCHIP_OP_READ); @@ -904,7 +904,7 @@ static BlockAIOCB *qemu_archipelago_aio_readv(BlockDriverState *bs, static BlockAIOCB *qemu_archipelago_aio_writev(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, - BlockDriverCompletionFunc *cb, void *opaque) + BlockCompletionFunc *cb, void *opaque) { return qemu_archipelago_aio_rw(bs, sector_num, qiov, nb_sectors, cb, opaque, ARCHIP_OP_WRITE); @@ -1053,7 +1053,7 @@ static QemuOptsList qemu_archipelago_create_opts = { }; static BlockAIOCB *qemu_archipelago_aio_flush(BlockDriverState *bs, - BlockDriverCompletionFunc *cb, void *opaque) + BlockCompletionFunc *cb, void *opaque) { return qemu_archipelago_aio_rw(bs, 0, NULL, 0, cb, opaque, ARCHIP_OP_FLUSH); diff --git a/block/backup.c b/block/backup.c index d0b02255ce..e334740161 100644 --- a/block/backup.c +++ b/block/backup.c @@ -353,7 +353,7 @@ void backup_start(BlockDriverState *bs, BlockDriverState *target, int64_t speed, MirrorSyncMode sync_mode, BlockdevOnError on_source_error, BlockdevOnError on_target_error, - BlockDriverCompletionFunc *cb, void *opaque, + BlockCompletionFunc *cb, void *opaque, Error **errp) { int64_t len; diff --git a/block/blkdebug.c b/block/blkdebug.c index f6291407f2..e046b920fb 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -464,7 +464,7 @@ static void error_callback_bh(void *opaque) } static BlockAIOCB *inject_error(BlockDriverState *bs, - BlockDriverCompletionFunc *cb, void *opaque, BlkdebugRule *rule) + BlockCompletionFunc *cb, void *opaque, BlkdebugRule *rule) { BDRVBlkdebugState *s = bs->opaque; int error = rule->options.inject.error; @@ -491,7 +491,7 @@ static BlockAIOCB *inject_error(BlockDriverState *bs, static BlockAIOCB *blkdebug_aio_readv(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, - BlockDriverCompletionFunc *cb, void *opaque) + BlockCompletionFunc *cb, void *opaque) { BDRVBlkdebugState *s = bs->opaque; BlkdebugRule *rule = NULL; @@ -513,7 +513,7 @@ static BlockAIOCB *blkdebug_aio_readv(BlockDriverState *bs, static BlockAIOCB *blkdebug_aio_writev(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, - BlockDriverCompletionFunc *cb, void *opaque) + BlockCompletionFunc *cb, void *opaque) { BDRVBlkdebugState *s = bs->opaque; BlkdebugRule *rule = NULL; @@ -534,7 +534,7 @@ static BlockAIOCB *blkdebug_aio_writev(BlockDriverState *bs, } static BlockAIOCB *blkdebug_aio_flush(BlockDriverState *bs, - BlockDriverCompletionFunc *cb, void *opaque) + BlockCompletionFunc *cb, void *opaque) { BDRVBlkdebugState *s = bs->opaque; BlkdebugRule *rule = NULL; diff --git a/block/blkverify.c b/block/blkverify.c index 0c49063440..438dff8bcb 100644 --- a/block/blkverify.c +++ b/block/blkverify.c @@ -165,7 +165,7 @@ static int64_t blkverify_getlength(BlockDriverState *bs) static BlkverifyAIOCB *blkverify_aio_get(BlockDriverState *bs, bool is_write, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, - BlockDriverCompletionFunc *cb, + BlockCompletionFunc *cb, void *opaque) { BlkverifyAIOCB *acb = qemu_aio_get(&blkverify_aiocb_info, bs, cb, opaque); @@ -231,7 +231,7 @@ static void blkverify_verify_readv(BlkverifyAIOCB *acb) static BlockAIOCB *blkverify_aio_readv(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, - BlockDriverCompletionFunc *cb, void *opaque) + BlockCompletionFunc *cb, void *opaque) { BDRVBlkverifyState *s = bs->opaque; BlkverifyAIOCB *acb = blkverify_aio_get(bs, false, sector_num, qiov, @@ -251,7 +251,7 @@ static BlockAIOCB *blkverify_aio_readv(BlockDriverState *bs, static BlockAIOCB *blkverify_aio_writev(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, - BlockDriverCompletionFunc *cb, void *opaque) + BlockCompletionFunc *cb, void *opaque) { BDRVBlkverifyState *s = bs->opaque; BlkverifyAIOCB *acb = blkverify_aio_get(bs, true, sector_num, qiov, @@ -265,7 +265,7 @@ static BlockAIOCB *blkverify_aio_writev(BlockDriverState *bs, } static BlockAIOCB *blkverify_aio_flush(BlockDriverState *bs, - BlockDriverCompletionFunc *cb, + BlockCompletionFunc *cb, void *opaque) { BDRVBlkverifyState *s = bs->opaque; diff --git a/block/commit.c b/block/commit.c index 91517d3512..60a2accf04 100644 --- a/block/commit.c +++ b/block/commit.c @@ -182,7 +182,7 @@ static const BlockJobDriver commit_job_driver = { void commit_start(BlockDriverState *bs, BlockDriverState *base, BlockDriverState *top, int64_t speed, - BlockdevOnError on_error, BlockDriverCompletionFunc *cb, + BlockdevOnError on_error, BlockCompletionFunc *cb, void *opaque, const char *backing_file_str, Error **errp) { CommitBlockJob *s; diff --git a/block/curl.c b/block/curl.c index 0ff70b74d3..b4157cc8b3 100644 --- a/block/curl.c +++ b/block/curl.c @@ -682,7 +682,7 @@ static void curl_readv_bh_cb(void *p) static BlockAIOCB *curl_aio_readv(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, - BlockDriverCompletionFunc *cb, void *opaque) + BlockCompletionFunc *cb, void *opaque) { CURLAIOCB *acb; diff --git a/block/iscsi.c b/block/iscsi.c index 3ca29515e7..233f46285c 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -665,7 +665,7 @@ iscsi_aio_ioctl_cb(struct iscsi_context *iscsi, int status, static BlockAIOCB *iscsi_aio_ioctl(BlockDriverState *bs, unsigned long int req, void *buf, - BlockDriverCompletionFunc *cb, void *opaque) + BlockCompletionFunc *cb, void *opaque) { IscsiLun *iscsilun = bs->opaque; struct iscsi_context *iscsi = iscsilun->iscsi; diff --git a/block/linux-aio.c b/block/linux-aio.c index 16e09d18a5..d92513b0f9 100644 --- a/block/linux-aio.c +++ b/block/linux-aio.c @@ -245,7 +245,7 @@ int laio_io_unplug(BlockDriverState *bs, void *aio_ctx, bool unplug) BlockAIOCB *laio_submit(BlockDriverState *bs, void *aio_ctx, int fd, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, - BlockDriverCompletionFunc *cb, void *opaque, int type) + BlockCompletionFunc *cb, void *opaque, int type) { struct qemu_laio_state *s = aio_ctx; struct qemu_laiocb *laiocb; diff --git a/block/mirror.c b/block/mirror.c index 829be2f88a..e8a43eb39e 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -613,7 +613,7 @@ static void mirror_start_job(BlockDriverState *bs, BlockDriverState *target, int64_t buf_size, BlockdevOnError on_source_error, BlockdevOnError on_target_error, - BlockDriverCompletionFunc *cb, + BlockCompletionFunc *cb, void *opaque, Error **errp, const BlockJobDriver *driver, bool is_none_mode, BlockDriverState *base) @@ -673,7 +673,7 @@ void mirror_start(BlockDriverState *bs, BlockDriverState *target, int64_t speed, int64_t granularity, int64_t buf_size, MirrorSyncMode mode, BlockdevOnError on_source_error, BlockdevOnError on_target_error, - BlockDriverCompletionFunc *cb, + BlockCompletionFunc *cb, void *opaque, Error **errp) { bool is_none_mode; @@ -690,7 +690,7 @@ void mirror_start(BlockDriverState *bs, BlockDriverState *target, void commit_active_start(BlockDriverState *bs, BlockDriverState *base, int64_t speed, BlockdevOnError on_error, - BlockDriverCompletionFunc *cb, + BlockCompletionFunc *cb, void *opaque, Error **errp) { int64_t length, base_length; diff --git a/block/null.c b/block/null.c index e9547d785a..ec2bd27a4b 100644 --- a/block/null.c +++ b/block/null.c @@ -95,7 +95,7 @@ static void null_bh_cb(void *opaque) } static inline BlockAIOCB *null_aio_common(BlockDriverState *bs, - BlockDriverCompletionFunc *cb, + BlockCompletionFunc *cb, void *opaque) { NullAIOCB *acb; @@ -109,7 +109,7 @@ static inline BlockAIOCB *null_aio_common(BlockDriverState *bs, static BlockAIOCB *null_aio_readv(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, - BlockDriverCompletionFunc *cb, + BlockCompletionFunc *cb, void *opaque) { return null_aio_common(bs, cb, opaque); @@ -118,14 +118,14 @@ static BlockAIOCB *null_aio_readv(BlockDriverState *bs, static BlockAIOCB *null_aio_writev(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, - BlockDriverCompletionFunc *cb, + BlockCompletionFunc *cb, void *opaque) { return null_aio_common(bs, cb, opaque); } static BlockAIOCB *null_aio_flush(BlockDriverState *bs, - BlockDriverCompletionFunc *cb, + BlockCompletionFunc *cb, void *opaque) { return null_aio_common(bs, cb, opaque); diff --git a/block/qed-gencb.c b/block/qed-gencb.c index 7d7ac1ffc8..b817a8bf50 100644 --- a/block/qed-gencb.c +++ b/block/qed-gencb.c @@ -13,7 +13,7 @@ #include "qed.h" -void *gencb_alloc(size_t len, BlockDriverCompletionFunc *cb, void *opaque) +void *gencb_alloc(size_t len, BlockCompletionFunc *cb, void *opaque) { GenericCB *gencb = g_malloc(len); gencb->cb = cb; @@ -24,7 +24,7 @@ void *gencb_alloc(size_t len, BlockDriverCompletionFunc *cb, void *opaque) void gencb_complete(void *opaque, int ret) { GenericCB *gencb = opaque; - BlockDriverCompletionFunc *cb = gencb->cb; + BlockCompletionFunc *cb = gencb->cb; void *user_opaque = gencb->opaque; g_free(gencb); diff --git a/block/qed-table.c b/block/qed-table.c index f61107a1cf..513aa872c9 100644 --- a/block/qed-table.c +++ b/block/qed-table.c @@ -49,7 +49,7 @@ out: } static void qed_read_table(BDRVQEDState *s, uint64_t offset, QEDTable *table, - BlockDriverCompletionFunc *cb, void *opaque) + BlockCompletionFunc *cb, void *opaque) { QEDReadTableCB *read_table_cb = gencb_alloc(sizeof(*read_table_cb), cb, opaque); @@ -119,7 +119,7 @@ out: */ static void qed_write_table(BDRVQEDState *s, uint64_t offset, QEDTable *table, unsigned int index, unsigned int n, bool flush, - BlockDriverCompletionFunc *cb, void *opaque) + BlockCompletionFunc *cb, void *opaque) { QEDWriteTableCB *write_table_cb; unsigned int sector_mask = BDRV_SECTOR_SIZE / sizeof(uint64_t) - 1; @@ -180,7 +180,7 @@ int qed_read_l1_table_sync(BDRVQEDState *s) } void qed_write_l1_table(BDRVQEDState *s, unsigned int index, unsigned int n, - BlockDriverCompletionFunc *cb, void *opaque) + BlockCompletionFunc *cb, void *opaque) { BLKDBG_EVENT(s->bs->file, BLKDBG_L1_UPDATE); qed_write_table(s, s->header.l1_table_offset, @@ -235,7 +235,7 @@ static void qed_read_l2_table_cb(void *opaque, int ret) } void qed_read_l2_table(BDRVQEDState *s, QEDRequest *request, uint64_t offset, - BlockDriverCompletionFunc *cb, void *opaque) + BlockCompletionFunc *cb, void *opaque) { QEDReadL2TableCB *read_l2_table_cb; @@ -275,7 +275,7 @@ int qed_read_l2_table_sync(BDRVQEDState *s, QEDRequest *request, uint64_t offset void qed_write_l2_table(BDRVQEDState *s, QEDRequest *request, unsigned int index, unsigned int n, bool flush, - BlockDriverCompletionFunc *cb, void *opaque) + BlockCompletionFunc *cb, void *opaque) { BLKDBG_EVENT(s->bs->file, BLKDBG_L2_UPDATE); qed_write_table(s, request->l2_table->offset, diff --git a/block/qed.c b/block/qed.c index 4c14ac27e6..80f18d82e2 100644 --- a/block/qed.c +++ b/block/qed.c @@ -130,7 +130,7 @@ static void qed_write_header_read_cb(void *opaque, int ret) * This function only updates known header fields in-place and does not affect * extra data after the QED header. */ -static void qed_write_header(BDRVQEDState *s, BlockDriverCompletionFunc cb, +static void qed_write_header(BDRVQEDState *s, BlockCompletionFunc cb, void *opaque) { /* We must write full sectors for O_DIRECT but cannot necessarily generate @@ -759,7 +759,7 @@ static BDRVQEDState *acb_to_s(QEDAIOCB *acb) static void qed_read_backing_file(BDRVQEDState *s, uint64_t pos, QEMUIOVector *qiov, QEMUIOVector **backing_qiov, - BlockDriverCompletionFunc *cb, void *opaque) + BlockCompletionFunc *cb, void *opaque) { uint64_t backing_length = 0; size_t size; @@ -851,7 +851,7 @@ static void qed_copy_from_backing_file_write(void *opaque, int ret) */ static void qed_copy_from_backing_file(BDRVQEDState *s, uint64_t pos, uint64_t len, uint64_t offset, - BlockDriverCompletionFunc *cb, + BlockCompletionFunc *cb, void *opaque) { CopyFromBackingFileCB *copy_cb; @@ -902,7 +902,7 @@ static void qed_update_l2_table(BDRVQEDState *s, QEDTable *table, int index, static void qed_aio_complete_bh(void *opaque) { QEDAIOCB *acb = opaque; - BlockDriverCompletionFunc *cb = acb->common.cb; + BlockCompletionFunc *cb = acb->common.cb; void *user_opaque = acb->common.opaque; int ret = acb->bh_ret; @@ -1064,7 +1064,7 @@ static void qed_aio_write_main(void *opaque, int ret) BDRVQEDState *s = acb_to_s(acb); uint64_t offset = acb->cur_cluster + qed_offset_into_cluster(s, acb->cur_pos); - BlockDriverCompletionFunc *next_fn; + BlockCompletionFunc *next_fn; trace_qed_aio_write_main(s, acb, ret, offset, acb->cur_qiov.size); @@ -1164,7 +1164,7 @@ static void qed_aio_write_zero_cluster(void *opaque, int ret) static void qed_aio_write_alloc(QEDAIOCB *acb, size_t len) { BDRVQEDState *s = acb_to_s(acb); - BlockDriverCompletionFunc *cb; + BlockCompletionFunc *cb; /* Cancel timer when the first allocating request comes in */ if (QSIMPLEQ_EMPTY(&s->allocating_write_reqs)) { @@ -1368,7 +1368,7 @@ static void qed_aio_next_io(void *opaque, int ret) static BlockAIOCB *qed_aio_setup(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, - BlockDriverCompletionFunc *cb, + BlockCompletionFunc *cb, void *opaque, int flags) { QEDAIOCB *acb = qemu_aio_get(&qed_aiocb_info, bs, cb, opaque); @@ -1393,7 +1393,7 @@ static BlockAIOCB *qed_aio_setup(BlockDriverState *bs, static BlockAIOCB *bdrv_qed_aio_readv(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, - BlockDriverCompletionFunc *cb, + BlockCompletionFunc *cb, void *opaque) { return qed_aio_setup(bs, sector_num, qiov, nb_sectors, cb, opaque, 0); @@ -1402,7 +1402,7 @@ static BlockAIOCB *bdrv_qed_aio_readv(BlockDriverState *bs, static BlockAIOCB *bdrv_qed_aio_writev(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, - BlockDriverCompletionFunc *cb, + BlockCompletionFunc *cb, void *opaque) { return qed_aio_setup(bs, sector_num, qiov, nb_sectors, cb, diff --git a/block/qed.h b/block/qed.h index fc4980494a..d3934a05cd 100644 --- a/block/qed.h +++ b/block/qed.h @@ -203,11 +203,11 @@ typedef void QEDFindClusterFunc(void *opaque, int ret, uint64_t offset, size_t l * Generic callback for chaining async callbacks */ typedef struct { - BlockDriverCompletionFunc *cb; + BlockCompletionFunc *cb; void *opaque; } GenericCB; -void *gencb_alloc(size_t len, BlockDriverCompletionFunc *cb, void *opaque); +void *gencb_alloc(size_t len, BlockCompletionFunc *cb, void *opaque); void gencb_complete(void *opaque, int ret); /** @@ -230,16 +230,16 @@ void qed_commit_l2_cache_entry(L2TableCache *l2_cache, CachedL2Table *l2_table); */ int qed_read_l1_table_sync(BDRVQEDState *s); void qed_write_l1_table(BDRVQEDState *s, unsigned int index, unsigned int n, - BlockDriverCompletionFunc *cb, void *opaque); + BlockCompletionFunc *cb, void *opaque); int qed_write_l1_table_sync(BDRVQEDState *s, unsigned int index, unsigned int n); int qed_read_l2_table_sync(BDRVQEDState *s, QEDRequest *request, uint64_t offset); void qed_read_l2_table(BDRVQEDState *s, QEDRequest *request, uint64_t offset, - BlockDriverCompletionFunc *cb, void *opaque); + BlockCompletionFunc *cb, void *opaque); void qed_write_l2_table(BDRVQEDState *s, QEDRequest *request, unsigned int index, unsigned int n, bool flush, - BlockDriverCompletionFunc *cb, void *opaque); + BlockCompletionFunc *cb, void *opaque); int qed_write_l2_table_sync(BDRVQEDState *s, QEDRequest *request, unsigned int index, unsigned int n, bool flush); diff --git a/block/quorum.c b/block/quorum.c index e173ef0fbd..437b12251d 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -186,7 +186,7 @@ static QuorumAIOCB *quorum_aio_get(BDRVQuorumState *s, QEMUIOVector *qiov, uint64_t sector_num, int nb_sectors, - BlockDriverCompletionFunc *cb, + BlockCompletionFunc *cb, void *opaque) { QuorumAIOCB *acb = qemu_aio_get(&quorum_aiocb_info, bs, cb, opaque); @@ -679,7 +679,7 @@ static BlockAIOCB *quorum_aio_readv(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, - BlockDriverCompletionFunc *cb, + BlockCompletionFunc *cb, void *opaque) { BDRVQuorumState *s = bs->opaque; @@ -700,7 +700,7 @@ static BlockAIOCB *quorum_aio_writev(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, - BlockDriverCompletionFunc *cb, + BlockCompletionFunc *cb, void *opaque) { BDRVQuorumState *s = bs->opaque; diff --git a/block/raw-aio.h b/block/raw-aio.h index e1eee3f6f0..80681ce175 100644 --- a/block/raw-aio.h +++ b/block/raw-aio.h @@ -37,7 +37,7 @@ void *laio_init(void); void laio_cleanup(void *s); BlockAIOCB *laio_submit(BlockDriverState *bs, void *aio_ctx, int fd, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, - BlockDriverCompletionFunc *cb, void *opaque, int type); + BlockCompletionFunc *cb, void *opaque, int type); 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); @@ -52,7 +52,7 @@ int win32_aio_attach(QEMUWin32AIOState *aio, HANDLE hfile); BlockAIOCB *win32_aio_submit(BlockDriverState *bs, QEMUWin32AIOState *aio, HANDLE hfile, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, - BlockDriverCompletionFunc *cb, void *opaque, int type); + BlockCompletionFunc *cb, void *opaque, int type); void win32_aio_detach_aio_context(QEMUWin32AIOState *aio, AioContext *old_context); void win32_aio_attach_aio_context(QEMUWin32AIOState *aio, diff --git a/block/raw-posix.c b/block/raw-posix.c index 0fbaba00b1..ee4ca3c01e 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -1043,7 +1043,7 @@ static int paio_submit_co(BlockDriverState *bs, int fd, static BlockAIOCB *paio_submit(BlockDriverState *bs, int fd, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, - BlockDriverCompletionFunc *cb, void *opaque, int type) + BlockCompletionFunc *cb, void *opaque, int type) { RawPosixAIOData *acb = g_slice_new(RawPosixAIOData); ThreadPool *pool; @@ -1068,7 +1068,7 @@ static BlockAIOCB *paio_submit(BlockDriverState *bs, int fd, static BlockAIOCB *raw_aio_submit(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, - BlockDriverCompletionFunc *cb, void *opaque, int type) + BlockCompletionFunc *cb, void *opaque, int type) { BDRVRawState *s = bs->opaque; @@ -1127,7 +1127,7 @@ static void raw_aio_flush_io_queue(BlockDriverState *bs) static BlockAIOCB *raw_aio_readv(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, - BlockDriverCompletionFunc *cb, void *opaque) + BlockCompletionFunc *cb, void *opaque) { return raw_aio_submit(bs, sector_num, qiov, nb_sectors, cb, opaque, QEMU_AIO_READ); @@ -1135,14 +1135,14 @@ static BlockAIOCB *raw_aio_readv(BlockDriverState *bs, static BlockAIOCB *raw_aio_writev(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, - BlockDriverCompletionFunc *cb, void *opaque) + BlockCompletionFunc *cb, void *opaque) { return raw_aio_submit(bs, sector_num, qiov, nb_sectors, cb, opaque, QEMU_AIO_WRITE); } static BlockAIOCB *raw_aio_flush(BlockDriverState *bs, - BlockDriverCompletionFunc *cb, void *opaque) + BlockCompletionFunc *cb, void *opaque) { BDRVRawState *s = bs->opaque; @@ -1597,7 +1597,7 @@ static int64_t coroutine_fn raw_co_get_block_status(BlockDriverState *bs, static coroutine_fn BlockAIOCB *raw_aio_discard(BlockDriverState *bs, int64_t sector_num, int nb_sectors, - BlockDriverCompletionFunc *cb, void *opaque) + BlockCompletionFunc *cb, void *opaque) { BDRVRawState *s = bs->opaque; @@ -1937,7 +1937,7 @@ static int hdev_ioctl(BlockDriverState *bs, unsigned long int req, void *buf) static BlockAIOCB *hdev_aio_ioctl(BlockDriverState *bs, unsigned long int req, void *buf, - BlockDriverCompletionFunc *cb, void *opaque) + BlockCompletionFunc *cb, void *opaque) { BDRVRawState *s = bs->opaque; RawPosixAIOData *acb; @@ -1978,7 +1978,7 @@ static int fd_open(BlockDriverState *bs) static coroutine_fn BlockAIOCB *hdev_aio_discard(BlockDriverState *bs, int64_t sector_num, int nb_sectors, - BlockDriverCompletionFunc *cb, void *opaque) + BlockCompletionFunc *cb, void *opaque) { BDRVRawState *s = bs->opaque; diff --git a/block/raw-win32.c b/block/raw-win32.c index c11d522250..7b588815b9 100644 --- a/block/raw-win32.c +++ b/block/raw-win32.c @@ -140,7 +140,7 @@ static int aio_worker(void *arg) static BlockAIOCB *paio_submit(BlockDriverState *bs, HANDLE hfile, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, - BlockDriverCompletionFunc *cb, void *opaque, int type) + BlockCompletionFunc *cb, void *opaque, int type) { RawWin32AIOData *acb = g_slice_new(RawWin32AIOData); ThreadPool *pool; @@ -371,7 +371,7 @@ fail: static BlockAIOCB *raw_aio_readv(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, - BlockDriverCompletionFunc *cb, void *opaque) + BlockCompletionFunc *cb, void *opaque) { BDRVRawState *s = bs->opaque; if (s->aio) { @@ -385,7 +385,7 @@ static BlockAIOCB *raw_aio_readv(BlockDriverState *bs, static BlockAIOCB *raw_aio_writev(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, - BlockDriverCompletionFunc *cb, void *opaque) + BlockCompletionFunc *cb, void *opaque) { BDRVRawState *s = bs->opaque; if (s->aio) { @@ -398,7 +398,7 @@ static BlockAIOCB *raw_aio_writev(BlockDriverState *bs, } static BlockAIOCB *raw_aio_flush(BlockDriverState *bs, - BlockDriverCompletionFunc *cb, void *opaque) + BlockCompletionFunc *cb, void *opaque) { BDRVRawState *s = bs->opaque; return paio_submit(bs, s->hfile, 0, NULL, 0, cb, opaque, QEMU_AIO_FLUSH); diff --git a/block/raw_bsd.c b/block/raw_bsd.c index cde05fcf5f..401b967e85 100644 --- a/block/raw_bsd.c +++ b/block/raw_bsd.c @@ -131,7 +131,7 @@ static int raw_ioctl(BlockDriverState *bs, unsigned long int req, void *buf) static BlockAIOCB *raw_aio_ioctl(BlockDriverState *bs, unsigned long int req, void *buf, - BlockDriverCompletionFunc *cb, + BlockCompletionFunc *cb, void *opaque) { return bdrv_aio_ioctl(bs->file, req, buf, cb, opaque); diff --git a/block/rbd.c b/block/rbd.c index a385a6e0cd..47cab8be94 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -593,7 +593,7 @@ static BlockAIOCB *rbd_start_aio(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, - BlockDriverCompletionFunc *cb, + BlockCompletionFunc *cb, void *opaque, RBDAIOCmd cmd) { @@ -679,7 +679,7 @@ static BlockAIOCB *qemu_rbd_aio_readv(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, - BlockDriverCompletionFunc *cb, + BlockCompletionFunc *cb, void *opaque) { return rbd_start_aio(bs, sector_num, qiov, nb_sectors, cb, opaque, @@ -690,7 +690,7 @@ static BlockAIOCB *qemu_rbd_aio_writev(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, - BlockDriverCompletionFunc *cb, + BlockCompletionFunc *cb, void *opaque) { return rbd_start_aio(bs, sector_num, qiov, nb_sectors, cb, opaque, @@ -699,7 +699,7 @@ static BlockAIOCB *qemu_rbd_aio_writev(BlockDriverState *bs, #ifdef LIBRBD_SUPPORTS_AIO_FLUSH static BlockAIOCB *qemu_rbd_aio_flush(BlockDriverState *bs, - BlockDriverCompletionFunc *cb, + BlockCompletionFunc *cb, void *opaque) { return rbd_start_aio(bs, 0, NULL, 0, cb, opaque, RBD_AIO_FLUSH); @@ -879,7 +879,7 @@ static int qemu_rbd_snap_list(BlockDriverState *bs, static BlockAIOCB* qemu_rbd_aio_discard(BlockDriverState *bs, int64_t sector_num, int nb_sectors, - BlockDriverCompletionFunc *cb, + BlockCompletionFunc *cb, void *opaque) { return rbd_start_aio(bs, sector_num, NULL, nb_sectors, cb, opaque, diff --git a/block/stream.c b/block/stream.c index cdea3e8d0c..a1dc8da484 100644 --- a/block/stream.c +++ b/block/stream.c @@ -220,7 +220,7 @@ static const BlockJobDriver stream_job_driver = { void stream_start(BlockDriverState *bs, BlockDriverState *base, const char *backing_file_str, int64_t speed, BlockdevOnError on_error, - BlockDriverCompletionFunc *cb, + BlockCompletionFunc *cb, void *opaque, Error **errp) { StreamBlockJob *s; diff --git a/block/win32-aio.c b/block/win32-aio.c index 16c31a8cb1..64e86827bc 100644 --- a/block/win32-aio.c +++ b/block/win32-aio.c @@ -113,7 +113,7 @@ static const AIOCBInfo win32_aiocb_info = { BlockAIOCB *win32_aio_submit(BlockDriverState *bs, QEMUWin32AIOState *aio, HANDLE hfile, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, - BlockDriverCompletionFunc *cb, void *opaque, int type) + BlockCompletionFunc *cb, void *opaque, int type) { struct QEMUWin32AIOCB *waiocb; uint64_t offset = sector_num * 512; |