motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-12-17 21:26:13 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

qapi: Use returned bool to check for failure, manual part

Browse source 
The previous commit used Coccinelle to convert from checking the Error
object to checking the return value.  Convert a few more manually.
Also tweak control flow in places to conform to the conventional "if
error bail out" pattern.

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-20-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2020-07-07 18:05:47 +02:00
parent 62a35aaa31
commit 14217038bc
9 changed files with 44 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

8
net/net.c
View file

@ -1062,7 +1062,6 @@ static int net_client_init(QemuOpts *opts, bool is_netdev, Error **errp)
{
gchar **substrings = NULL;
Netdev *object = NULL;
Error *err = NULL;
int ret = -1;
Visitor *v = opts_visitor_new(opts);
@ -1110,16 +1109,13 @@ static int net_client_init(QemuOpts *opts, bool is_netdev, Error **errp)
qemu_opts_set_id(opts, g_strdup_printf("__org.qemu.net%i", idx++));
}
visit_type_Netdev(v, NULL, &object, &err);
if (!err) {
ret = net_client_init1(object, is_netdev, &err);
if (visit_type_Netdev(v, NULL, &object, errp)) {
ret = net_client_init1(object, is_netdev, errp);
}
qapi_free_Netdev(object);
out:
error_propagate(errp, err);
g_strfreev(substrings);
visit_free(v);
return ret;