[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/17] mirror: Inline mirror_write_complete(), part
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH 11/17] mirror: Inline mirror_write_complete(), part 1 |
Date: |
Mon, 13 Aug 2018 04:20:00 +0200 |
Eventually, we want to inline mirror_write_complete() fully into
mirror_co_perform(). This patch does the inlining, but we cannot remove
the function yet, as it is still required by mirror_co_read().
Signed-off-by: Max Reitz <address@hidden>
---
block/mirror.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/block/mirror.c b/block/mirror.c
index 2a131d8b99..66746cf075 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -407,7 +407,17 @@ static void coroutine_fn mirror_co_perform(void *opaque)
abort();
}
- mirror_write_complete(op, ret);
+ if (ret < 0) {
+ BlockErrorAction action;
+
+ bdrv_set_dirty_bitmap(s->dirty_bitmap, op->offset, op->bytes);
+ action = mirror_error_action(s, false, -ret);
+ if (action == BLOCK_ERROR_ACTION_REPORT && s->ret >= 0) {
+ s->ret = ret;
+ }
+ }
+
+ mirror_iteration_done(op, ret);
done:
aio_context_release(aio_context);
--
2.17.1
- [Qemu-devel] [PATCH 01/17] iotests: Try reading while mirroring in 156, (continued)
- [Qemu-devel] [PATCH 01/17] iotests: Try reading while mirroring in 156, Max Reitz, 2018/08/12
- [Qemu-devel] [PATCH 02/17] mirror: Make wait_for_any_operation() coroutine_fn, Max Reitz, 2018/08/12
- [Qemu-devel] [PATCH 03/17] mirror: Pull *_align_for_copy() from *_co_read(), Max Reitz, 2018/08/12
- [Qemu-devel] [PATCH 04/17] mirror: Remove bytes_handled, part 1, Max Reitz, 2018/08/12
- [Qemu-devel] [PATCH 06/17] mirror: Create mirror_co_perform(), Max Reitz, 2018/08/12
- [Qemu-devel] [PATCH 05/17] mirror: Remove bytes_handled, part 2, Max Reitz, 2018/08/12
- [Qemu-devel] [PATCH 07/17] mirror: Make mirror_co_zero() nicer, Max Reitz, 2018/08/12
- [Qemu-devel] [PATCH 08/17] mirror: Make mirror_co_discard() nicer, Max Reitz, 2018/08/12
- [Qemu-devel] [PATCH 09/17] mirror: Lock AioContext in mirror_co_perform(), Max Reitz, 2018/08/12
- [Qemu-devel] [PATCH 10/17] mirror: Create mirror_co_alloc_qiov(), Max Reitz, 2018/08/12
- [Qemu-devel] [PATCH 11/17] mirror: Inline mirror_write_complete(), part 1,
Max Reitz <=
- [Qemu-devel] [PATCH 12/17] mirror: Put QIOV locally into mirror_co_read, Max Reitz, 2018/08/12
- [Qemu-devel] [PATCH 13/17] mirror: Linearize mirror_co_read(), Max Reitz, 2018/08/12
- [Qemu-devel] [PATCH 14/17] mirror: Inline mirror_iteration_done(), Max Reitz, 2018/08/12
- [Qemu-devel] [PATCH 15/17] mirror: Release AioCtx before queue_restart_all(), Max Reitz, 2018/08/12
- [Qemu-devel] [PATCH 17/17] iotests: Add test for active mirror with COR, Max Reitz, 2018/08/12
- [Qemu-devel] [PATCH 16/17] mirror: Support COR with write-blocking, Max Reitz, 2018/08/12