From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:37970) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTrGi-0006BL-UD for qemu-devel@nongnu.org; Thu, 01 Nov 2012 05:40:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TTrGh-0008Jx-GM for qemu-devel@nongnu.org; Thu, 01 Nov 2012 05:40:56 -0400 Received: from e23smtp07.au.ibm.com ([202.81.31.140]:47085) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTrGg-0008Jb-Uc for qemu-devel@nongnu.org; Thu, 01 Nov 2012 05:40:55 -0400 Received: from /spool/local by e23smtp07.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 1 Nov 2012 19:37:15 +1000 Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id qA19UVa06226238 for ; Thu, 1 Nov 2012 20:30:31 +1100 Received: from d23av01.au.ibm.com (loopback [127.0.0.1]) by d23av01.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id qA19elAf016230 for ; Thu, 1 Nov 2012 20:40:47 +1100 From: Lei Li Date: Thu, 1 Nov 2012 17:39:55 +0800 Message-Id: <1351762795-31934-1-git-send-email-lilei@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH] net: fix bug in net_init_socket List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Lei Li Fix the problem that can not delete the udp socket. It's caused by passing "udp" model to net_socket_udp_init, but we do not have "udp" model in our model list. Pass the right model "socket" to init function. https://bugs.launchpad.net/qemu/+bug/1073585?comments=all Signed-off-by: Lei Li --- net/socket.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/net/socket.c b/net/socket.c index b75d567..c01323d 100644 --- a/net/socket.c +++ b/net/socket.c @@ -747,7 +747,7 @@ int net_init_socket(const NetClientOptions *opts, const char *name, error_report("localaddr= is mandatory with udp="); return -1; } - if (net_socket_udp_init(peer, "udp", name, sock->udp, sock->localaddr) == + if (net_socket_udp_init(peer, "socket", name, sock->udp, sock->localaddr) == -1) { return -1; } -- 1.7.7.6