[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v2 04/16] block/mirror: Pull out mirror_perform()
From: |
Max Reitz |
Subject: |
[Qemu-block] [PATCH v2 04/16] block/mirror: Pull out mirror_perform() |
Date: |
Mon, 22 Jan 2018 23:07:54 +0100 |
When converting mirror's I/O to coroutines, we are going to need a point
where these coroutines are created. mirror_perform() is going to be
that point.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Reviewed-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
block/mirror.c | 51 +++++++++++++++++++++++++++++----------------------
1 file changed, 29 insertions(+), 22 deletions(-)
diff --git a/block/mirror.c b/block/mirror.c
index c9badc1203..4066788ee2 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -82,6 +82,12 @@ typedef struct MirrorOp {
uint64_t bytes;
} MirrorOp;
+typedef enum MirrorMethod {
+ MIRROR_METHOD_COPY,
+ MIRROR_METHOD_ZERO,
+ MIRROR_METHOD_DISCARD,
+} MirrorMethod;
+
static BlockErrorAction mirror_error_action(MirrorBlockJob *s, bool read,
int error)
{
@@ -321,6 +327,22 @@ static void mirror_do_zero_or_discard(MirrorBlockJob *s,
}
}
+static unsigned mirror_perform(MirrorBlockJob *s, int64_t offset,
+ unsigned bytes, MirrorMethod mirror_method)
+{
+ switch (mirror_method) {
+ case MIRROR_METHOD_COPY:
+ return mirror_do_read(s, offset, bytes);
+ case MIRROR_METHOD_ZERO:
+ case MIRROR_METHOD_DISCARD:
+ mirror_do_zero_or_discard(s, offset, bytes,
+ mirror_method == MIRROR_METHOD_DISCARD);
+ return bytes;
+ default:
+ abort();
+ }
+}
+
static uint64_t coroutine_fn mirror_iteration(MirrorBlockJob *s)
{
BlockDriverState *source = s->source;
@@ -387,11 +409,7 @@ static uint64_t coroutine_fn
mirror_iteration(MirrorBlockJob *s)
int ret;
int64_t io_bytes;
int64_t io_bytes_acct;
- enum MirrorMethod {
- MIRROR_METHOD_COPY,
- MIRROR_METHOD_ZERO,
- MIRROR_METHOD_DISCARD
- } mirror_method = MIRROR_METHOD_COPY;
+ MirrorMethod mirror_method = MIRROR_METHOD_COPY;
assert(!(offset % s->granularity));
ret = bdrv_block_status_above(source, NULL, offset,
@@ -429,22 +447,11 @@ static uint64_t coroutine_fn
mirror_iteration(MirrorBlockJob *s)
}
io_bytes = mirror_clip_bytes(s, offset, io_bytes);
- switch (mirror_method) {
- case MIRROR_METHOD_COPY:
- io_bytes = io_bytes_acct = mirror_do_read(s, offset, io_bytes);
- break;
- case MIRROR_METHOD_ZERO:
- case MIRROR_METHOD_DISCARD:
- mirror_do_zero_or_discard(s, offset, io_bytes,
- mirror_method == MIRROR_METHOD_DISCARD);
- if (write_zeroes_ok) {
- io_bytes_acct = 0;
- } else {
- io_bytes_acct = io_bytes;
- }
- break;
- default:
- abort();
+ io_bytes = mirror_perform(s, offset, io_bytes, mirror_method);
+ if (mirror_method != MIRROR_METHOD_COPY && write_zeroes_ok) {
+ io_bytes_acct = 0;
+ } else {
+ io_bytes_acct = io_bytes;
}
assert(io_bytes);
offset += io_bytes;
@@ -638,7 +645,7 @@ static int coroutine_fn mirror_dirty_init(MirrorBlockJob *s)
continue;
}
- mirror_do_zero_or_discard(s, offset, bytes, false);
+ mirror_perform(s, offset, bytes, MIRROR_METHOD_ZERO);
offset += bytes;
}
--
2.14.3
- [Qemu-block] [PATCH v2 00/16] block/mirror: Add active-sync mirroring, Max Reitz, 2018/01/22
- [Qemu-block] [PATCH v2 01/16] block: BDS deletion during bdrv_drain_recurse, Max Reitz, 2018/01/22
- [Qemu-block] [PATCH v2 02/16] block: BDS deletion in bdrv_do_drained_begin(), Max Reitz, 2018/01/22
- [Qemu-block] [PATCH v2 03/16] tests: Add bdrv-drain test for node deletion, Max Reitz, 2018/01/22
- [Qemu-block] [PATCH v2 04/16] block/mirror: Pull out mirror_perform(),
Max Reitz <=
- [Qemu-block] [PATCH v2 05/16] block/mirror: Convert to coroutines, Max Reitz, 2018/01/22
- [Qemu-block] [PATCH v2 06/16] block/mirror: Use CoQueue to wait on in-flight ops, Max Reitz, 2018/01/22
- [Qemu-block] [PATCH v2 07/16] block/mirror: Wait for in-flight op conflicts, Max Reitz, 2018/01/22
- [Qemu-block] [PATCH v2 08/16] block/mirror: Use source as a BdrvChild, Max Reitz, 2018/01/22
- [Qemu-block] [PATCH v2 09/16] block: Generalize should_update_child() rule, Max Reitz, 2018/01/22
- [Qemu-block] [PATCH v2 10/16] hbitmap: Add @advance param to hbitmap_iter_next(), Max Reitz, 2018/01/22
- [Qemu-block] [PATCH v2 11/16] block/dirty-bitmap: Add bdrv_dirty_iter_next_area, Max Reitz, 2018/01/22
- [Qemu-block] [PATCH v2 12/16] block/mirror: Distinguish active from passive ops, Max Reitz, 2018/01/22
- [Qemu-block] [PATCH v2 13/16] block/mirror: Add MirrorBDSOpaque, Max Reitz, 2018/01/22
- [Qemu-block] [PATCH v2 14/16] block/mirror: Add active mirroring, Max Reitz, 2018/01/22