sim-card
/
qemu
Archived
10
0
Fork 0
Code Releases Activity

error: Convert net_client_init() to QError 

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 <armbru@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
Markus Armbruster 2010-03-25 17:22:38 +01:00 committed by Aurelien Jarno
parent db716e9c16
commit 5294e2c774
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
net.c
View File

@ -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;
}