diff options
| author | Laurent Vivier | 2022-10-21 11:09:08 +0200 |
|---|---|---|
| committer | Jason Wang | 2022-10-28 07:28:52 +0200 |
| commit | 21fccb2cbbacdc045f19605915e847de31ca9862 (patch) | |
| tree | e8c5b73130b820a6713e0c21ed57cea2b72caf92 | |
| parent | net: remove the @errp argument of net_client_inits() (diff) | |
| download | qemu-21fccb2cbbacdc045f19605915e847de31ca9862.tar.gz qemu-21fccb2cbbacdc045f19605915e847de31ca9862.tar.xz qemu-21fccb2cbbacdc045f19605915e847de31ca9862.zip | |
net: simplify net_client_parse() error management
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>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
| -rw-r--r-- | include/net/net.h | 2 | ||||
| -rw-r--r-- | net/net.c | 6 | ||||
| -rw-r--r-- | softmmu/vl.c | 12 |
3 files changed, 6 insertions, 14 deletions
diff --git a/include/net/net.h b/include/net/net.h index c1c34a58f8..55023e7e9f 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); @@ -1583,13 +1583,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 a4ae131e4d..e69aa43de4 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -2801,21 +2801,15 @@ void qemu_init(int argc, char **argv) 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: |