From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, pkrempa@redhat.com, qemu-devel@nongnu.org,
mreitz@redhat.com, nsoffer@redhat.com, jsnow@redhat.com
Subject: [PATCH 4/7] commit: Inline commit_populate()
Date: Fri, 14 Feb 2020 21:08:09 +0100 [thread overview]
Message-ID: <20200214200812.28180-5-kwolf@redhat.com> (raw)
In-Reply-To: <20200214200812.28180-1-kwolf@redhat.com>
commit_populate() is a very short function and only called in a single
place. Its return value doesn't tell us whether an error happened while
reading or writing, which would be necessary for sending the right data
in the BLOCK_JOB_ERROR QMP event.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
block/commit.c | 28 ++++++----------------------
1 file changed, 6 insertions(+), 22 deletions(-)
diff --git a/block/commit.c b/block/commit.c
index 8189f079d2..2992a1012f 100644
--- a/block/commit.c
+++ b/block/commit.c
@@ -43,27 +43,6 @@ typedef struct CommitBlockJob {
char *backing_file_str;
} CommitBlockJob;
-static int coroutine_fn commit_populate(BlockBackend *bs, BlockBackend *base,
- int64_t offset, uint64_t bytes,
- void *buf)
-{
- int ret = 0;
-
- assert(bytes < SIZE_MAX);
-
- ret = blk_co_pread(bs, offset, bytes, buf, 0);
- if (ret < 0) {
- return ret;
- }
-
- ret = blk_co_pwrite(base, offset, bytes, buf, 0);
- if (ret < 0) {
- return ret;
- }
-
- return 0;
-}
-
static int commit_prepare(Job *job)
{
CommitBlockJob *s = container_of(job, CommitBlockJob, common.job);
@@ -178,7 +157,12 @@ static int coroutine_fn commit_run(Job *job, Error **errp)
copy = (ret == 1);
trace_commit_one_iteration(s, offset, n, ret);
if (copy) {
- ret = commit_populate(s->top, s->base, offset, n, buf);
+ assert(n < SIZE_MAX);
+
+ 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) {
BlockErrorAction action =
--
2.20.1
next prev parent reply other threads:[~2020-02-14 20:11 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-14 20:08 [PATCH 0/7] commit: Expose on-error option in QMP Kevin Wolf
2020-02-14 20:08 ` [PATCH 1/7] qapi: Document meaning of 'ignore' BlockdevOnError for jobs Kevin Wolf
2020-02-16 21:44 ` Ján Tomko
2020-02-17 9:58 ` Kevin Wolf
2020-02-14 20:08 ` [PATCH 2/7] commit: Remove unused bytes_written Kevin Wolf
2020-02-16 21:45 ` Ján Tomko
2020-02-14 20:08 ` [PATCH 3/7] commit: Fix argument order for block_job_error_action() Kevin Wolf
2020-02-16 21:46 ` Ján Tomko
2020-02-14 20:08 ` Kevin Wolf [this message]
2020-02-16 21:46 ` [PATCH 4/7] commit: Inline commit_populate() Ján Tomko
2020-02-14 20:08 ` [PATCH 5/7] commit: Fix is_read for block_job_error_action() Kevin Wolf
2020-02-16 21:46 ` Ján Tomko
2020-02-14 20:08 ` [PATCH 6/7] commit: Expose on-error option in QMP Kevin Wolf
2020-02-16 21:47 ` Ján Tomko
2020-02-14 20:08 ` [PATCH 7/7] iotests: Test error handling policies with block-commit Kevin Wolf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200214200812.28180-5-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=jsnow@redhat.com \
--cc=mreitz@redhat.com \
--cc=nsoffer@redhat.com \
--cc=pkrempa@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).