From mboxrd@z Thu Jan 1 00:00:00 1970 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 From: Zhang Chen Date: Tue, 26 Feb 2019 13:34:34 +0800 Message-Id: <20190226053434.6252-4-chen.zhang@intel.com> In-Reply-To: <20190226053434.6252-1-chen.zhang@intel.com> References: <20190226053434.6252-1-chen.zhang@intel.com> Subject: [Qemu-devel] [PATCH 3/3] Migration/colo.c: Make COLO node running after failover List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Li Zhijian , Zhang Chen , "Dr. David Alan Gilbert" , Juan Quintela , zhanghailiang , qemu-dev Cc: Zhang Chen From: Zhang Chen Delay to close COLO for auto start VM after failover. Signed-off-by: Zhang Chen --- 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()); } -- 2.17.GIT