On Tue, Sep 13, 2022 at 08:39:48AM +0200, Laurent Vivier wrote:
> 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
> Signed-off-by: Laurent Vivier
> Reviewed-by: Markus Armbruster
Reviewed-by: David Gibson
> ---
> include/net/net.h | 2 +-
> net/net.c | 20 +++-
> softmmu/vl.c | 2 +-
> 3 files changed, 9 insertions(+), 15 deletions(-)
>
> diff --git a/include/net/net.h b/include/net/net.h
> index 81d0b21defce..c1c34a58f849 100644
> --- a/include/net/net.h
> +++ b/include/net/net.h
> @@ -222,7 +222,7 @@ extern const char *host_net_devices[];
> /* from net.c */
> int net_client_parse(QemuOptsList *opts_list, const char *str);
> void show_netdevs(void);
> -int net_init_clients(Error **errp);
> +void net_init_clients(void);
> void net_check_clients(void);
> void net_cleanup(void);
> void hmp_host_net_add(Monitor *mon, const QDict *qdict);
> diff --git a/net/net.c b/net/net.c
> index d2288bd3a929..15958f881776 100644
> --- a/net/net.c
> +++ b/net/net.c
> @@ -1562,27 +1562,21 @@ out:
> return ret;
> }
>
> -int net_init_clients(Error **errp)
> +void net_init_clients(void)
> {
> net_change_state_entry =
> qemu_add_vm_change_state_handler(net_vm_change_state_handler, NULL);
>
> QTAILQ_INIT(&net_clients);
>
> -if (qemu_opts_foreach(qemu_find_opts("netdev"),
> - net_init_netdev, NULL, errp)) {
> -return -1;
> -}
> -
> -if (qemu_opts_foreach(qemu_find_opts("nic"), net_param_nic, NULL, errp))
> {
> -return -1;
> -}
> +qemu_opts_foreach(qemu_find_opts("netdev"), net_init_netdev, NULL,
> + &error_fatal);
>
> -if (qemu_opts_foreach(qemu_find_opts("net"), net_init_client, NULL,
> errp)) {
> -return -1;
> -}
> +qemu_opts_foreach(qemu_find_opts("nic"), net_param_nic, NULL,
> + &error_fatal);
>
> -return 0;
> +qemu_opts_foreach(qemu_find_opts("net"), net_init_client, NULL,
> + &error_fatal);
> }
>
> int net_client_parse(QemuOptsList *opts_list, const char *optarg)
> diff --git a/softmmu/vl.c b/softmmu/vl.c
> index dea4005e4791..1fe8b5c5a120 100644
> --- a/softmmu/vl.c
> +++ b/softmmu/vl.c
> @@ -1906,7 +1906,7 @@ static void qemu_create_late_backends(void)
> qtest_server_init(qtest_chrdev, qtest_log, &error_fatal);
> }
>
> -net_init_clients(&error_fatal);
> +net_init_clients();
>
> object_option_foreach_add(object_create_late);
>
--
David Gibson| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
