From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:37430) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SAZ5L-0002jz-AZ for qemu-devel@nongnu.org; Wed, 21 Mar 2012 23:53:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SAZ5J-000359-CF for qemu-devel@nongnu.org; Wed, 21 Mar 2012 23:53:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39377) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SAZ5J-00034s-4v for qemu-devel@nongnu.org; Wed, 21 Mar 2012 23:53:09 -0400 From: Amos Kong Date: Thu, 22 Mar 2012 11:53:03 +0800 Message-ID: <20120322035303.2431.58475.stgit@dhcp-8-167.nay.redhat.com> In-Reply-To: <20120322035052.2431.4994.stgit@dhcp-8-167.nay.redhat.com> References: <20120322035052.2431.4994.stgit@dhcp-8-167.nay.redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH v5 4/4] use inet_listen()/inet_connect() to support ipv6 migration List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 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 | 74 +++++++++++++++---------------------------------------- 1 files changed, 20 insertions(+), 54 deletions(-) diff --git a/migration-tcp.c b/migration-tcp.c index 35a5781..251d955 100644 --- a/migration-tcp.c +++ b/migration-tcp.c @@ -81,43 +81,32 @@ 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 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); + err = -socket_error(); - 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 (err == -EINPROGRESS) { + DPRINTF("connect in progress"); + qemu_set_fd_handler2(s->fd, NULL, NULL, tcp_wait_for_connect, s); +#ifdef _WIN32 + } else if (err == -WSAEALREADY || err == -WSAEINVAL) { + DPRINTF("connect in progress"); + qemu_set_fd_handler2(s->fd, NULL, NULL, tcp_wait_for_connect, s); +#endif + } else if (err < 0) { + DPRINTF("connect failed: %s\n", strerror(-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 err; + } else { + migrate_fd_connect(s); } - migrate_fd_connect(s); return 0; } @@ -157,38 +146,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) { + s = inet_listen(host_port, NULL, 256, SOCK_STREAM, 0); + if (s < 0) { 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; - } - qemu_set_fd_handler2(s, NULL, tcp_accept_incoming_migration, NULL, (void *)(intptr_t)s); return 0; - -err: - close(s); - return -socket_error(); }