diff options
author | Markus Armbruster <armbru@redhat.com> | 2020-07-07 18:06:03 +0200 |
---|---|---|
committer | Markus Armbruster <armbru@redhat.com> | 2020-07-10 15:18:08 +0200 |
commit | af175e85f92c870386ad74f466e29537b79611d3 (patch) | |
tree | a2b62ef63640b200b969ff3eb7c0a4c1fd0be013 /block/vpc.c | |
parent | 668f62ec621e4e2919fb7d4caa5d805764c5852d (diff) | |
download | qemu-af175e85f92c870386ad74f466e29537b79611d3.zip qemu-af175e85f92c870386ad74f466e29537b79611d3.tar.gz qemu-af175e85f92c870386ad74f466e29537b79611d3.tar.bz2 |
error: Eliminate error_propagate() with Coccinelle, part 2
When all we do with an Error we receive into a local variable is
propagating to somewhere else, we can just as well receive it there
right away. The previous commit did that with a Coccinelle script I
consider fairly trustworthy. This commit uses the same script with
the matching of return taken out, i.e. we convert
if (!foo(..., &err)) {
...
error_propagate(errp, err);
...
}
to
if (!foo(..., errp)) {
...
...
}
This is unsound: @err could still be read between afterwards. I don't
know how to express "no read of @err without an intervening write" in
Coccinelle. Instead, I manually double-checked for uses of @err.
Suboptimal line breaks tweaked manually. qdev_realize() simplified
further to placate scripts/checkpatch.pl.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200707160613.848843-36-armbru@redhat.com>
Diffstat (limited to 'block/vpc.c')
-rw-r--r-- | block/vpc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/block/vpc.c b/block/vpc.c index 04da71e..cfec15f 100644 --- a/block/vpc.c +++ b/block/vpc.c @@ -235,8 +235,7 @@ static int vpc_open(BlockDriverState *bs, QDict *options, int flags, } opts = qemu_opts_create(&vpc_runtime_opts, NULL, 0, &error_abort); - if (!qemu_opts_absorb_qdict(opts, options, &local_err)) { - error_propagate(errp, local_err); + if (!qemu_opts_absorb_qdict(opts, options, errp)) { ret = -EINVAL; goto fail; } |