[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v9 03/16] net: simplify net_client_parse() error management
From: |
David Gibson |
Subject: |
Re: [PATCH v9 03/16] net: simplify net_client_parse() error management |
Date: |
Wed, 28 Sep 2022 14:56:28 +1000 |
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
signature.asc
Description: PGP signature
- [PATCH v9 00/16] qapi: net: add unix socket type support to netdev backend, Laurent Vivier, 2022/09/26
- [PATCH v9 08/16] net: stream: add unix socket, Laurent Vivier, 2022/09/26
- [PATCH v9 06/16] net: socket: Don't ignore EINVAL on netdev socket connection, Laurent Vivier, 2022/09/26
- [PATCH v9 02/16] net: remove the @errp argument of net_client_inits(), Laurent Vivier, 2022/09/26
- [PATCH v9 07/16] net: stream: Don't ignore EINVAL on netdev socket connection, Laurent Vivier, 2022/09/26
- [PATCH v9 05/16] qapi: net: add stream and dgram netdevs, Laurent Vivier, 2022/09/26
- [PATCH v9 03/16] net: simplify net_client_parse() error management, Laurent Vivier, 2022/09/26
- Re: [PATCH v9 03/16] net: simplify net_client_parse() error management,
David Gibson <=
- [PATCH v9 04/16] qapi: net: introduce a way to bypass qemu_opts_parse_noisily(), Laurent Vivier, 2022/09/26
- [PATCH v9 14/16] net: stream: move to QIO to enable additional parameters, Laurent Vivier, 2022/09/26
- [PATCH v9 15/16] tests/qtest: netdev: test stream and dgram backends, Laurent Vivier, 2022/09/26
- [PATCH v9 13/16] qemu-sockets: update socket_uri() and socket_parse() to be consistent, Laurent Vivier, 2022/09/26
- [PATCH v9 11/16] net: dgram: add unix socket, Laurent Vivier, 2022/09/26
- [PATCH v9 01/16] net: introduce convert_host_port(), Laurent Vivier, 2022/09/26