[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 14/20] qed: Drop qed_aiocb_info.cancel
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH v4 14/20] qed: Drop qed_aiocb_info.cancel |
Date: |
Wed, 3 Sep 2014 19:23:49 +0800 |
Also drop the now unused ->finished field.
Signed-off-by: Fam Zheng <address@hidden>
---
block/qed.c | 21 ---------------------
1 file changed, 21 deletions(-)
diff --git a/block/qed.c b/block/qed.c
index ba395af..07cdb47 100644
--- a/block/qed.c
+++ b/block/qed.c
@@ -18,22 +18,8 @@
#include "qapi/qmp/qerror.h"
#include "migration/migration.h"
-static void qed_aio_cancel(BlockDriverAIOCB *blockacb)
-{
- QEDAIOCB *acb = (QEDAIOCB *)blockacb;
- AioContext *aio_context = bdrv_get_aio_context(blockacb->bs);
- bool finished = false;
-
- /* Wait for the request to finish */
- acb->finished = &finished;
- while (!finished) {
- aio_poll(aio_context, true);
- }
-}
-
static const AIOCBInfo qed_aiocb_info = {
.aiocb_size = sizeof(QEDAIOCB),
- .cancel = qed_aio_cancel,
};
static int bdrv_qed_probe(const uint8_t *buf, int buf_size,
@@ -918,18 +904,12 @@ static void qed_aio_complete_bh(void *opaque)
BlockDriverCompletionFunc *cb = acb->common.cb;
void *user_opaque = acb->common.opaque;
int ret = acb->bh_ret;
- bool *finished = acb->finished;
qemu_bh_delete(acb->bh);
qemu_aio_release(acb);
/* Invoke callback */
cb(user_opaque, ret);
-
- /* Signal cancel completion */
- if (finished) {
- *finished = true;
- }
}
static void qed_aio_complete(QEDAIOCB *acb, int ret)
@@ -1396,7 +1376,6 @@ static BlockDriverAIOCB *qed_aio_setup(BlockDriverState
*bs,
opaque, flags);
acb->flags = flags;
- acb->finished = NULL;
acb->qiov = qiov;
acb->qiov_offset = 0;
acb->cur_pos = (uint64_t)sector_num * BDRV_SECTOR_SIZE;
--
2.1.0.27.g96db324
- [Qemu-devel] [PATCH v4 06/20] linux-aio: Convert laio_aiocb_info.cancel to .cancel_async, (continued)
- [Qemu-devel] [PATCH v4 06/20] linux-aio: Convert laio_aiocb_info.cancel to .cancel_async, Fam Zheng, 2014/09/03
- [Qemu-devel] [PATCH v4 07/20] dma: Check iov pointer before unmap memory, Fam Zheng, 2014/09/03
- [Qemu-devel] [PATCH v4 08/20] dma: Convert dma_aiocb_info.cancel to .cancel_async, Fam Zheng, 2014/09/03
- [Qemu-devel] [PATCH v4 09/20] iscsi: Convert iscsi_aiocb_info.cancel to .cancel_async, Fam Zheng, 2014/09/03
- [Qemu-devel] [PATCH v4 10/20] archipelago: Drop archipelago_aiocb_info.cancel, Fam Zheng, 2014/09/03
- [Qemu-devel] [PATCH v4 11/20] blkdebug: Convert blkdebug_aiocb_info.cancel to .cancel_async, Fam Zheng, 2014/09/03
- [Qemu-devel] [PATCH v4 12/20] blkverify: Drop blkverify_aiocb_info.cancel, Fam Zheng, 2014/09/03
- [Qemu-devel] [PATCH v4 13/20] curl: Drop curl_aiocb_info.cancel, Fam Zheng, 2014/09/03
- [Qemu-devel] [PATCH v4 14/20] qed: Drop qed_aiocb_info.cancel,
Fam Zheng <=
- [Qemu-devel] [PATCH v4 15/20] quorum: Convert quorum_aiocb_info.cancel to .cancel_async, Fam Zheng, 2014/09/03
- [Qemu-devel] [PATCH v4 16/20] rbd: Drop rbd_aiocb_info.cancel, Fam Zheng, 2014/09/03
- [Qemu-devel] [PATCH v4 17/20] sheepdog: Convert sd_aiocb_info.cancel to .cancel_async, Fam Zheng, 2014/09/03
- [Qemu-devel] [PATCH v4 18/20] win32-aio: Drop win32_aiocb_info.cancel, Fam Zheng, 2014/09/03
- [Qemu-devel] [PATCH v4 19/20] ide: Convert trim_aiocb_info.cancel to .cancel_async, Fam Zheng, 2014/09/03
- [Qemu-devel] [PATCH v4 20/20] block: Drop AIOCBInfo.cancel, Fam Zheng, 2014/09/03