From 30a5c887bf4a7e00d0e0ecbb08509e8ba2902620 Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Fri, 4 May 2018 12:17:20 +0200 Subject: job: Move progress fields to Job BlockJob has fields .offset and .len, which are actually misnomers today because they are no longer tied to block device sizes, but just progress counters. As such they make a lot of sense in generic Jobs. This patch moves the fields to Job and renames them to .progress_current and .progress_total to describe their function better. Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz --- block/commit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'block/commit.c') diff --git a/block/commit.c b/block/commit.c index b0a847e678..620666161b 100644 --- a/block/commit.c +++ b/block/commit.c @@ -150,7 +150,7 @@ static void coroutine_fn commit_run(void *opaque) if (len < 0) { goto out; } - block_job_progress_set_remaining(&s->common, len); + job_progress_set_remaining(&s->common.job, len); ret = base_len = blk_getlength(s->base); if (base_len < 0) { @@ -196,7 +196,7 @@ static void coroutine_fn commit_run(void *opaque) } } /* Publish progress */ - block_job_progress_update(&s->common, n); + job_progress_update(&s->common.job, n); if (copy) { delay_ns = block_job_ratelimit_get_delay(&s->common, n); -- cgit v1.2.3-55-g7522