OrgACRN
/
acrn-hypervisor
mirror of https://github.com/projectacrn/acrn-hypervisor.git
1
0
Fork 0
Code Issues Releases Wiki Activity

tools: acrnd: fix wait_for_stop() return wrong vm state 

Ported form apl_sdc_stable branch.
The wait_for_stop() first check if all VM are stopped or suspended.
It first check if VMs are stopped, then check if they are suspend.

If the VMs change state from running to stoped, after check VMs
stopped fail, before start check suspend state. wait_for_stop() will
mistake resopnse 'All vms have entered S3 state successfully'

To fix that, wait_for_stop() must only update VMs's state once, and
see if they are stopped, or suspended.

Tracked-On: #2398
Signed-off-by: Tao Yuhong <yuhong.tao@intel.com>
Signed-off-by: Wei Liu <weix.w.liu@intel.com>
Reviewed-by: Yin Fengwei <fengwei.yin@intel.com>
Acked-by: Yan, Like <like.yan@intel.com>
This commit is contained in:
Tao Yuhong 2019-01-23 23:06:28 +08:00 committed by ACRN System Integration
parent 2b900a43de
commit 8c2ab95f49
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/acrn-manager/acrnd.c
View File

@ -453,10 +453,8 @@ static int check_vms_status(unsigned int status)
{
struct vmmngr_struct *s;
vmmngr_update();
LIST_FOREACH(s, &vmmngr_head, list)
if (s->state != status && s->state != VM_CREATED)
if (s->state != status)
return -1;
return 0;
@ -470,6 +468,8 @@ static int wait_for_stop(unsigned int timeout)
/* list and update the vm status */
do {
vmmngr_update();
printf("Waiting %lu seconds for all vms enter S3/S5 state\n", t);
if (check_vms_status(VM_CREATED) == 0) {