From patchwork Sun Mar 3 14:50:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Chen" X-Patchwork-Id: 1050872 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=intel.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44C67M4Y9Kz9s4V for ; Mon, 4 Mar 2019 02:11:27 +1100 (AEDT) Received: from localhost ([127.0.0.1]:40522 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0Slx-0000UG-Dm for incoming@patchwork.ozlabs.org; Sun, 03 Mar 2019 10:11:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49813) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0SiM-0005yq-O8 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 1h0SV3-0006ik-BK for qemu-devel@nongnu.org; Sun, 03 Mar 2019 09:53:58 -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 1h0SV3-00068j-1o for qemu-devel@nongnu.org; Sun, 03 Mar 2019 09:53:57 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Mar 2019 06:53:56 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,436,1544515200"; d="scan'208";a="325005950" Received: from unknown (HELO localhost.localdomain) ([10.239.13.19]) by fmsmga005.fm.intel.com with ESMTP; 03 Mar 2019 06:53:55 -0800 From: Zhang Chen To: Li Zhijian , Zhang Chen , "Dr. David Alan Gilbert" , Juan Quintela , zhanghailiang , Markus Armbruster , Eric Blake , qemu-dev Date: Sun, 3 Mar 2019 22:50:21 +0800 Message-Id: <20190303145021.2962-8-chen.zhang@intel.com> X-Mailer: git-send-email 2.17.GIT In-Reply-To: <20190303145021.2962-1-chen.zhang@intel.com> References: <20190303145021.2962-1-chen.zhang@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.24 Subject: [Qemu-devel] [PATCH V3 7/7] Migration/colo.c: Make user obtain the COLO mode info 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Zhang Chen Add the last_colo_mode to save the status after failover. This patch can solve the issue that user got nothing to call query_colo_status after failover. Signed-off-by: Zhang Chen --- migration/colo.c | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/migration/colo.c b/migration/colo.c index d1ae2e6d11..6eba8e06f2 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -38,6 +38,9 @@ static bool vmstate_loading; static Notifier packets_compare_notifier; +/* User need to know colo mode after COLO failover */ +static COLOMode last_colo_mode; + #define COLO_BUFFER_BASE_SIZE (4 * 1024 * 1024) bool migration_in_colo_state(void) @@ -197,7 +200,10 @@ void colo_do_failover(MigrationState *s) vm_stop_force_state(RUN_STATE_COLO); } - switch (get_colo_mode()) { + /* Update last_COLO_mode to avoid unexpectedly exit COLO status */ + last_colo_mode = get_colo_mode(); + + switch (last_colo_mode) { case COLO_MODE_PRIMARY: primary_vm_do_failover(); break; @@ -263,7 +269,7 @@ COLOStatus *qmp_query_colo_status(Error **errp) { COLOStatus *s = g_new0(COLOStatus, 1); - s->mode = get_colo_mode(); + s->mode = last_colo_mode; switch (failover_get_state()) { case FAILOVER_STATUS_NONE: @@ -515,6 +521,12 @@ static void colo_process_checkpoint(MigrationState *s) Error *local_err = NULL; int ret; + last_colo_mode = get_colo_mode(); + if (last_colo_mode != COLO_MODE_PRIMARY) { + error_report("COLO mode must be COLO_MODE_PRIMARY"); + return; + } + failover_init_state(); s->rp_state.from_dst_file = qemu_file_get_return_path(s->to_dst_file); @@ -682,12 +694,18 @@ void *colo_process_incoming_thread(void *opaque) Error *local_err = NULL; int ret; - rcu_register_thread(); - qemu_sem_init(&mis->colo_incoming_sem, 0); - migrate_set_state(&mis->state, MIGRATION_STATUS_ACTIVE, MIGRATION_STATUS_COLO); + last_colo_mode = get_colo_mode(); + if (last_colo_mode != COLO_MODE_SECONDARY) { + error_report("COLO mode must be COLO_MODE_SECONDARY"); + return NULL; + } + + rcu_register_thread(); + qemu_sem_init(&mis->colo_incoming_sem, 0); + failover_init_state(); mis->to_src_file = qemu_file_get_return_path(mis->from_src_file);