From patchwork Mon Mar 19 14:12:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amos Kong X-Patchwork-Id: 147531 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 EB244B6EEC for ; Tue, 20 Mar 2012 01:14:16 +1100 (EST) Received: from localhost ([::1]:41625 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S9dLi-0005yi-Pt for incoming@patchwork.ozlabs.org; Mon, 19 Mar 2012 10:14:14 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37735) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S9dKX-0004zm-OP for qemu-devel@nongnu.org; Mon, 19 Mar 2012 10:14:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S9dJg-0004XX-SH for qemu-devel@nongnu.org; Mon, 19 Mar 2012 10:13:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:27346) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S9dJg-0004Wl-Jp for qemu-devel@nongnu.org; Mon, 19 Mar 2012 10:12:08 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q2JEC58x008734 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 19 Mar 2012 10:12:06 -0400 Received: from dhcp-8-167.nay.redhat.com (dhcp-8-167.nay.redhat.com [10.66.8.167]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q2JEC2fa012993; Mon, 19 Mar 2012 10:12:03 -0400 To: aliguori@us.ibm.com, kvm@vger.kernel.org, quintela@redhat.com, jasowang@redhat.com, qemu-devel@nongnu.org, mdroth@linux.vnet.ibm.com, owasserm@redhat.com, laine@redhat.com From: Amos Kong Date: Mon, 19 Mar 2012 22:12:03 +0800 Message-ID: <20120319141203.1865.18229.stgit@dhcp-8-167.nay.redhat.com> In-Reply-To: <20120319141053.1865.18856.stgit@dhcp-8-167.nay.redhat.com> References: <20120319141053.1865.18856.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.11 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 v4 2/2] use inet_listen()/inet_connect() to support ipv6 migration 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 help functions in qemu-socket.c for tcp migration, which already support ipv6 addresses. For IPv6 brackets must be mandatory if you require a port. Referencing to RFC5952, the recommended format is: [2312::8274]:5200 test status: Successed listen side: qemu-kvm .... -incoming tcp:[2312::8274]:5200 client side: qemu-kvm ... (qemu) migrate -d tcp:[2312::8274]:5200 Signed-off-by: Amos Kong --- migration-tcp.c | 75 +++++++++++++++---------------------------------------- 1 files changed, 20 insertions(+), 55 deletions(-) diff --git a/migration-tcp.c b/migration-tcp.c index 35a5781..6c66c7a 100644 --- a/migration-tcp.c +++ b/migration-tcp.c @@ -81,43 +81,31 @@ static void tcp_wait_for_connect(void *opaque) int tcp_start_outgoing_migration(MigrationState *s, const char *host_port) { - struct sockaddr_in addr; - int ret; - - ret = parse_host_port(&addr, host_port); - if (ret < 0) { - return ret; - } + int sock_err; s->get_error = socket_errno; s->write = socket_write; s->close = tcp_close; - s->fd = qemu_socket(PF_INET, SOCK_STREAM, 0); - if (s->fd == -1) { - DPRINTF("Unable to open socket"); - return -socket_error(); - } - - socket_set_nonblock(s->fd); + s->fd = inet_connect(host_port, false, &sock_err); - do { - ret = connect(s->fd, (struct sockaddr *)&addr, sizeof(addr)); - if (ret == -1) { - ret = -socket_error(); - } - if (ret == -EINPROGRESS || ret == -EWOULDBLOCK) { - qemu_set_fd_handler2(s->fd, NULL, NULL, tcp_wait_for_connect, s); - return 0; + if (sock_err == -EINPROGRESS || sock_err == -EWOULDBLOCK) { + DPRINTF("connect in progress"); + qemu_set_fd_handler2(s->fd, NULL, NULL, tcp_wait_for_connect, s); +#ifdef _WIN32 + } else if (sock_err == -WSAEALREADY || sock_err == -WSAEINVAL) { + DPRINTF("connect in progress"); + qemu_set_fd_handler2(s->fd, NULL, NULL, tcp_wait_for_connect, s); +#endif + } else if (sock_err < 0) { + DPRINTF("connect failed: %s\n", strerror(-sock_err)); + if (s->fd != -1) { + migrate_fd_error(s); } - } while (ret == -EINTR); - - if (ret < 0) { - DPRINTF("connect failed\n"); - migrate_fd_error(s); - return ret; + return sock_err; + } else { + migrate_fd_connect(s); } - migrate_fd_connect(s); return 0; } @@ -157,38 +145,15 @@ out2: int tcp_start_incoming_migration(const char *host_port) { - struct sockaddr_in addr; - int val; 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(); - } - - 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; + s = inet_listen(host_port, NULL, 256, SOCK_STREAM, 0); + if (s < 0) { + return s; } qemu_set_fd_handler2(s, NULL, tcp_accept_incoming_migration, NULL, (void *)(intptr_t)s); return 0; - -err: - close(s); - return -socket_error(); }