mirrors
/
qemu
mirror of https://gitlab.com/qemu-project/qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2021-01-17 00:46:58 +03:00 committed by Max Reitz
parent d51590fc3e
commit 511e7d31bf
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
block/backup.c
View File

@ -236,7 +236,7 @@ static void backup_init_bcs_bitmap(BackupBlockJob *job)
static int coroutine_fn backup_run(Job *job, Error **errp) static int coroutine_fn backup_run(Job *job, Error **errp)
{ {
BackupBlockJob *s = container_of(job, BackupBlockJob, common.job); BackupBlockJob *s = container_of(job, BackupBlockJob, common.job);
int ret = 0; int ret;
backup_init_bcs_bitmap(s); 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; ) { for (offset = 0; offset < s->len; ) {
if (yield_and_check(s)) { if (yield_and_check(s)) {
ret = -ECANCELED; return -ECANCELED;
goto out;
} }
ret = block_copy_reset_unallocated(s->bcs, offset, &count); ret = block_copy_reset_unallocated(s->bcs, offset, &count);
if (ret < 0) { if (ret < 0) {
goto out; return ret;
} }
offset += count; offset += count;
@ -273,11 +272,10 @@ static int coroutine_fn backup_run(Job *job, Error **errp)
job_yield(job); job_yield(job);
} }
} else { } else {
ret = backup_loop(s); return backup_loop(s);
} }
out: return 0;
return ret;
} }
static const BlockJobDriver backup_job_driver = { static const BlockJobDriver backup_job_driver = {