From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:49660) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0SiM-0005ua-OA for qemu-devel@nongnu.org; Sun, 03 Mar 2019 10:07:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0SV1-0006WV-Kn for qemu-devel@nongnu.org; Sun, 03 Mar 2019 09:53:56 -0500 Received: from mga09.intel.com ([134.134.136.24]:42887) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h0SV1-00068j-BP for qemu-devel@nongnu.org; Sun, 03 Mar 2019 09:53:55 -0500 From: Zhang Chen Date: Sun, 3 Mar 2019 22:50:20 +0800 Message-Id: <20190303145021.2962-7-chen.zhang@intel.com> In-Reply-To: <20190303145021.2962-1-chen.zhang@intel.com> References: <20190303145021.2962-1-chen.zhang@intel.com> Subject: [Qemu-devel] [PATCH V3 6/7] Migration/colo.c: Add the necessary checks for colo_do_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 , Markus Armbruster , Eric Blake , qemu-dev Cc: Zhang Chen From: Zhang Chen Signed-off-by: Zhang Chen --- migration/colo.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/migration/colo.c b/migration/colo.c index dbe2b88807..d1ae2e6d11 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -197,10 +197,16 @@ void colo_do_failover(MigrationState *s) vm_stop_force_state(RUN_STATE_COLO); } - if (get_colo_mode() == COLO_MODE_PRIMARY) { + switch (get_colo_mode()) { + case COLO_MODE_PRIMARY: primary_vm_do_failover(); - } else { + break; + case COLO_MODE_SECONDARY: secondary_vm_do_failover(); + break; + default: + error_report("colo_do_failover failed because the colo mode" + " could not be obtained"); } } -- 2.17.GIT