[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 38/53] block/parallels: Simplify parallels_open() after previous c
From: |
Markus Armbruster |
Subject: |
[PULL 38/53] block/parallels: Simplify parallels_open() after previous commit |
Date: |
Tue, 7 Jul 2020 23:24:48 +0200 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200707160613.848843-39-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 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
- [PULL 00/53] Error reporting patches patches for 2020-07-07, Markus Armbruster, 2020/07/08
- [PULL 50/53] fw_cfg: Use ERRP_GUARD(), Markus Armbruster, 2020/07/08
- [PULL 02/53] error: Improve error.h's big comment, Markus Armbruster, 2020/07/08
- [PULL 38/53] block/parallels: Simplify parallels_open() after previous commit,
Markus Armbruster <=
- [PULL 08/53] qemu-option: Make uses of find_desc_by_name() more similar, Markus Armbruster, 2020/07/08
- [PULL 04/53] qdev: Use returned bool to check for qdev_realize() etc. failure, Markus Armbruster, 2020/07/08
- [PULL 07/53] qemu-option: Check return value instead of @err where convenient, Markus Armbruster, 2020/07/08
- [PULL 32/53] qdev: Use returned bool to check for failure, Coccinelle part, Markus Armbruster, 2020/07/08
- [PULL 06/53] virtio-crypto-pci: Tidy up virtio_crypto_pci_realize(), Markus Armbruster, 2020/07/08
- [PULL 44/53] qdev: Ignore Error objects where the return value suffices, Markus Armbruster, 2020/07/08
- [PULL 52/53] nbd: Use ERRP_GUARD(), Markus Armbruster, 2020/07/08
- [PULL 27/53] qom: Make functions taking Error ** return bool, not void, Markus Armbruster, 2020/07/08
- [PULL 09/53] qemu-option: Factor out helper find_default_by_name(), Markus Armbruster, 2020/07/08
- [PULL 25/53] qom: Use return values to check for error where that's simpler, Markus Armbruster, 2020/07/08