github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-08-09 20:18:19 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
yuhong.tao@intel.com 2019-01-23 23:06:28 +08:00 committed by wenlingz
parent 928dfefc62
commit 01bd5ac8dd
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

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