From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60789) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUvGM-0000h3-41 for qemu-devel@nongnu.org; Wed, 03 Aug 2016 08:27:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bUvGJ-0006bs-Uc for qemu-devel@nongnu.org; Wed, 03 Aug 2016 08:27:05 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:52206) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUvGJ-0006ag-BC for qemu-devel@nongnu.org; Wed, 03 Aug 2016 08:27:03 -0400 From: zhanghailiang Date: Wed, 3 Aug 2016 20:26:02 +0800 Message-ID: <1470227172-13704-25-git-send-email-zhang.zhanghailiang@huawei.com> In-Reply-To: <1470227172-13704-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1470227172-13704-1-git-send-email-zhang.zhanghailiang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH COLO-Frame v18 24/34] 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: amit.shah@redhat.com, quintela@redhat.com, dgilbert@redhat.com, peter.huangpeng@huawei.com, eddie.dong@intel.com, wency@cn.fujitsu.com, lizhijian@cn.fujitsu.com, zhangchen.fnst@cn.fujitsu.com, xiecl.fnst@cn.fujitsu.com, zhanghailiang 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 ef2bac4..50693bb 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -391,6 +391,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