From patchwork Fri Feb 15 17:46:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 220784 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 DEB262C007B for ; Sat, 16 Feb 2013 04:48:01 +1100 (EST) Received: from localhost ([::1]:50591 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U6POC-0005Em-1H for incoming@patchwork.ozlabs.org; Fri, 15 Feb 2013 12:48:00 -0500 Received: from eggs.gnu.org ([208.118.235.92]:50724) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U6PNk-0004bx-G7 for qemu-devel@nongnu.org; Fri, 15 Feb 2013 12:47:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U6PNg-00049B-UM for qemu-devel@nongnu.org; Fri, 15 Feb 2013 12:47:32 -0500 Received: from mail-vb0-f50.google.com ([209.85.212.50]:49110) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U6PNg-000493-NF for qemu-devel@nongnu.org; Fri, 15 Feb 2013 12:47:28 -0500 Received: by mail-vb0-f50.google.com with SMTP id ft2so2274954vbb.23 for ; Fri, 15 Feb 2013 09:47:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=ztpMin5lECqCShx9UKvteLjM0aSAwISDMFHfSinIFzI=; b=WYQpIerTf8hNVt8kzj7ztJLa63wPVW4QE7gnEaWNz8z2EMAteRcGkaKWvuzzcL2rkN wS8PWvnobKP59zm+7eG3SFzWWfz+24SN0jFU2Q+r9n6IO/4ipkbL51GGTf9a2bGiGHIL BOny0bDrPTBZY2JfjuuNYC0BhgJQi6JHqFBYWupYBiYv+FvRSiUYB3ZUAdXPcJh4TvMI tXWEOuf7YSD3bn+JUBxxrVFt1zfDxJRUCRpIz0H3XcmUkIgKzY08E0b+zj+E4pfx2XrK g/N7KXToVxOsF+timdTjME9a0SQlvUCfCEbuMDbmHuSuAsG0H59z3a5ScJv9If6MtilN E8yA== X-Received: by 10.52.23.37 with SMTP id j5mr3817903vdf.56.1360950448106; Fri, 15 Feb 2013 09:47:28 -0800 (PST) Received: from yakj.usersys.redhat.com (93-34-179-137.ip50.fastwebnet.it. [93.34.179.137]) by mx.google.com with ESMTPS id yu12sm65402142vec.6.2013.02.15.09.47.26 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 15 Feb 2013 09:47:27 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 15 Feb 2013 18:46:35 +0100 Message-Id: <1360950433-17106-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1360950433-17106-1-git-send-email-pbonzini@redhat.com> References: <1360950433-17106-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.212.50 Cc: owasserm@redhat.com, chegu_vinod@hp.com, quintela@redhat.com Subject: [Qemu-devel] [PATCH 03/41] migration: move more error handling to migrate_fd_cleanup 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 next patch will add more cases where qemu_savevm_state_cancel needs to be called; prepare for that already, the function can be called twice with no ill effect. Signed-off-by: Paolo Bonzini Reviewed-by: Orit Wasserman Reviewed-by: Juan Quintela --- migration.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/migration.c b/migration.c index 2b44268..0f3cb5d 100644 --- a/migration.c +++ b/migration.c @@ -260,7 +260,7 @@ void qmp_migrate_set_capabilities(MigrationCapabilityStatusList *params, /* shared migration helpers */ -static int migrate_fd_cleanup(MigrationState *s) +static void migrate_fd_cleanup(MigrationState *s) { int ret = 0; @@ -271,7 +271,13 @@ static int migrate_fd_cleanup(MigrationState *s) } assert(s->fd == -1); - return ret; + if (ret < 0 && s->state == MIG_STATE_ACTIVE) { + s->state = MIG_STATE_ERROR; + } + + if (s->state != MIG_STATE_ACTIVE) { + qemu_savevm_state_cancel(); + } } void migrate_fd_error(MigrationState *s) @@ -285,9 +291,8 @@ void migrate_fd_error(MigrationState *s) static void migrate_fd_completed(MigrationState *s) { DPRINTF("setting completed state\n"); - if (migrate_fd_cleanup(s) < 0) { - s->state = MIG_STATE_ERROR; - } else { + migrate_fd_cleanup(s); + if (s->state == MIG_STATE_ACTIVE) { s->state = MIG_STATE_COMPLETED; runstate_set(RUN_STATE_POSTMIGRATE); } @@ -322,7 +327,6 @@ static void migrate_fd_cancel(MigrationState *s) s->state = MIG_STATE_CANCELLED; notifier_list_notify(&migration_state_notifiers, s); - qemu_savevm_state_cancel(); migrate_fd_cleanup(s); }