[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 28/46] block/parallels: Simplify parallels_open() after previous
From: |
Markus Armbruster |
Subject: |
[PATCH 28/46] block/parallels: Simplify parallels_open() after previous commit |
Date: |
Wed, 24 Jun 2020 18:43:26 +0200 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
block/parallels.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/block/parallels.c b/block/parallels.c
index 9e85ab995e..3c22dfdc9d 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -839,6 +839,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;
}
@@ -868,15 +869,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
- Re: [PATCH 34/46] qom: Don't handle impossible object_property_get_link() failure, (continued)
- [PATCH 11/46] qemu-option: Make uses of find_desc_by_name() more similar, Markus Armbruster, 2020/06/24
- [PATCH 16/46] qemu-option: Make functions taking Error ** return bool, not void, Markus Armbruster, 2020/06/24
- [PATCH 28/46] block/parallels: Simplify parallels_open() after previous commit,
Markus Armbruster <=
- [PATCH 45/46] qdev: Ignore Error objects where the return value suffices, Markus Armbruster, 2020/06/24
- [PATCH 46/46] hmp: Ignore Error objects where the return value suffices, Markus Armbruster, 2020/06/24
- [PATCH 32/46] qom: Rename qdev_get_type() to object_get_type(), Markus Armbruster, 2020/06/24
- [PATCH 21/46] hmp: Eliminate a variable in hmp_migrate_set_parameter(), Markus Armbruster, 2020/06/24