From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:51852) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S4YIG-0002WZ-UB for qemu-devel@nongnu.org; Mon, 05 Mar 2012 08:50:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S4YIB-0005gv-VA for qemu-devel@nongnu.org; Mon, 05 Mar 2012 08:49:40 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50830) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S4YIB-0005ek-Mz for qemu-devel@nongnu.org; Mon, 05 Mar 2012 08:49:35 -0500 Message-ID: <4F54C46C.8050305@redhat.com> Date: Mon, 05 Mar 2012 21:49:32 +0800 From: Amos Kong MIME-Version: 1.0 References: <20120305095934.3595.88531.stgit@dhcp-8-167.nay.redhat.com> <20120305100320.3595.6964.stgit@dhcp-8-167.nay.redhat.com> <4F54BED0.3040000@redhat.com> In-Reply-To: <4F54BED0.3040000@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 1/9] net: introduce tcp_server_start() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Orit Wasserman Cc: aliguori@us.ibm.com, kvm@vger.kernel.org, quintela@redhat.com, jasowang@redhat.com, qemu-devel@nongnu.org, laine@redhat.com On 05/03/12 21:25, Orit Wasserman wrote: > On 03/05/2012 12:03 PM, Amos Kong wrote: >> Introduce tcp_server_start() by moving original code in >> tcp_start_incoming_migration(). >> >> Signed-off-by: Amos Kong >> --- >> net.c | 27 +++++++++++++++++++++++++++ >> qemu_socket.h | 2 ++ >> 2 files changed, 29 insertions(+), 0 deletions(-) >> >> diff --git a/net.c b/net.c >> index c34474f..0260968 100644 >> --- a/net.c >> +++ b/net.c >> @@ -99,6 +99,33 @@ static int get_str_sep(char *buf, int buf_size, const char **pp, int sep) >> return 0; >> } >> >> +int tcp_server_start(const char *str, int *fd) >> +{ >> + int val, ret; >> + struct sockaddr_in saddr; >> + >> + if (parse_host_port(&saddr, str)< 0) { > > error message would be nice > >> + return -1; >> + } >> + >> + *fd = qemu_socket(PF_INET, SOCK_STREAM, 0); >> + if (fd< 0) { >> + perror("socket"); >> + return -1; >> + } > > this is actually net_socket_listen_init version > tcp_start_incoming_migration returns the error -socket_error(). > I prefer not to lose the errno. agree. > I know that when calling net_socket_listen_init for some unknown reason there is an explict check for -1 > " if (net_socket_listen_init(vlan, "socket", name, listen) == -1) {" > I think it is a good opportunity to change this check. nod. > > Orit >> + socket_set_nonblock(*fd); >> + >> + /* allow fast reuse */ >> + val = 1; >> + setsockopt(*fd, SOL_SOCKET, SO_REUSEADDR, (const char *)&val, sizeof(val)); >> + >> + ret = bind(*fd, (struct sockaddr *)&saddr, sizeof(saddr)); >> + if (ret< 0) { >> + closesocket(*fd); >> + } >> + return ret; >> +} >> + >> int parse_host_port(struct sockaddr_in *saddr, const char *str) >> { >> char buf[512]; >> diff --git a/qemu_socket.h b/qemu_socket.h >> index fe4cf6c..d612793 100644 >> --- a/qemu_socket.h >> +++ b/qemu_socket.h >> @@ -54,6 +54,8 @@ int unix_listen(const char *path, char *ostr, int olen); >> int unix_connect_opts(QemuOpts *opts); >> int unix_connect(const char *path); >> >> +int tcp_server_start(const char *str, int *fd); >> + >> /* Old, ipv4 only bits. Don't use for new code. */ >> int parse_host_port(struct sockaddr_in *saddr, const char *str); >> int socket_init(void); -- Amos.