ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Laurent Vivier 2022-10-21 11:09:08 +02:00 committed by Jason Wang
parent d63ef17bfc
commit 21fccb2cbb
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/net.h
View File

@ -220,7 +220,7 @@ extern NICInfo nd_table[MAX_NICS];
extern const char *host_net_devices[]; extern const char *host_net_devices[];
/* from net.c */ /* 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 show_netdevs(void);
void net_init_clients(void); void net_init_clients(void);
void net_check_clients(void); void net_check_clients(void);

6
net/net.c
View File

@ -1583,13 +1583,11 @@ void net_init_clients(void)
&error_fatal); &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)) { if (!qemu_opts_parse_noisily(opts_list, optarg, true)) {
return -1; exit(1);
} }
return 0;
} }
/* From FreeBSD */ /* From FreeBSD */

12
softmmu/vl.c
View File

@ -2801,21 +2801,15 @@ void qemu_init(int argc, char **argv)
break; break;
case QEMU_OPTION_netdev: case QEMU_OPTION_netdev:
default_net = 0; default_net = 0;
if (net_client_parse(qemu_find_opts("netdev"), optarg) == -1) { net_client_parse(qemu_find_opts("netdev"), optarg);
exit(1);
}
break; break;
case QEMU_OPTION_nic: case QEMU_OPTION_nic:
default_net = 0; default_net = 0;
if (net_client_parse(qemu_find_opts("nic"), optarg) == -1) { net_client_parse(qemu_find_opts("nic"), optarg);
exit(1);
}
break; break;
case QEMU_OPTION_net: case QEMU_OPTION_net:
default_net = 0; default_net = 0;
if (net_client_parse(qemu_find_opts("net"), optarg) == -1) { net_client_parse(qemu_find_opts("net"), optarg);
exit(1);
}
break; break;
#ifdef CONFIG_LIBISCSI #ifdef CONFIG_LIBISCSI
case QEMU_OPTION_iscsi: case QEMU_OPTION_iscsi: