motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 08:13:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote branch 'mst/for_anthony' into staging

Browse source
This commit is contained in:
Anthony Liguori 2010-06-10 09:21:43 -05:00
commit 60a3992e75
2 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
net.c
View file

@ -1106,6 +1106,7 @@ int net_client_init(Monitor *mon, QemuOpts *opts, int is_netdev)
for (i = 0; net_client_types[i].type != NULL; i++) {
if (!strcmp(net_client_types[i].type, type)) {
VLANState *vlan = NULL;
int ret;
if (qemu_opts_validate(opts, &net_client_types[i].desc[0]) == -1) {
return -1;
@ -1118,14 +1119,16 @@ int net_client_init(Monitor *mon, QemuOpts *opts, int is_netdev)
vlan = qemu_find_vlan(qemu_opt_get_number(opts, "vlan", 0), 1);
}
ret = -1;
if (net_client_types[i].init) {
if (net_client_types[i].init(opts, mon, name, vlan) < 0) {
ret = net_client_types[i].init(opts, mon, name, vlan);
if (ret < 0) {
/* TODO push error reporting into init() methods */
qerror_report(QERR_DEVICE_INIT_FAILED, type);
return -1;
}
}
return 0;
return ret;
}
}