OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

net: Fix hotplug with pci_add

Browse Source 
The correct model type wasn't getting added when hotplugging nics with
pci_add.

Testcase: start VM with default nic type. In the qemu_monitor:

(qemu) pci_add auto nic model=virtio

This results in a nic hot-plug of the same nic type as the default.

This was broken in 5294e2c774

Also changes the behaviour where no .init is defined for a
net_client_type. Previously, 0 was returned, which indicated the init
was successful and that 0 was the index into the nd_tables[] array.
Return -1, indicating unsuccessful init, in such a case.

Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Amit Shah 2010-06-08 21:13:58 +05:30 committed by Michael S. Tsirkin
parent 940cda94dc
commit 50e32ea8f3
1 changed files with 5 additions and 2 deletions
Show Stats 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++) { for (i = 0; net_client_types[i].type != NULL; i++) {
if (!strcmp(net_client_types[i].type, type)) { if (!strcmp(net_client_types[i].type, type)) {
VLANState *vlan = NULL; VLANState *vlan = NULL;
int ret;
if (qemu_opts_validate(opts, &net_client_types[i].desc[0]) == -1) { if (qemu_opts_validate(opts, &net_client_types[i].desc[0]) == -1) {
return -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); 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) {
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 */ /* TODO push error reporting into init() methods */
qerror_report(QERR_DEVICE_INIT_FAILED, type); qerror_report(QERR_DEVICE_INIT_FAILED, type);
return -1; return -1;
} }
} }
return 0; return ret;
} }
} }