From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:35429) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwjoP-0003nR-9l for qemu-devel@nongnu.org; Wed, 01 Aug 2012 21:02:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SwjoO-0003Iq-06 for qemu-devel@nongnu.org; Wed, 01 Aug 2012 21:02:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:6618) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwjoN-0003Id-Oa for qemu-devel@nongnu.org; Wed, 01 Aug 2012 21:02:47 -0400 From: Luiz Capitulino Date: Wed, 1 Aug 2012 22:02:36 -0300 Message-Id: <1343869374-23417-17-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1343869374-23417-1-git-send-email-lcapitulino@redhat.com> References: <1343869374-23417-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 16/34] migration: don't rely on QERR_SOCKET_* List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, aliguori@us.ibm.com, armbru@redhat.com, mdroth@linux.vnet.ibm.com, pbonzini@redhat.com, eblake@redhat.com Use the error code returned by inet_connect() instead. This change is needed because all QERR_SOCKET_* errors are going to be dropped by a future commit. Signed-off-by: Luiz Capitulino --- migration-tcp.c | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/migration-tcp.c b/migration-tcp.c index 18944a4..7fe0ffe 100644 --- a/migration-tcp.c +++ b/migration-tcp.c @@ -82,27 +82,33 @@ static void tcp_wait_for_connect(void *opaque) int tcp_start_outgoing_migration(MigrationState *s, const char *host_port, Error **errp) { + bool in_progress; + s->get_error = socket_errno; s->write = socket_write; s->close = tcp_close; - s->fd = inet_connect(host_port, false, NULL, errp); + s->fd = inet_connect(host_port, false, &in_progress, errp); + if (s->fd < 0) { + switch (s->fd) { + case -EINVAL: + DPRINTF("connect failed\n"); + return -1; + case -ENOTCONN: + DPRINTF("connect failed\n"); + migrate_fd_error(s); + return -1; + default: + DPRINTF("unknown error\n"); + return -1; + } + } - if (!error_is_set(errp)) { - migrate_fd_connect(s); - } else if (error_is_type(*errp, QERR_SOCKET_CONNECT_IN_PROGRESS)) { - DPRINTF("connect in progress\n"); + if (in_progress) { qemu_set_fd_handler2(s->fd, NULL, NULL, tcp_wait_for_connect, s); - } else if (error_is_type(*errp, QERR_SOCKET_CREATE_FAILED)) { - DPRINTF("connect failed\n"); - return -1; - } else if (error_is_type(*errp, QERR_SOCKET_CONNECT_FAILED)) { - DPRINTF("connect failed\n"); - migrate_fd_error(s); - return -1; } else { - DPRINTF("unknown error\n"); - return -1; + /* connected */ + migrate_fd_connect(s); } return 0; -- 1.7.11.2.249.g31c7954.dirty