[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/9] net: Move error reporting from net_init_client/n
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL 1/9] net: Move error reporting from net_init_client/netdev to the calling site |
Date: |
Mon, 5 Mar 2018 11:11:56 +0800 |
From: Thomas Huth <address@hidden>
It looks strange that net_init_client() and net_init_netdev() both
take an "Error **errp" parameter, but then do the error reporting
with "error_report_err(local_err)" on their own. Let's move the
error reporting to the calling site instead to simplify this code
a little bit.
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
include/net/net.h | 2 +-
net/net.c | 29 +++++------------------------
vl.c | 3 ++-
3 files changed, 8 insertions(+), 26 deletions(-)
diff --git a/include/net/net.h b/include/net/net.h
index 3fc48e4..bdd4d9f 100644
--- a/include/net/net.h
+++ b/include/net/net.h
@@ -206,7 +206,7 @@ extern const char *legacy_bootp_filename;
int net_client_init(QemuOpts *opts, bool is_netdev, Error **errp);
int net_client_parse(QemuOptsList *opts_list, const char *str);
-int net_init_clients(void);
+int net_init_clients(Error **errp);
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 7d42925..e213a61 100644
--- a/net/net.c
+++ b/net/net.c
@@ -1520,46 +1520,27 @@ void net_check_clients(void)
static int net_init_client(void *dummy, QemuOpts *opts, Error **errp)
{
- Error *local_err = NULL;
-
- net_client_init(opts, false, &local_err);
- if (local_err) {
- error_report_err(local_err);
- return -1;
- }
-
- return 0;
+ return net_client_init(opts, false, errp);
}
static int net_init_netdev(void *dummy, QemuOpts *opts, Error **errp)
{
- Error *local_err = NULL;
- int ret;
-
- ret = net_client_init(opts, true, &local_err);
- if (local_err) {
- error_report_err(local_err);
- return -1;
- }
-
- return ret;
+ return net_client_init(opts, true, errp);
}
-int net_init_clients(void)
+int net_init_clients(Error **errp)
{
- QemuOptsList *net = qemu_find_opts("net");
-
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, NULL)) {
+ net_init_netdev, NULL, errp)) {
return -1;
}
- if (qemu_opts_foreach(net, net_init_client, NULL, NULL)) {
+ if (qemu_opts_foreach(qemu_find_opts("net"), net_init_client, NULL, errp))
{
return -1;
}
diff --git a/vl.c b/vl.c
index a33ac00..1931621 100644
--- a/vl.c
+++ b/vl.c
@@ -4489,7 +4489,8 @@ int main(int argc, char **argv, char **envp)
colo_info_init();
- if (net_init_clients() < 0) {
+ if (net_init_clients(&err) < 0) {
+ error_report_err(err);
exit(1);
}
--
2.7.4
- [Qemu-devel] [PULL 0/9] Net patches, Jason Wang, 2018/03/04
- [Qemu-devel] [PULL 2/9] net: List available netdevs with "-netdev help", Jason Wang, 2018/03/04
- [Qemu-devel] [PULL 1/9] net: Move error reporting from net_init_client/netdev to the calling site,
Jason Wang <=
- [Qemu-devel] [PULL 3/9] net: Only show vhost-user in the help text if CONFIG_POSIX is defined, Jason Wang, 2018/03/04
- [Qemu-devel] [PULL 4/9] net: Make net_client_init() static, Jason Wang, 2018/03/04
- [Qemu-devel] [PULL 5/9] net: Remove the deprecated way of dumping network packets, Jason Wang, 2018/03/04
- [Qemu-devel] [PULL 6/9] net: Remove the deprecated 'host_net_add' and 'host_net_remove' HMP commands, Jason Wang, 2018/03/04
- [Qemu-devel] [PULL 7/9] net: Add a new convenience option "--nic" to configure default/on-board NICs, Jason Wang, 2018/03/04
- [Qemu-devel] [PULL 8/9] hw/net: Remove unnecessary header includes, Jason Wang, 2018/03/04
- [Qemu-devel] [PULL 9/9] tap: setting error appropriately when calling net_init_tap_one(), Jason Wang, 2018/03/04
- Re: [Qemu-devel] [PULL 0/9] Net patches, Peter Maydell, 2018/03/05