From 8007429a99d6ea8480ba0a7a5fb5ae92473f798c Mon Sep 17 00:00:00 2001 From: Fam Zheng Date: Thu, 11 Sep 2014 13:41:28 +0800 Subject: [PATCH] block: Rename qemu_aio_release -> qemu_aio_unref MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Suggested-by: BenoƮt Canet Signed-off-by: Fam Zheng Signed-off-by: Stefan Hajnoczi --- block.c | 8 ++++---- block/archipelago.c | 4 ++-- block/blkdebug.c | 2 +- block/blkverify.c | 2 +- block/curl.c | 10 +++++----- block/iscsi.c | 6 +++--- block/linux-aio.c | 4 ++-- block/qed.c | 2 +- block/quorum.c | 2 +- block/rbd.c | 4 ++-- block/sheepdog.c | 8 ++++---- block/win32-aio.c | 4 ++-- dma-helpers.c | 2 +- hw/ide/core.c | 2 +- include/block/aio.h | 2 +- thread-pool.c | 4 ++-- 16 files changed, 33 insertions(+), 33 deletions(-) diff --git a/block.c b/block.c index 3a3648da97..a857913fc2 100644 --- a/block.c +++ b/block.c @@ -4651,7 +4651,7 @@ void bdrv_aio_cancel(BlockDriverAIOCB *acb) abort(); } } - qemu_aio_release(acb); + qemu_aio_unref(acb); } /* Async version of aio cancel. The caller is not blocked if the acb implements @@ -4692,7 +4692,7 @@ static void bdrv_aio_bh_cb(void *opaque) acb->common.cb(acb->common.opaque, acb->ret); qemu_bh_delete(acb->bh); acb->bh = NULL; - qemu_aio_release(acb); + qemu_aio_unref(acb); } static BlockDriverAIOCB *bdrv_aio_rw_vector(BlockDriverState *bs, @@ -4760,7 +4760,7 @@ static void bdrv_co_em_bh(void *opaque) acb->common.cb(acb->common.opaque, acb->req.error); qemu_bh_delete(acb->bh); - qemu_aio_release(acb); + qemu_aio_unref(acb); } /* Invoke bdrv_co_do_readv/bdrv_co_do_writev */ @@ -4891,7 +4891,7 @@ void qemu_aio_ref(void *p) acb->refcnt++; } -void qemu_aio_release(void *p) +void qemu_aio_unref(void *p) { BlockDriverAIOCB *acb = p; assert(acb->refcnt > 0); diff --git a/block/archipelago.c b/block/archipelago.c index 435efa79c8..3c86d0ba5a 100644 --- a/block/archipelago.c +++ b/block/archipelago.c @@ -317,7 +317,7 @@ static void qemu_archipelago_complete_aio(void *opaque) aio_cb->common.cb(aio_cb->common.opaque, aio_cb->ret); aio_cb->status = 0; - qemu_aio_release(aio_cb); + qemu_aio_unref(aio_cb); g_free(reqdata); } @@ -890,7 +890,7 @@ static BlockDriverAIOCB *qemu_archipelago_aio_rw(BlockDriverState *bs, err_exit: error_report("qemu_archipelago_aio_rw(): I/O Error\n"); - qemu_aio_release(aio_cb); + qemu_aio_unref(aio_cb); return NULL; } diff --git a/block/blkdebug.c b/block/blkdebug.c index 08131b3a27..ced0b600f9 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -444,7 +444,7 @@ static void error_callback_bh(void *opaque) struct BlkdebugAIOCB *acb = opaque; qemu_bh_delete(acb->bh); acb->common.cb(acb->common.opaque, acb->ret); - qemu_aio_release(acb); + qemu_aio_unref(acb); } static BlockDriverAIOCB *inject_error(BlockDriverState *bs, diff --git a/block/blkverify.c b/block/blkverify.c index 460393f8d0..7d64a23a09 100644 --- a/block/blkverify.c +++ b/block/blkverify.c @@ -192,7 +192,7 @@ static void blkverify_aio_bh(void *opaque) qemu_vfree(acb->buf); } acb->common.cb(acb->common.opaque, acb->ret); - qemu_aio_release(acb); + qemu_aio_unref(acb); } static void blkverify_aio_cb(void *opaque, int ret) diff --git a/block/curl.c b/block/curl.c index 6f5d6aebb2..225407c643 100644 --- a/block/curl.c +++ b/block/curl.c @@ -212,7 +212,7 @@ static size_t curl_read_cb(void *ptr, size_t size, size_t nmemb, void *opaque) qemu_iovec_from_buf(acb->qiov, 0, s->orig_buf + acb->start, acb->end - acb->start); acb->common.cb(acb->common.opaque, 0); - qemu_aio_release(acb); + qemu_aio_unref(acb); s->acb[i] = NULL; } } @@ -304,7 +304,7 @@ static void curl_multi_check_completion(BDRVCURLState *s) } acb->common.cb(acb->common.opaque, -EIO); - qemu_aio_release(acb); + qemu_aio_unref(acb); state->acb[i] = NULL; } } @@ -636,7 +636,7 @@ static void curl_readv_bh_cb(void *p) // we can just call the callback and be done. switch (curl_find_buf(s, start, acb->nb_sectors * SECTOR_SIZE, acb)) { case FIND_RET_OK: - qemu_aio_release(acb); + qemu_aio_unref(acb); // fall through case FIND_RET_WAIT: return; @@ -648,7 +648,7 @@ static void curl_readv_bh_cb(void *p) state = curl_init_state(acb->common.bs, s); if (!state) { acb->common.cb(acb->common.opaque, -EIO); - qemu_aio_release(acb); + qemu_aio_unref(acb); return; } @@ -664,7 +664,7 @@ static void curl_readv_bh_cb(void *p) if (state->buf_len && state->orig_buf == NULL) { curl_clean_state(state); acb->common.cb(acb->common.opaque, -ENOMEM); - qemu_aio_release(acb); + qemu_aio_unref(acb); return; } state->acb[0] = acb; diff --git a/block/iscsi.c b/block/iscsi.c index f8328d64eb..3c1b416704 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -126,7 +126,7 @@ iscsi_bh_cb(void *p) acb->task = NULL; } - qemu_aio_release(acb); + qemu_aio_unref(acb); } static void @@ -680,7 +680,7 @@ static BlockDriverAIOCB *iscsi_aio_ioctl(BlockDriverState *bs, if (acb->task == NULL) { error_report("iSCSI: Failed to allocate task for scsi command. %s", iscsi_get_error(iscsi)); - qemu_aio_release(acb); + qemu_aio_unref(acb); return NULL; } memset(acb->task, 0, sizeof(struct scsi_task)); @@ -718,7 +718,7 @@ static BlockDriverAIOCB *iscsi_aio_ioctl(BlockDriverState *bs, (data.size > 0) ? &data : NULL, acb) != 0) { scsi_free_scsi_task(acb->task); - qemu_aio_release(acb); + qemu_aio_unref(acb); return NULL; } diff --git a/block/linux-aio.c b/block/linux-aio.c index b67f56cda3..f4baba2be0 100644 --- a/block/linux-aio.c +++ b/block/linux-aio.c @@ -88,7 +88,7 @@ static void qemu_laio_process_completion(struct qemu_laio_state *s, } laiocb->common.cb(laiocb->common.opaque, ret); - qemu_aio_release(laiocb); + qemu_aio_unref(laiocb); } /* The completion BH fetches completed I/O requests and invokes their @@ -286,7 +286,7 @@ BlockDriverAIOCB *laio_submit(BlockDriverState *bs, void *aio_ctx, int fd, return &laiocb->common; out_free_aiocb: - qemu_aio_release(laiocb); + qemu_aio_unref(laiocb); return NULL; } diff --git a/block/qed.c b/block/qed.c index 7a15d446c5..e2316d7ff0 100644 --- a/block/qed.c +++ b/block/qed.c @@ -907,7 +907,7 @@ static void qed_aio_complete_bh(void *opaque) int ret = acb->bh_ret; qemu_bh_delete(acb->bh); - qemu_aio_release(acb); + qemu_aio_unref(acb); /* Invoke callback */ cb(user_opaque, ret); diff --git a/block/quorum.c b/block/quorum.c index f343c04c53..7687466733 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -168,7 +168,7 @@ static void quorum_aio_finalize(QuorumAIOCB *acb) } g_free(acb->qcrs); - qemu_aio_release(acb); + qemu_aio_unref(acb); } static bool quorum_sha256_compare(QuorumVoteValue *a, QuorumVoteValue *b) diff --git a/block/rbd.c b/block/rbd.c index e5341fc3eb..96947e328a 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -407,7 +407,7 @@ static void qemu_rbd_complete_aio(RADOSCB *rcb) acb->common.cb(acb->common.opaque, (acb->ret > 0 ? 0 : acb->ret)); acb->status = 0; - qemu_aio_release(acb); + qemu_aio_unref(acb); } /* TODO Convert to fine grained options */ @@ -671,7 +671,7 @@ failed_completion: failed: g_free(rcb); qemu_vfree(acb->bounce); - qemu_aio_release(acb); + qemu_aio_unref(acb); return NULL; } diff --git a/block/sheepdog.c b/block/sheepdog.c index f538606f87..2d78ef91f7 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -445,7 +445,7 @@ static inline void free_aio_req(BDRVSheepdogState *s, AIOReq *aio_req) static void coroutine_fn sd_finish_aiocb(SheepdogAIOCB *acb) { qemu_coroutine_enter(acb->coroutine, NULL); - qemu_aio_release(acb); + qemu_aio_unref(acb); } /* @@ -2130,7 +2130,7 @@ static coroutine_fn int sd_co_writev(BlockDriverState *bs, int64_t sector_num, ret = sd_co_rw_vector(acb); if (ret <= 0) { - qemu_aio_release(acb); + qemu_aio_unref(acb); return ret; } @@ -2151,7 +2151,7 @@ static coroutine_fn int sd_co_readv(BlockDriverState *bs, int64_t sector_num, ret = sd_co_rw_vector(acb); if (ret <= 0) { - qemu_aio_release(acb); + qemu_aio_unref(acb); return ret; } @@ -2510,7 +2510,7 @@ static coroutine_fn int sd_co_discard(BlockDriverState *bs, int64_t sector_num, ret = sd_co_rw_vector(acb); if (ret <= 0) { - qemu_aio_release(acb); + qemu_aio_unref(acb); return ret; } diff --git a/block/win32-aio.c b/block/win32-aio.c index eed86f7e92..9323c1aed1 100644 --- a/block/win32-aio.c +++ b/block/win32-aio.c @@ -88,7 +88,7 @@ static void win32_aio_process_completion(QEMUWin32AIOState *s, waiocb->common.cb(waiocb->common.opaque, ret); - qemu_aio_release(waiocb); + qemu_aio_unref(waiocb); } static void win32_aio_completion_cb(EventNotifier *e) @@ -158,7 +158,7 @@ BlockDriverAIOCB *win32_aio_submit(BlockDriverState *bs, out_dec_count: aio->count--; out: - qemu_aio_release(waiocb); + qemu_aio_unref(waiocb); return NULL; } diff --git a/dma-helpers.c b/dma-helpers.c index 207b21ef6f..7f86e18e72 100644 --- a/dma-helpers.c +++ b/dma-helpers.c @@ -124,7 +124,7 @@ static void dma_complete(DMAAIOCB *dbs, int ret) qemu_bh_delete(dbs->bh); dbs->bh = NULL; } - qemu_aio_release(dbs); + qemu_aio_unref(dbs); } static void dma_bdrv_cb(void *opaque, int ret) diff --git a/hw/ide/core.c b/hw/ide/core.c index 055d150c41..190700ac74 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -397,7 +397,7 @@ static void ide_trim_bh_cb(void *opaque) qemu_bh_delete(iocb->bh); iocb->bh = NULL; - qemu_aio_release(iocb); + qemu_aio_unref(iocb); } static void ide_issue_trim_cb(void *opaque, int ret) diff --git a/include/block/aio.h b/include/block/aio.h index f2d0582bd1..67a75ddd56 100644 --- a/include/block/aio.h +++ b/include/block/aio.h @@ -41,7 +41,7 @@ struct BlockDriverAIOCB { void *qemu_aio_get(const AIOCBInfo *aiocb_info, BlockDriverState *bs, BlockDriverCompletionFunc *cb, void *opaque); -void qemu_aio_release(void *p); +void qemu_aio_unref(void *p); void qemu_aio_ref(void *p); typedef struct AioHandler AioHandler; diff --git a/thread-pool.c b/thread-pool.c index bb1395cff8..86fa4a8f89 100644 --- a/thread-pool.c +++ b/thread-pool.c @@ -185,12 +185,12 @@ restart: qemu_bh_schedule(pool->completion_bh); elem->common.cb(elem->common.opaque, elem->ret); - qemu_aio_release(elem); + qemu_aio_unref(elem); goto restart; } else { /* remove the request */ QLIST_REMOVE(elem, all); - qemu_aio_release(elem); + qemu_aio_unref(elem); } } }