diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2020-02-14 21:08:10 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2020-02-18 10:53:56 +0100 |
| commit | 9ad1e79f3f9b102a9aa05053347cf9874c7bc909 (patch) | |
| tree | efd57caa20d04da2e5dd54d29e19a8159c17ec6a /block | |
| parent | 0c42e175fcc9d9ed888e4d7a30237ddf36454d19 (diff) | |
commit: Fix is_read for block_job_error_action()
block_job_error_action() needs to know if reading from the top node or
writing to the base node failed so that it can set the right 'operation'
in the BLOCK_JOB_ERROR QMP event.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20200214200812.28180-6-kwolf@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/commit.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/block/commit.c b/block/commit.c index 2992a1012f..8e672799af 100644 --- a/block/commit.c +++ b/block/commit.c @@ -143,6 +143,7 @@ static int coroutine_fn commit_run(Job *job, Error **errp) for (offset = 0; offset < len; offset += n) { bool copy; + bool error_in_source = true; /* Note that even when no rate limit is applied we need to yield * with no pending I/O here so that bdrv_drain_all() returns. @@ -162,11 +163,15 @@ static int coroutine_fn commit_run(Job *job, Error **errp) ret = blk_co_pread(s->top, offset, n, buf, 0); if (ret >= 0) { ret = blk_co_pwrite(s->base, offset, n, buf, 0); + if (ret < 0) { + error_in_source = false; + } } } if (ret < 0) { BlockErrorAction action = - block_job_error_action(&s->common, s->on_error, false, -ret); + block_job_error_action(&s->common, s->on_error, + error_in_source, -ret); if (action == BLOCK_ERROR_ACTION_REPORT) { goto out; } else { |