From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38177) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRzBl-0002mI-6z for qemu-devel@nongnu.org; Sat, 06 Feb 2016 04:29:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aRzBi-0001Rk-28 for qemu-devel@nongnu.org; Sat, 06 Feb 2016 04:29:57 -0500 Received: from szxga01-in.huawei.com ([58.251.152.64]:26599) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRzBh-0001RB-1m for qemu-devel@nongnu.org; Sat, 06 Feb 2016 04:29:53 -0500 From: zhanghailiang Date: Sat, 6 Feb 2016 17:28:37 +0800 Message-ID: <1454750932-7556-26-git-send-email-zhang.zhanghailiang@huawei.com> In-Reply-To: <1454750932-7556-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1454750932-7556-1-git-send-email-zhang.zhanghailiang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH COLO-Frame v14 25/40] COLO: Update the global runstate after going into colo state List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: xiecl.fnst@cn.fujitsu.com, lizhijian@cn.fujitsu.com, quintela@redhat.com, armbru@redhat.com, yunhong.jiang@intel.com, eddie.dong@intel.com, peter.huangpeng@huawei.com, dgilbert@redhat.com, zhanghailiang , arei.gonglei@huawei.com, stefanha@redhat.com, amit.shah@redhat.com, zhangchen.fnst@cn.fujitsu.com, hongyang.yang@easystack.cn If we start qemu with -S, the runstate will change from 'prelaunch' to 'running' after going into colo state. So it is necessary to update the global runstate after going into colo state. Signed-off-by: zhanghailiang Signed-off-by: Li Zhijian Reviewed-by: Dr. David Alan Gilbert --- v13: - Add Reviewed-by tag --- migration/colo.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/migration/colo.c b/migration/colo.c index 92be985..a30167c 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -395,6 +395,11 @@ static void colo_process_checkpoint(MigrationState *s) qemu_mutex_unlock_iothread(); trace_colo_vm_state_change("stop", "run"); + ret = global_state_store(); + if (ret < 0) { + goto out; + } + while (s->state == MIGRATION_STATUS_COLO) { if (failover_request_is_active()) { error_report("failover request"); -- 1.8.3.1