From patchwork Wed Oct 3 14:36:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 188800 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 9EC712C00C0 for ; Thu, 4 Oct 2012 01:07:18 +1000 (EST) Received: from localhost ([::1]:58799 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJQ65-0006iJ-3h for incoming@patchwork.ozlabs.org; Wed, 03 Oct 2012 10:38:49 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37940) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJQ4z-0004Xh-Na for qemu-devel@nongnu.org; Wed, 03 Oct 2012 10:37:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TJQ4v-0000I1-6F for qemu-devel@nongnu.org; Wed, 03 Oct 2012 10:37:41 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:39719) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJQ4u-0000Cn-Rb for qemu-devel@nongnu.org; Wed, 03 Oct 2012 10:37:37 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp2so10061642pbb.4 for ; Wed, 03 Oct 2012 07:37:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=EDCBaJSAL61mh8LPPykbxfMzLZT5JM+euTpzn0SUSw4=; b=J/6D3C7o/YqsrnuohD5A5N5pWz5AI4DglEFEGJG6kJT5KU7WL/fdS09Nt+yY3v3OuI DmRCXqKXxlOaqE4u+a/E4I3qna8eyGGtErTYvp9nERAV450dTXO3tkOlVtsf06qRXAyi 9Z0AkNuGuCesEtsVVEsEsCM+ldEOvWDJ121piZR0pLtFrc8wpJnOYiPjvgdXhw4OrvBZ +rs+MHpVkBwhhcpxI4jgQSIKHeJITZBsh5s3bQX4Bruin9PP7nXvBjFX3jFv1ATI1hxU 9E973ecyDqNRHZvlrT0T/aXru/JPTZr7Vc2jdvJBMNP0SbmaHYsP9vW2EG5II1Qloce0 KlXw== Received: by 10.68.234.36 with SMTP id ub4mr13593104pbc.68.1349275056496; Wed, 03 Oct 2012 07:37:36 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-169-1.ip50.fastwebnet.it. [93.34.169.1]) by mx.google.com with ESMTPS id i1sm2566228pay.26.2012.10.03.07.37.33 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 03 Oct 2012 07:37:35 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 3 Oct 2012 16:36:53 +0200 Message-Id: <1349275025-5093-7-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1349275025-5093-1-git-send-email-pbonzini@redhat.com> References: <1349275025-5093-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH 06/18] migration: centralize call to migrate_fd_error() 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 call to migrate_fd_error() was missing for non-socket backends, so centralize it in qmp_migrate(). Before: (qemu) migrate fd:ffff migrate: An undefined error has occurred (qemu) info migrate (qemu) After: (qemu) migrate fd:ffff migrate: An undefined error has occurred (qemu) info migrate capabilities: xbzrle: off Migration status: failed total time: 0 milliseconds (The awful error message will be fixed later in the series). Signed-off-by: Paolo Bonzini Reviewed-by: Luiz Capitulino --- migration-tcp.c | 1 - migration-unix.c | 1 - migration.c | 1 + 3 file modificati, 1 inserzione(+), 2 rimozioni(-) diff --git a/migration-tcp.c b/migration-tcp.c index 78337a3..e8bc76a 100644 --- a/migration-tcp.c +++ b/migration-tcp.c @@ -79,7 +79,6 @@ int tcp_start_outgoing_migration(MigrationState *s, const char *host_port, s->fd = inet_nonblocking_connect(host_port, tcp_wait_for_connect, s, &local_err); if (local_err != NULL) { - migrate_fd_error(s); error_propagate(errp, local_err); return -1; } diff --git a/migration-unix.c b/migration-unix.c index 169de88..d349662 100644 --- a/migration-unix.c +++ b/migration-unix.c @@ -111,7 +111,6 @@ int unix_start_outgoing_migration(MigrationState *s, const char *path) if (ret < 0) { DPRINTF("connect failed\n"); - migrate_fd_error(s); return ret; } migrate_fd_connect(s); diff --git a/migration.c b/migration.c index 8a04174..a56358e 100644 --- a/migration.c +++ b/migration.c @@ -522,6 +522,7 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, } if (ret < 0 || local_err) { + migrate_fd_error(s); if (!local_err) { error_set_errno(errp, -ret, QERR_UNDEFINED_ERROR); } else {