[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 3/4] block/stream: refactor stream_run: drop goto
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PULL 3/4] block/stream: refactor stream_run: drop goto |
Date: |
Tue, 2 Jul 2019 04:39:04 +0200 |
From: Andrey Shinkevich <address@hidden>
The goto is unnecessary in the stream_run() since the common exit
code was removed in the commit eb23654dbe43b549ea2a9ebff9d8e:
"jobs: utilize job_exit shim".
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Signed-off-by: Andrey Shinkevich <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Message-id: address@hidden
Reviewed-by: Max Reitz <address@hidden>
Signed-off-by: Max Reitz <address@hidden>
---
block/stream.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/block/stream.c b/block/stream.c
index 97fddb2608..65b13b27e0 100644
--- a/block/stream.c
+++ b/block/stream.c
@@ -120,13 +120,12 @@ static int coroutine_fn stream_run(Job *job, Error **errp)
void *buf;
if (!bs->backing) {
- goto out;
+ return 0;
}
len = bdrv_getlength(bs);
if (len < 0) {
- ret = len;
- goto out;
+ return 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);
}
- /* Do not remove the backing file if an error was there but ignored. */
- ret = error;
-
qemu_vfree(buf);
-out:
- /* Modify backing chain and close BDSes in main loop */
- return ret;
+ /* Do not remove the backing file if an error was there but ignored. */
+ return error;
}
static const BlockJobDriver stream_job_driver = {
--
2.21.0
- [Qemu-devel] [PULL 0/4] Block patches for rc0, Max Reitz, 2019/07/01
- [Qemu-devel] [PULL 1/4] block/rbd: increase dynamically the image size, Max Reitz, 2019/07/01
- [Qemu-devel] [PULL 2/4] block: include base when checking image chain for block allocation, Max Reitz, 2019/07/01
- [Qemu-devel] [PULL 4/4] block/stream: introduce a bottom node, Max Reitz, 2019/07/01
- [Qemu-devel] [PULL 3/4] block/stream: refactor stream_run: drop goto,
Max Reitz <=
- Re: [Qemu-devel] [PULL 0/4] Block patches for rc0, Max Reitz, 2019/07/02
- Re: [Qemu-devel] [PULL 0/4] Block patches for rc0, Peter Maydell, 2019/07/02