mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

block/stream: refactor stream_run: drop goto

Browse Source 
The goto is unnecessary in the stream_run() since the common exit
code was removed in the commit eb23654dbe:
"jobs: utilize job_exit shim".

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 1559152576-281803-3-git-send-email-andrey.shinkevich@virtuozzo.com
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Andrey Shinkevich 2019-05-29 20:56:15 +03:00 committed by Max Reitz
parent 170d3bd341
commit 96a07d5bf4
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
block/stream.c
View File

@ -120,13 +120,12 @@ static int coroutine_fn stream_run(Job *job, Error **errp)
void *buf; void *buf;
if (!bs->backing) { if (!bs->backing) {
goto out; return 0;
} }
len = bdrv_getlength(bs); len = bdrv_getlength(bs);
if (len < 0) { if (len < 0) {
ret = len; return len;
goto out;
} }
job_progress_set_remaining(&s->common.job, len); job_progress_set_remaining(&s->common.job, len);
@ -203,14 +202,10 @@ static int coroutine_fn stream_run(Job *job, Error **errp)
bdrv_disable_copy_on_read(bs); bdrv_disable_copy_on_read(bs);
} }
/* Do not remove the backing file if an error was there but ignored. */
ret = error;
qemu_vfree(buf); qemu_vfree(buf);
out: /* Do not remove the backing file if an error was there but ignored. */
/* Modify backing chain and close BDSes in main loop */ return error;
return ret;
} }
static const BlockJobDriver stream_job_driver = { static const BlockJobDriver stream_job_driver = {