github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-21 13:08:42 +00:00
Code Issues Projects Releases Wiki Activity

tools: acrnctl: increase STOP_TIMEOUT to 30s when reset VM

Browse Source 
The 'acrnctl reset' is implemented by a stop/start sequence. Reset failure was
observed since UOS is not able to shutdown within default 10s timeout.
This commit increased the default timeout to be 30s, and added an explicit error
message if 'acrnctl reset' due to UOS shutdown timeout.

Tracked-On: #2016
Signed-off-by: Tao Yuhong <yuhong.tao@intel.com>
Reviewed-by: Yan, Like <like.yan@intel.com>
This commit is contained in:
yuhong.tao@intel.com 2018-12-07 19:16:49 +08:00 committed by wenlingz
parent bb768904ab
commit bc5b27a73d
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/acrn-manager/acrnctl.c
View File

@ -40,7 +40,7 @@
#define RESUME_DESC "Resume virtual machine from suspend state"
#define RESET_DESC "Stop and then start virtual machine VM_NAME"
#define STOP_TIMEOUT 10U
#define STOP_TIMEOUT 30U
struct acrnctl_cmd {
const char *cmd;
@ -600,8 +600,10 @@ static int wait_vm_stop(const char * vmname, unsigned int timeout)
printf("%s: vm %s not found\n", __func__, vmname);
return -1;
} else {
if (s->state == VM_CREATED)
if (s->state == VM_CREATED) {
sleep(2);
return 0;
}
}
sleep(1);
@ -623,16 +625,13 @@ static int acrnctl_do_reset(int argc, char *argv[])
}
switch(s->state) {
case VM_CREATED:
start_vm(argv[i]);
break;
case VM_STARTED:
case VM_SUSPENDED:
stop_vm(argv[i]);
if (wait_vm_stop(argv[i], STOP_TIMEOUT)) {
printf("Failed to stop %s in %u sec\n",
printf("Failed to stop %s in %u sec, reset failed\n",
argv[i], STOP_TIMEOUT);
break;
return -1;
}
start_vm(argv[i]);
break;