From patchwork Thu Aug 2 01:02:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 174667 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 D799D2C0092 for ; Thu, 2 Aug 2012 12:34:30 +1000 (EST) Received: from localhost ([::1]:43746 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Swjpq-0005jc-Vp for incoming@patchwork.ozlabs.org; Wed, 01 Aug 2012 21:04:18 -0400 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 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 q7212jiN027609 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 1 Aug 2012 21:02:45 -0400 Received: from localhost (ovpn-113-85.phx2.redhat.com [10.3.113.85]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q7212ifq008215; Wed, 1 Aug 2012 21:02:44 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org 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> 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 Cc: kwolf@redhat.com, aliguori@us.ibm.com, armbru@redhat.com, mdroth@linux.vnet.ibm.com, pbonzini@redhat.com, eblake@redhat.com Subject: [Qemu-devel] [PATCH 16/34] migration: don't rely on QERR_SOCKET_* 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 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;