From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=52870 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OM0wf-00024A-24 for qemu-devel@nongnu.org; Tue, 08 Jun 2010 11:42:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OM0we-0006Q5-08 for qemu-devel@nongnu.org; Tue, 08 Jun 2010 11:42:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:23112) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OM0wd-0006Pw-Nx for qemu-devel@nongnu.org; Tue, 08 Jun 2010 11:42:27 -0400 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o58FgQOD011132 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 8 Jun 2010 11:42:26 -0400 From: Amit Shah Date: Tue, 8 Jun 2010 21:13:58 +0530 Message-Id: <356ef9bdde008d695e7c75dd1566222d6160d4b6.1276011638.git.amit.shah@redhat.com> Subject: [Qemu-devel] [PATCH v2] net: Fix hotplug with pci_add List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu list Cc: Amit Shah , Juan Quintela , Gerd Hoffmann , Markus Armbruster 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 --- Sorry, v1 was a stale patch. v2: - Init 'ret' to -1, fixes compile err and added note in the commit msg explaining this. net.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/net.c b/net.c index efa8b3d..4cb93ed 100644 --- a/net.c +++ b/net.c @@ -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; } } -- 1.7.0.1