diff options
author | Amit Shah <amit.shah@redhat.com> | 2010-06-08 21:13:58 +0530 |
---|---|---|
committer | Michael S. Tsirkin <mst@redhat.com> | 2010-06-09 12:58:55 +0300 |
commit | 50e32ea8f31035877decc10f1075aa0e619e09cb (patch) | |
tree | 5d4b1a7c353857bcb22ac48e5e640bd4dfc8c16d | |
parent | 940cda94dc01e955b6008c47b782817a1ed3b201 (diff) | |
download | hqemu-50e32ea8f31035877decc10f1075aa0e619e09cb.zip hqemu-50e32ea8f31035877decc10f1075aa0e619e09cb.tar.gz |
net: Fix hotplug with pci_add
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 5294e2c774f120e10b44652ac143abda356f44eb
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>
-rw-r--r-- | net.c | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -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; } } |