From patchwork Tue Mar 6 22:47:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amos Kong X-Patchwork-Id: 145046 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B1EEBB6FA2 for ; Wed, 7 Mar 2012 09:48:08 +1100 (EST) Received: from localhost ([::1]:44280 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S53As-0001ve-M4 for incoming@patchwork.ozlabs.org; Tue, 06 Mar 2012 17:48:06 -0500 Received: from eggs.gnu.org ([208.118.235.92]:44423) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S53Am-0001s6-Ct for qemu-devel@nongnu.org; Tue, 06 Mar 2012 17:48:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S53Ak-0005gH-JV for qemu-devel@nongnu.org; Tue, 06 Mar 2012 17:47:59 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49756) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S53Ak-0005gA-CO for qemu-devel@nongnu.org; Tue, 06 Mar 2012 17:47:58 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q26Mluf7011956 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 6 Mar 2012 17:47:56 -0500 Received: from dhcp-8-167.nay.redhat.com (dhcp-8-167.nay.redhat.com [10.66.8.167]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q26Mlrdv026833; Tue, 6 Mar 2012 17:47:54 -0500 To: aliguori@us.ibm.com, kvm@vger.kernel.org, quintela@redhat.com, jasowang@redhat.com, qemu-devel@nongnu.org, owasserm@redhat.com, laine@redhat.com From: Amos Kong Date: Wed, 07 Mar 2012 06:47:54 +0800 Message-ID: <20120306224754.24264.40437.stgit@dhcp-8-167.nay.redhat.com> In-Reply-To: <20120306224330.24264.9494.stgit@dhcp-8-167.nay.redhat.com> References: <20120306224330.24264.9494.stgit@dhcp-8-167.nay.redhat.com> User-Agent: StGit/0.15 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 2/9] net: use tcp_server_start() for tcp server creation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Use tcp_server_start in those two functions: tcp_start_incoming_migration() net_socket_listen_init() Signed-off-by: Amos Kong --- migration-tcp.c | 21 +++++---------------- net/socket.c | 23 +++-------------------- 2 files changed, 8 insertions(+), 36 deletions(-) diff --git a/migration-tcp.c b/migration-tcp.c index 35a5781..ecadd10 100644 --- a/migration-tcp.c +++ b/migration-tcp.c @@ -157,28 +157,17 @@ out2: int tcp_start_incoming_migration(const char *host_port) { - struct sockaddr_in addr; - int val; + int ret; int s; DPRINTF("Attempting to start an incoming migration\n"); - if (parse_host_port(&addr, host_port) < 0) { - fprintf(stderr, "invalid host/port combination: %s\n", host_port); - return -EINVAL; - } - - s = qemu_socket(PF_INET, SOCK_STREAM, 0); - if (s == -1) { - return -socket_error(); + ret = tcp_server_start(host_port, &s); + if (ret < 0) { + fprintf(stderr, "tcp_server_start: %s\n", strerror(-ret)); + return ret; } - val = 1; - setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (const char *)&val, sizeof(val)); - - if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) == -1) { - goto err; - } if (listen(s, 1) == -1) { goto err; } diff --git a/net/socket.c b/net/socket.c index 0bcf229..5feb3d2 100644 --- a/net/socket.c +++ b/net/socket.c @@ -403,31 +403,14 @@ static int net_socket_listen_init(VLANState *vlan, const char *host_str) { NetSocketListenState *s; - int fd, val, ret; - struct sockaddr_in saddr; - - if (parse_host_port(&saddr, host_str) < 0) - return -1; + int fd, ret; s = g_malloc0(sizeof(NetSocketListenState)); - fd = qemu_socket(PF_INET, SOCK_STREAM, 0); - if (fd < 0) { - perror("socket"); - g_free(s); - return -1; - } - 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)); + ret = tcp_server_start(host_str, &fd); if (ret < 0) { - perror("bind"); + error_report("tcp_server_start: %s", strerror(-ret)); g_free(s); - closesocket(fd); return -1; } ret = listen(fd, 0);