diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2018-05-04 12:17:20 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2018-05-23 14:30:51 +0200 |
| commit | 30a5c887bf4a7e00d0e0ecbb08509e8ba2902620 (patch) | |
| tree | 1dac007a566de2715e9f73d62a74b98cc45f019e /block/backup.c | |
| parent | 2e1795b58131427719c7cd11f8b9b6984b3f24f8 (diff) | |
| download | qemu-30a5c887bf4a7e00d0e0ecbb08509e8ba2902620.zip qemu-30a5c887bf4a7e00d0e0ecbb08509e8ba2902620.tar.gz qemu-30a5c887bf4a7e00d0e0ecbb08509e8ba2902620.tar.bz2 | |
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 <kwolf@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'block/backup.c')
| -rw-r--r-- | block/backup.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/block/backup.c b/block/backup.c index 6f4f3df..4e228e9 100644 --- a/block/backup.c +++ b/block/backup.c @@ -160,7 +160,7 @@ static int coroutine_fn backup_do_cow(BackupBlockJob *job, * offset field is an opaque progress value, it is not a disk offset. */ job->bytes_read += n; - block_job_progress_update(&job->common, n); + job_progress_update(&job->common.job, n); } out: @@ -406,8 +406,8 @@ static void backup_incremental_init_copy_bitmap(BackupBlockJob *job) bdrv_set_dirty_iter(dbi, next_cluster * job->cluster_size); } - /* TODO block_job_progress_set_remaining() would make more sense */ - block_job_progress_update(&job->common, + /* TODO job_progress_set_remaining() would make more sense */ + job_progress_update(&job->common.job, job->len - hbitmap_count(job->copy_bitmap) * job->cluster_size); bdrv_dirty_iter_free(dbi); @@ -425,7 +425,7 @@ static void coroutine_fn backup_run(void *opaque) qemu_co_rwlock_init(&job->flush_rwlock); nb_clusters = DIV_ROUND_UP(job->len, job->cluster_size); - block_job_progress_set_remaining(&job->common, job->len); + job_progress_set_remaining(&job->common.job, job->len); job->copy_bitmap = hbitmap_alloc(nb_clusters, 0); if (job->sync_mode == MIRROR_SYNC_MODE_INCREMENTAL) { |