diff options
author | Vladimir Sementsov-Ogievskiy | 2021-01-16 22:46:58 +0100 |
---|---|---|
committer | Max Reitz | 2021-01-26 14:36:37 +0100 |
commit | 511e7d31bf107aca331ab834f71c90267f803960 (patch) | |
tree | 673134f4ea8f097505c676a1afc6153834d6b066 | |
parent | block/block-copy: make progress_bytes_callback optional (diff) | |
download | qemu-511e7d31bf107aca331ab834f71c90267f803960.tar.gz qemu-511e7d31bf107aca331ab834f71c90267f803960.tar.xz qemu-511e7d31bf107aca331ab834f71c90267f803960.zip |
block/backup: drop extra gotos from backup_run()
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20210116214705.822267-17-vsementsov@virtuozzo.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
-rw-r--r-- | block/backup.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/block/backup.c b/block/backup.c index 5522c0f3fe..466608ee55 100644 --- a/block/backup.c +++ b/block/backup.c @@ -236,7 +236,7 @@ static void backup_init_bcs_bitmap(BackupBlockJob *job) static int coroutine_fn backup_run(Job *job, Error **errp) { BackupBlockJob *s = container_of(job, BackupBlockJob, common.job); - int ret = 0; + int ret; backup_init_bcs_bitmap(s); @@ -246,13 +246,12 @@ static int coroutine_fn backup_run(Job *job, Error **errp) for (offset = 0; offset < s->len; ) { if (yield_and_check(s)) { - ret = -ECANCELED; - goto out; + return -ECANCELED; } ret = block_copy_reset_unallocated(s->bcs, offset, &count); if (ret < 0) { - goto out; + return ret; } offset += count; @@ -273,11 +272,10 @@ static int coroutine_fn backup_run(Job *job, Error **errp) job_yield(job); } } else { - ret = backup_loop(s); + return backup_loop(s); } - out: - return ret; + return 0; } static const BlockJobDriver backup_job_driver = { |