aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2020-07-07 18:06:06 +0200
committerMarkus Armbruster <armbru@redhat.com>2020-07-10 15:18:08 +0200
commit4bc6d7ee0e95b879b7f4823b6e765cf9bf5845e7 (patch)
treea2e66a7245a2141a0804141d89204cd4a49bd55c
parenta5f9b9df252d0dfb407178ef4c3769f78a64b2ff (diff)
downloadqemu-4bc6d7ee0e95b879b7f4823b6e765cf9bf5845e7.zip
qemu-4bc6d7ee0e95b879b7f4823b6e765cf9bf5845e7.tar.gz
qemu-4bc6d7ee0e95b879b7f4823b6e765cf9bf5845e7.tar.bz2
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.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/block/parallels.c b/block/parallels.c
index 180dd41..cb5259a 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;
}