[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 37/44] block/parallels: Simplify parallels_open() after previo
From: |
Markus Armbruster |
Subject: |
[PATCH v3 37/44] block/parallels: Simplify parallels_open() after previous commit |
Date: |
Mon, 6 Jul 2020 10:09:43 +0200 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
block/parallels.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/block/parallels.c b/block/parallels.c
index 180dd41e2b..cb5259ac44 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -842,6 +842,7 @@ static int parallels_open(BlockDriverState *bs, QDict
*options, int flags,
&local_err);
g_free(buf);
if (local_err != NULL) {
+ error_propagate(errp, local_err);
goto fail_options;
}
@@ -872,15 +873,11 @@ static int parallels_open(BlockDriverState *bs, QDict
*options, int flags,
fail_format:
error_setg(errp, "Image not in Parallels format");
+fail_options:
ret = -EINVAL;
fail:
qemu_vfree(s->header);
return ret;
-
-fail_options:
- error_propagate(errp, local_err);
- ret = -EINVAL;
- goto fail;
}
--
2.26.2
- [PATCH v3 32/44] error: Avoid unnecessary error_propagate() after error_setg(), (continued)
- [PATCH v3 32/44] error: Avoid unnecessary error_propagate() after error_setg(), Markus Armbruster, 2020/07/06
- [PATCH v3 28/44] qom: Use returned bool to check for failure, manual part, Markus Armbruster, 2020/07/06
- [PATCH v3 35/44] error: Eliminate error_propagate() manually, Markus Armbruster, 2020/07/06
- [PATCH v3 25/44] qom: Put name parameter before value / visitor parameter, Markus Armbruster, 2020/07/06
- Re: [PATCH v3 00/44] Less clumsy error checking, Markus Armbruster, 2020/07/06
- [PATCH v3 43/44] qdev: Ignore Error objects where the return value suffices, Markus Armbruster, 2020/07/06
- [PATCH v3 42/44] qemu-img: Ignore Error objects where the return value suffices, Markus Armbruster, 2020/07/06
- [PATCH v3 37/44] block/parallels: Simplify parallels_open() after previous commit,
Markus Armbruster <=
- [PATCH v3 33/44] error: Eliminate error_propagate() with Coccinelle, part 1, Markus Armbruster, 2020/07/06