[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 38/45] block/parallels: Simplify parallels_open() after previo
From: |
Markus Armbruster |
Subject: |
[PATCH v4 38/45] block/parallels: Simplify parallels_open() after previous commit |
Date: |
Tue, 7 Jul 2020 18:06:06 +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 v4 11/45] qemu-option: Factor out helper opt_create(), (continued)
- [PATCH v4 11/45] qemu-option: Factor out helper opt_create(), Markus Armbruster, 2020/07/07
- [PATCH v4 08/45] qemu-option: Make uses of find_desc_by_name() more similar, Markus Armbruster, 2020/07/07
- [PATCH v4 04/45] qdev: Use returned bool to check for qdev_realize() etc. failure, Markus Armbruster, 2020/07/07
- [PATCH v4 20/45] s390x/pci: Fix harmless mistake in zpci's property fid's setter, Markus Armbruster, 2020/07/07
- [PATCH v4 15/45] block: Avoid error accumulation in bdrv_img_create(), Markus Armbruster, 2020/07/07
- [PATCH v4 10/45] qemu-option: Simplify around find_default_by_name(), Markus Armbruster, 2020/07/07
- [PATCH v4 09/45] qemu-option: Factor out helper find_default_by_name(), Markus Armbruster, 2020/07/07
- [PATCH v4 06/45] virtio-crypto-pci: Tidy up virtio_crypto_pci_realize(), Markus Armbruster, 2020/07/07
- [PATCH v4 23/45] qom: Crash more nicely on object_property_get_link() failure, Markus Armbruster, 2020/07/07
- [PATCH v4 18/45] qapi: Use returned bool to check for failure, Coccinelle part, Markus Armbruster, 2020/07/07
- [PATCH v4 38/45] block/parallels: Simplify parallels_open() after previous commit,
Markus Armbruster <=
- [PATCH v4 13/45] qemu-option: Make functions taking Error ** return bool, not void, Markus Armbruster, 2020/07/07
- [PATCH v4 07/45] qemu-option: Check return value instead of @err where convenient, Markus Armbruster, 2020/07/07
- [PATCH v4 14/45] qemu-option: Use returned bool to check for failure, Markus Armbruster, 2020/07/07
- [PATCH v4 32/45] qdev: Use returned bool to check for failure, Coccinelle part, Markus Armbruster, 2020/07/07
- [PATCH v4 19/45] qapi: Use returned bool to check for failure, manual part, Markus Armbruster, 2020/07/07
- [PATCH v4 30/45] qom: Make functions taking Error ** return bool, not 0/-1, Markus Armbruster, 2020/07/07
- [PATCH v4 31/45] qdev: Make functions taking Error ** return bool, not void, Markus Armbruster, 2020/07/07
- [PATCH v4 24/45] qom: Don't handle impossible object_property_get_link() failure, Markus Armbruster, 2020/07/07
- [PATCH v4 42/45] error: Avoid error_propagate() after migrate_add_blocker(), Markus Armbruster, 2020/07/07
- [PATCH v4 29/45] qom: Use returned bool to check for failure, manual part, Markus Armbruster, 2020/07/07