mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-06 09:13:55 -06:00
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>
This commit is contained in:
parent
668f62ec62
commit
af175e85f9
23 changed files with 32 additions and 77 deletions
|
@ -836,9 +836,8 @@ int net_init_tap(const Netdev *netdev, const char *name,
|
|||
}
|
||||
|
||||
for (i = 0; i < nfds; i++) {
|
||||
fd = monitor_fd_param(cur_mon, fds[i], &err);
|
||||
fd = monitor_fd_param(cur_mon, fds[i], errp);
|
||||
if (fd == -1) {
|
||||
error_propagate(errp, err);
|
||||
ret = -1;
|
||||
goto free_fail;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue