[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/21] error: Convert net_client_init() to QError
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 12/21] error: Convert net_client_init() to QError |
Date: |
Mon, 5 Apr 2010 17:33:53 -0300 |
From: Markus Armbruster <address@hidden>
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>
Signed-off-by: Luiz Capitulino <address@hidden>
---
net.c | 38 ++++++++++++++++++--------------------
1 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/net.c b/net.c
index 28d106b..71c0828 100644
--- a/net.c
+++ b/net.c
@@ -1065,18 +1065,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 &&
@@ -1085,21 +1079,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;
}
}
@@ -1125,14 +1119,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.7.0.4.297.g6555b1
- [Qemu-devel] [PATCH 00/21][PULL]: QMP/Monitor queue, Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 07/21] error: New QERR_INVALID_PARAMETER_VALUE, Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 01/21] qdev: Convert qdev_unplug() to QError, Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 06/21] error: Convert qemu_opts_create() to QError, Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 04/21] error: Put error definitions back in alphabetical order, Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 12/21] error: Convert net_client_init() to QError,
Luiz Capitulino <=
- [Qemu-devel] [PATCH 20/21] QMP: Improve RTC_CHANGE event description, Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 17/21] monitor: Use argument type 'b' for set_link, Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 02/21] monitor: convert do_device_del() to QObject, QError, Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 15/21] monitor: Rename argument type 'b' to 'f', Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 09/21] error: Drop extra messages after qemu_opts_set() and qemu_opts_parse(), Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 05/21] error: New QERR_DUPLICATE_ID, Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 08/21] error: Convert qemu_opts_set() to QError, Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 16/21] monitor: New argument type 'b', Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 14/21] monitor: New commands netdev_add, netdev_del, Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 13/21] error: New QERR_DEVICE_IN_USE, Luiz Capitulino, 2010/04/05