mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: remove the @errp argument of net_client_inits()

Browse Source 
The only caller passes &error_fatal, so use this directly in the function.

It's what we do for -blockdev, -device, and -object.

Suggested-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
Laurent Vivier 2022-10-21 11:09:07 +02:00 committed by Jason Wang
parent 30e4226b78
commit d63ef17bfc
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/net.h
View File

@ -222,7 +222,7 @@ extern const char *host_net_devices[];
/* from net.c */ /* from net.c */
int net_client_parse(QemuOptsList *opts_list, const char *str); int net_client_parse(QemuOptsList *opts_list, const char *str);
void show_netdevs(void); void show_netdevs(void);
int net_init_clients(Error **errp); void net_init_clients(void);
void net_check_clients(void); void net_check_clients(void);
void net_cleanup(void); void net_cleanup(void);
void hmp_host_net_add(Monitor *mon, const QDict *qdict); void hmp_host_net_add(Monitor *mon, const QDict *qdict);

20
net/net.c
View File

@ -1566,27 +1566,21 @@ out:
return ret; return ret;
} }
int net_init_clients(Error **errp) void net_init_clients(void)
{ {
net_change_state_entry = net_change_state_entry =
qemu_add_vm_change_state_handler(net_vm_change_state_handler, NULL); qemu_add_vm_change_state_handler(net_vm_change_state_handler, NULL);
QTAILQ_INIT(&net_clients); QTAILQ_INIT(&net_clients);
if (qemu_opts_foreach(qemu_find_opts("netdev"), qemu_opts_foreach(qemu_find_opts("netdev"), net_init_netdev, NULL,
net_init_netdev, NULL, errp)) { &error_fatal);
return -1;
}
if (qemu_opts_foreach(qemu_find_opts("nic"), net_param_nic, NULL, errp)) { qemu_opts_foreach(qemu_find_opts("nic"), net_param_nic, NULL,
return -1; &error_fatal);
}
if (qemu_opts_foreach(qemu_find_opts("net"), net_init_client, NULL, errp)) { qemu_opts_foreach(qemu_find_opts("net"), net_init_client, NULL,
return -1; &error_fatal);
}
return 0;
} }
int net_client_parse(QemuOptsList *opts_list, const char *optarg) int net_client_parse(QemuOptsList *opts_list, const char *optarg)

2
softmmu/vl.c
View File

@ -1904,7 +1904,7 @@ static void qemu_create_late_backends(void)
qtest_server_init(qtest_chrdev, qtest_log, &error_fatal); qtest_server_init(qtest_chrdev, qtest_log, &error_fatal);
} }
net_init_clients(&error_fatal); net_init_clients();
object_option_foreach_add(object_create_late); object_option_foreach_add(object_create_late);