| Message ID | 1351762795-31934-1-git-send-email-lilei@linux.vnet.ibm.com |
|---|---|
| State | New |
| Headers | show |
On Thu, Nov 01, 2012 at 05:39:55PM +0800, Lei Li wrote: > 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 <lilei@linux.vnet.ibm.com> > --- > net/socket.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) Thanks, applied to the net tree: https://github.com/stefanha/qemu/commits/net I changed the commit message from 'fix bug in net_init_socket' to 'use "socket" model name for UDP sockets' to be more specific. Stefan
On 11/01/2012 06:05 PM, Stefan Hajnoczi wrote: > On Thu, Nov 01, 2012 at 05:39:55PM +0800, Lei Li wrote: >> 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 <lilei@linux.vnet.ibm.com> >> --- >> net/socket.c | 2 +- >> 1 files changed, 1 insertions(+), 1 deletions(-) > Thanks, applied to the net tree: > https://github.com/stefanha/qemu/commits/net > > I changed the commit message from 'fix bug in net_init_socket' to 'use > "socket" model name for UDP sockets' to be more specific. Sure, thanks. :) > > Stefan >
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; }
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 <lilei@linux.vnet.ibm.com> --- net/socket.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)