diff options
| author | Markus Armbruster | 2020-07-07 18:06:06 +0200 |
|---|---|---|
| committer | Markus Armbruster | 2020-07-10 15:18:08 +0200 |
| commit | 4bc6d7ee0e95b879b7f4823b6e765cf9bf5845e7 (patch) | |
| tree | a2e66a7245a2141a0804141d89204cd4a49bd55c | |
| parent | error: Reduce unnecessary error propagation (diff) | |
| download | qemu-4bc6d7ee0e95b879b7f4823b6e765cf9bf5845e7.tar.gz qemu-4bc6d7ee0e95b879b7f4823b6e765cf9bf5845e7.tar.xz qemu-4bc6d7ee0e95b879b7f4823b6e765cf9bf5845e7.zip | |
block/parallels: Simplify parallels_open() after previous commit
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>
| -rw-r--r-- | block/parallels.c | 7 |
1 files 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; } |