From patchwork Tue Feb 26 05:34:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 10829501 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C12131399 for ; Tue, 26 Feb 2019 05:39:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AAD872B1A5 for ; Tue, 26 Feb 2019 05:39:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9DDF12B1B3; Tue, 26 Feb 2019 05:39:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=0.1 required=2.0 tests=BAYES_00,FROM_ADDR_WS, MAILING_LIST_MULTI autolearn=no version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 393432B1A5 for ; Tue, 26 Feb 2019 05:39:33 +0000 (UTC) Received: from localhost ([127.0.0.1]:49693 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyVSm-0006Lp-JN for patchwork-qemu-devel@patchwork.kernel.org; Tue, 26 Feb 2019 00:39:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40355) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyVRu-0005ep-L9 for qemu-devel@nongnu.org; Tue, 26 Feb 2019 00:38:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gyVRt-000054-W2 for qemu-devel@nongnu.org; Tue, 26 Feb 2019 00:38:38 -0500 Received: from mga11.intel.com ([192.55.52.93]:12519) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gyVRt-0008Jc-Nt for qemu-devel@nongnu.org; Tue, 26 Feb 2019 00:38:37 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Feb 2019 21:37:58 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,414,1544515200"; d="scan'208";a="141655078" Received: from unknown (HELO localhost.localdomain) ([10.239.13.19]) by orsmga001.jf.intel.com with ESMTP; 25 Feb 2019 21:37:57 -0800 From: Zhang Chen To: Li Zhijian , Zhang Chen , "Dr. David Alan Gilbert" , Juan Quintela , zhanghailiang , qemu-dev Date: Tue, 26 Feb 2019 13:34:34 +0800 Message-Id: <20190226053434.6252-4-chen.zhang@intel.com> X-Mailer: git-send-email 2.17.GIT In-Reply-To: <20190226053434.6252-1-chen.zhang@intel.com> References: <20190226053434.6252-1-chen.zhang@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.93 Subject: [Qemu-devel] [PATCH 3/3] Migration/colo.c: Make COLO node running after failover X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Zhang Chen Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Zhang Chen Delay to close COLO for auto start VM after failover. Signed-off-by: Zhang Chen Reviewed-by: Dr. David Alan Gilbert --- migration/colo.c | 1 - migration/migration.c | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/migration/colo.c b/migration/colo.c index a13acac192..89325952c7 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -875,7 +875,6 @@ out: qemu_fclose(mis->to_src_file); mis->to_src_file = NULL; } - migration_incoming_disable_colo(); rcu_unregister_thread(); return NULL; diff --git a/migration/migration.c b/migration/migration.c index 37e06b76dc..cec5f529c3 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -383,6 +383,9 @@ static void process_incoming_migration_bh(void *opaque) } else { runstate_set(RUN_STATE_PAUSED); } + } else if (migration_incoming_colo_enabled()) { + migration_incoming_disable_colo(); + vm_start(); } else { runstate_set(global_state_get_runstate()); }