[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 09/11] error: Convert net_client_init() to QError
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v3 09/11] error: Convert net_client_init() to QError |
Date: |
Thu, 25 Mar 2010 17:22:38 +0100 |
The conversion is shallow: client type init() methods aren't
converted. Converting them is a big job for relatively little
practical benefit, so leave it for later.
Signed-off-by: Markus Armbruster <address@hidden>
---
net.c | 38 ++++++++++++++++++--------------------
1 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/net.c b/net.c
index 9338f35..435997b 100644
--- a/net.c
+++ b/net.c
@@ -1057,18 +1057,12 @@ int net_client_init(Monitor *mon, QemuOpts *opts, int
is_netdev)
int i;
type = qemu_opt_get(opts, "type");
+ if (!type) {
+ qerror_report(QERR_MISSING_PARAMETER, "type");
+ return -1;
+ }
- if (!is_netdev) {
- if (!type) {
- error_report("No type specified for -net");
- return -1;
- }
- } else {
- if (!type) {
- error_report("No type specified for -netdev");
- return -1;
- }
-
+ if (is_netdev) {
if (strcmp(type, "tap") != 0 &&
#ifdef CONFIG_SLIRP
strcmp(type, "user") != 0 &&
@@ -1077,21 +1071,21 @@ int net_client_init(Monitor *mon, QemuOpts *opts, int
is_netdev)
strcmp(type, "vde") != 0 &&
#endif
strcmp(type, "socket") != 0) {
- error_report("The '%s' network backend type is not valid with
-netdev",
- type);
+ qerror_report(QERR_INVALID_PARAMETER_VALUE, "type",
+ "a netdev backend type");
return -1;
}
if (qemu_opt_get(opts, "vlan")) {
- error_report("The 'vlan' parameter is not valid with -netdev");
+ qerror_report(QERR_INVALID_PARAMETER, "vlan");
return -1;
}
if (qemu_opt_get(opts, "name")) {
- error_report("The 'name' parameter is not valid with -netdev");
+ qerror_report(QERR_INVALID_PARAMETER, "name");
return -1;
}
if (!qemu_opts_id(opts)) {
- error_report("The id= parameter is required with -netdev");
+ qerror_report(QERR_MISSING_PARAMETER, "id");
return -1;
}
}
@@ -1117,14 +1111,18 @@ int net_client_init(Monitor *mon, QemuOpts *opts, int
is_netdev)
}
if (net_client_types[i].init) {
- return net_client_types[i].init(opts, mon, name, vlan);
- } else {
- return 0;
+ if (net_client_types[i].init(opts, mon, name, vlan) < 0) {
+ /* TODO push error reporting into init() methods */
+ qerror_report(QERR_DEVICE_INIT_FAILED, type);
+ return -1;
+ }
}
+ return 0;
}
}
- error_report("Invalid -net type '%s'", type);
+ qerror_report(QERR_INVALID_PARAMETER_VALUE, "type",
+ "a network client type");
return -1;
}
--
1.6.6.1
- [Qemu-devel] [PATCH v3 04/11] error: New QERR_INVALID_PARAMETER_VALUE, (continued)
- [Qemu-devel] [PATCH v3 04/11] error: New QERR_INVALID_PARAMETER_VALUE, Markus Armbruster, 2010/03/25
- [Qemu-devel] [PATCH v3 02/11] error: New QERR_DUPLICATE_ID, Markus Armbruster, 2010/03/25
- [Qemu-devel] [PATCH v3 03/11] error: Convert qemu_opts_create() to QError, Markus Armbruster, 2010/03/25
- [Qemu-devel] [PATCH v3 01/11] error: Put error definitions back in alphabetical order, Markus Armbruster, 2010/03/25
- [Qemu-devel] [PATCH v3 07/11] error: Use QERR_INVALID_PARAMETER_VALUE instead of QERR_INVALID_PARAMETER, Markus Armbruster, 2010/03/25
- [Qemu-devel] [PATCH v3 08/11] error: Convert qemu_opts_validate() to QError, Markus Armbruster, 2010/03/25
- [Qemu-devel] [PATCH v3 10/11] error: New QERR_DEVICE_IN_USE, Markus Armbruster, 2010/03/25
- [Qemu-devel] [PATCH v3 05/11] error: Convert qemu_opts_set() to QError, Markus Armbruster, 2010/03/25
- [Qemu-devel] [PATCH v3 11/11] monitor: New commands netdev_add, netdev_del, Markus Armbruster, 2010/03/25
- [Qemu-devel] [PATCH v3 06/11] error: Drop extra messages after qemu_opts_set() and qemu_opts_parse(), Markus Armbruster, 2010/03/25
- [Qemu-devel] [PATCH v3 09/11] error: Convert net_client_init() to QError,
Markus Armbruster <=
- [Qemu-devel] Re: [PATCH v3 00/11] monitor: New commands netdev_add, netdev_del, Luiz Capitulino, 2010/03/25