[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V12 05/13] quorum: Add quorum_aio_readv.
From: |
Benoît Canet |
Subject: |
[Qemu-devel] [PATCH V12 05/13] quorum: Add quorum_aio_readv. |
Date: |
Mon, 3 Feb 2014 16:36:58 +0100 |
From: Benoît Canet <address@hidden>
Signed-off-by: Benoit Canet <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
---
block/quorum.c | 40 +++++++++++++++++++++++++++++++++++++++-
1 file changed, 39 insertions(+), 1 deletion(-)
diff --git a/block/quorum.c b/block/quorum.c
index 85992ab..5bf37b3 100644
--- a/block/quorum.c
+++ b/block/quorum.c
@@ -101,14 +101,23 @@ static int quorum_get_first_error(QuorumAIOCB *acb)
static void quorum_aio_finalize(QuorumAIOCB *acb)
{
BDRVQuorumState *s = acb->bqs;
- int ret;
+ int i, ret;
ret = s->threshold <= acb->success_count ? 0 : quorum_get_first_error(acb);
+ for (i = 0; i < s->total; i++) {
+ qemu_vfree(acb->aios[i].buf);
+ acb->aios[i].buf = NULL;
+ acb->aios[i].ret = 0;
+ }
+
acb->common.cb(acb->common.opaque, ret);
if (acb->finished) {
*acb->finished = true;
}
+ for (i = 0; acb->is_read && i < s->total; i++) {
+ qemu_iovec_destroy(&acb->aios[i].qiov);
+ }
g_free(acb->aios);
qemu_aio_release(acb);
}
@@ -164,6 +173,34 @@ static void quorum_aio_cb(void *opaque, int ret)
quorum_aio_finalize(acb);
}
+static BlockDriverAIOCB *quorum_aio_readv(BlockDriverState *bs,
+ int64_t sector_num,
+ QEMUIOVector *qiov,
+ int nb_sectors,
+ BlockDriverCompletionFunc *cb,
+ void *opaque)
+{
+ BDRVQuorumState *s = bs->opaque;
+ QuorumAIOCB *acb = quorum_aio_get(s, bs, qiov, sector_num,
+ nb_sectors, cb, opaque);
+ int i;
+
+ acb->is_read = true;
+
+ for (i = 0; i < s->total; i++) {
+ acb->aios[i].buf = qemu_blockalign(bs->file, qiov->size);
+ qemu_iovec_init(&acb->aios[i].qiov, qiov->niov);
+ qemu_iovec_clone(&acb->aios[i].qiov, qiov, acb->aios[i].buf);
+ }
+
+ for (i = 0; i < s->total; i++) {
+ bdrv_aio_readv(s->bs[i], sector_num, qiov, nb_sectors,
+ quorum_aio_cb, &acb->aios[i]);
+ }
+
+ return &acb->common;
+}
+
static BlockDriverAIOCB *quorum_aio_writev(BlockDriverState *bs,
int64_t sector_num,
QEMUIOVector *qiov,
@@ -191,6 +228,7 @@ static BlockDriver bdrv_quorum = {
.instance_size = sizeof(BDRVQuorumState),
+ .bdrv_aio_readv = quorum_aio_readv,
.bdrv_aio_writev = quorum_aio_writev,
};
--
1.8.3.2
- [Qemu-devel] [PATCH V12 00/13] quorum block filter, Benoît Canet, 2014/02/03
- [Qemu-devel] [PATCH V12 02/13] quorum: Create BDRVQuorumState and BlkDriver and do init., Benoît Canet, 2014/02/03
- [Qemu-devel] [PATCH V12 01/13] quorum: Create quorum.c, add QuorumSingleAIOCB and QuorumAIOCB., Benoît Canet, 2014/02/03
- [Qemu-devel] [PATCH V12 04/13] blkverify: Extract qemu_iovec_clone() and qemu_iovec_compare() from blkverify., Benoît Canet, 2014/02/03
- [Qemu-devel] [PATCH V12 03/13] quorum: Add quorum_aio_writev and its dependencies., Benoît Canet, 2014/02/03
- [Qemu-devel] [PATCH V12 05/13] quorum: Add quorum_aio_readv.,
Benoît Canet <=
- [Qemu-devel] [PATCH V12 07/13] quorum: Add quorum_getlength()., Benoît Canet, 2014/02/03
- [Qemu-devel] [PATCH V12 10/13] quorum: Add quorum_co_flush()., Benoît Canet, 2014/02/03
- [Qemu-devel] [PATCH V12 09/13] quorum: Add quorum_co_get_block_status., Benoît Canet, 2014/02/03
- [Qemu-devel] [PATCH V12 06/13] quorum: Add quorum mechanism., Benoît Canet, 2014/02/03
- [Qemu-devel] [PATCH V12 08/13] quorum: Add quorum_invalidate_cache()., Benoît Canet, 2014/02/03
- [Qemu-devel] [PATCH V12 13/13] quorum: Add unit test., Benoît Canet, 2014/02/03
- [Qemu-devel] [PATCH V12 12/13] quorum: Add quorum_open() and quorum_close()., Benoît Canet, 2014/02/03
- [Qemu-devel] [PATCH V12 11/13] quorum: Implement recursive .bdrv_recurse_is_first_non_filter in quorum., Benoît Canet, 2014/02/03