On Mon, Sep 26, 2022 at 09:50:35PM +0200, Laurent Vivier wrote:
> All net_client_parse() callers exit in case of error.
>
> Move exit(1) to net_client_parse() and remove error checking from
> the callers.
>
> 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>
> ---
> include/net/net.h | 2 +-
> net/net.c | 6 ++----
> softmmu/vl.c | 12 +++---------
> 3 files changed, 6 insertions(+), 14 deletions(-)
>
> diff --git a/include/net/net.h b/include/net/net.h
> index c1c34a58f849..55023e7e9fa9 100644
> --- a/include/net/net.h
> +++ b/include/net/net.h
> @@ -220,7 +220,7 @@ extern NICInfo nd_table[MAX_NICS];
> extern const char *host_net_devices[];
>
> /* from net.c */
> -int net_client_parse(QemuOptsList *opts_list, const char *str);
> +void net_client_parse(QemuOptsList *opts_list, const char *str);
> void show_netdevs(void);
> void net_init_clients(void);
> void net_check_clients(void);
> diff --git a/net/net.c b/net/net.c
> index 15958f881776..f056e8aebfb2 100644
> --- a/net/net.c
> +++ b/net/net.c
> @@ -1579,13 +1579,11 @@ void net_init_clients(void)
> &error_fatal);
> }
>
> -int net_client_parse(QemuOptsList *opts_list, const char *optarg)
> +void net_client_parse(QemuOptsList *opts_list, const char *optarg)
> {
> if (!qemu_opts_parse_noisily(opts_list, optarg, true)) {
> - return -1;
> + exit(1);
> }
> -
> - return 0;
> }
>
> /* From FreeBSD */
> diff --git a/softmmu/vl.c b/softmmu/vl.c
> index b172134a62cb..f71fca2a9f73 100644
> --- a/softmmu/vl.c
> +++ b/softmmu/vl.c
> @@ -2809,21 +2809,15 @@ void qemu_init(int argc, char **argv, char **envp)
> break;
> case QEMU_OPTION_netdev:
> default_net = 0;
> - if (net_client_parse(qemu_find_opts("netdev"), optarg) == -1) {
> - exit(1);
> - }
> + net_client_parse(qemu_find_opts("netdev"), optarg);
> break;
> case QEMU_OPTION_nic:
> default_net = 0;
> - if (net_client_parse(qemu_find_opts("nic"), optarg) == -1) {
> - exit(1);
> - }
> + net_client_parse(qemu_find_opts("nic"), optarg);
> break;
> case QEMU_OPTION_net:
> default_net = 0;
> - if (net_client_parse(qemu_find_opts("net"), optarg) == -1) {
> - exit(1);
> - }
> + net_client_parse(qemu_find_opts("net"), optarg);
> break;
> #ifdef CONFIG_LIBISCSI
> case QEMU_OPTION_iscsi:
--
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