From patchwork Wed Jul 18 17:49:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 171769 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 5A19C2C00B7 for ; Thu, 19 Jul 2012 03:49:40 +1000 (EST) Received: from localhost ([::1]:56646 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SrYNW-0005zh-5k for incoming@patchwork.ozlabs.org; Wed, 18 Jul 2012 13:49:38 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38484) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SrYNA-0005mK-Ew for qemu-devel@nongnu.org; Wed, 18 Jul 2012 13:49:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SrYN9-00072q-4n for qemu-devel@nongnu.org; Wed, 18 Jul 2012 13:49:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43818) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SrYN8-00072k-TN for qemu-devel@nongnu.org; Wed, 18 Jul 2012 13:49:15 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q6IHnE2C011765 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 18 Jul 2012 13:49:14 -0400 Received: from localhost (ovpn-113-90.phx2.redhat.com [10.3.113.90]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q6IHnAYB005578; Wed, 18 Jul 2012 13:49:11 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Wed, 18 Jul 2012 14:49:13 -0300 Message-Id: <1342633760-351-3-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1342633760-351-1-git-send-email-lcapitulino@redhat.com> References: <1342633760-351-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: pbonzini@redhat.com, aliguori@us.ibm.com, armbru@redhat.com Subject: [Qemu-devel] [PATCH 2/9] qerror: rename QERR_SOCK_CONNECT_IN_PROGRESS 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 The error class name is SockConnectInprogress, not SockConnectInProgress. Rename the QERR_SOCK_CONNECT_IN_PROGRESS macro to QERR_SOCK_CONNECT_INPROGRESS to reflect that, so that future error macro generation generates the expected macro name. Signed-off-by: Luiz Capitulino --- migration-tcp.c | 2 +- qemu-sockets.c | 2 +- qerror.c | 2 +- qerror.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/migration-tcp.c b/migration-tcp.c index 587fc70..3cffa94 100644 --- a/migration-tcp.c +++ b/migration-tcp.c @@ -90,7 +90,7 @@ int tcp_start_outgoing_migration(MigrationState *s, const char *host_port, if (!error_is_set(errp)) { migrate_fd_connect(s); - } else if (error_is_type(*errp, QERR_SOCK_CONNECT_IN_PROGRESS)) { + } else if (error_is_type(*errp, QERR_SOCK_CONNECT_INPROGRESS)) { DPRINTF("connect in progress\n"); qemu_set_fd_handler2(s->fd, NULL, NULL, tcp_wait_for_connect, s); } else if (error_is_type(*errp, QERR_SOCK_CREATE_FAILED)) { diff --git a/qemu-sockets.c b/qemu-sockets.c index 1357ec0..20def3e 100644 --- a/qemu-sockets.c +++ b/qemu-sockets.c @@ -274,7 +274,7 @@ int inet_connect_opts(QemuOpts *opts, Error **errp) #else if (!block && (rc == -EINPROGRESS)) { #endif - error_set(errp, QERR_SOCK_CONNECT_IN_PROGRESS); + error_set(errp, QERR_SOCK_CONNECT_INPROGRESS); } else if (rc < 0) { if (NULL == e->ai_next) fprintf(stderr, "%s: connect(%s,%s,%s,%s): %s\n", __FUNCTION__, diff --git a/qerror.c b/qerror.c index e988e36..a9d771b 100644 --- a/qerror.c +++ b/qerror.c @@ -309,7 +309,7 @@ static const QErrorStringTable qerror_table[] = { .desc = "Could not start VNC server on %(target)", }, { - .error_fmt = QERR_SOCK_CONNECT_IN_PROGRESS, + .error_fmt = QERR_SOCK_CONNECT_INPROGRESS, .desc = "Connection can not be completed immediately", }, { diff --git a/qerror.h b/qerror.h index 71b0496..69d417d 100644 --- a/qerror.h +++ b/qerror.h @@ -251,7 +251,7 @@ QError *qobject_to_qerror(const QObject *obj); #define QERR_VNC_SERVER_FAILED \ "{ 'class': 'VNCServerFailed', 'data': { 'target': %s } }" -#define QERR_SOCK_CONNECT_IN_PROGRESS \ +#define QERR_SOCK_CONNECT_INPROGRESS \ "{ 'class': 'SockConnectInprogress', 'data': {} }" #define QERR_SOCK_CONNECT_FAILED \