From patchwork Fri Feb 22 16:36:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 222640 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 3B64E2C0299 for ; Sat, 23 Feb 2013 07:36:31 +1100 (EST) Received: from localhost ([::1]:54954 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U8vd6-0005Bw-Q5 for incoming@patchwork.ozlabs.org; Fri, 22 Feb 2013 11:37:48 -0500 Received: from eggs.gnu.org ([208.118.235.92]:58624) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U8vcX-0003ww-K5 for qemu-devel@nongnu.org; Fri, 22 Feb 2013 11:37:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U8vcR-0006eT-1C for qemu-devel@nongnu.org; Fri, 22 Feb 2013 11:37:13 -0500 Received: from mail-ve0-f176.google.com ([209.85.128.176]:33467) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U8vcQ-0006eH-TV for qemu-devel@nongnu.org; Fri, 22 Feb 2013 11:37:06 -0500 Received: by mail-ve0-f176.google.com with SMTP id cz10so700055veb.7 for ; Fri, 22 Feb 2013 08:37:06 -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=6L3nLmS2EJq5w422v6U+nLopPypYtQ39JGXK2R5AWIc=; b=aP8uQaT6CCzp/H9edxunKLn4iOjfxGF0Ej0hOX1b6CuxV3tRo8S0o9SEQTh2FlnH0+ GzK03uVDTp2oAXNqpQFemnua2oUR0YeYlg2+K/iD7AbwD96oQwHYRNBRLx6EYrybeAIE rkH4QLEg/tQjpmiDLjcr3tR9o9gqleV4OQLgjnplIQkMT9gSyK5dEQ6FSNoRla6eMv8j YvwqVfZ2vxo6oq+pVy4NJGs97/lzAEvXhmbsRmLRgVcFluBKKoFFtNfsi6YDwKLO8d6i 4+52iIzMcgOvbePeTaA3X9kUJKdEYOGOAVIG2icr/WhsvN0q+qjIiBm6ikb2S9lDp1Dr A9Mw== X-Received: by 10.52.23.38 with SMTP id j6mr2908805vdf.121.1361551026314; Fri, 22 Feb 2013 08:37:06 -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 tp10sm4291733vec.1.2013.02.22.08.37.04 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 22 Feb 2013 08:37:05 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 22 Feb 2013 17:36:09 +0100 Message-Id: <1361551008-12430-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1361551008-12430-1-git-send-email-pbonzini@redhat.com> References: <1361551008-12430-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.128.176 Cc: owasserm@redhat.com, quintela@redhat.com Subject: [Qemu-devel] [PATCH 03/42] 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. Reviewed-by: Orit Wasserman Reviewed-by: Juan Quintela Signed-off-by: Paolo Bonzini --- migration.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/migration.c b/migration.c index 65e8583..10ce9fe 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); }