github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-20 04:33:55 +00:00
Code Issues Projects Releases Wiki Activity

tools: acrnctl add '--force' option to 'stop' cmd

Browse Source 
Run 'acrnctl stop VM_NAME --force‘ to force stop VM

When run 'acrnctl stop VM_NAME', acrn-dm let guest OS to shutdown
itself. If something wrong with guest OS, it can't shutdown, we can
run 'acrnctl stop VM_NAME --force', thus acrn-dm directly set suspend
mode to VM_SUSPEND_POWEROFF and quit main loop.

Tracked-On: #3484
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 2019-06-27 14:30:38 +00:00 committed by ACRN System Integration
parent 59fd4202d3
commit 8b27daa778
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
misc/acrn-manager/acrnctl.c
View File

@ -29,7 +29,7 @@
/* vm life cycle cmd description */ /* vm life cycle cmd description */
#define LIST_DESC "List all the virtual machines added" #define LIST_DESC "List all the virtual machines added"
#define START_DESC "Start virtual machine VM_NAME" #define START_DESC "Start virtual machine VM_NAME"
#define STOP_DESC "Stop virtual machine VM_NAME" #define STOP_DESC "Stop virtual machine VM_NAME, [--force/-f, force to stop VM]"
#define DEL_DESC "Delete virtual machine VM_NAME" #define DEL_DESC "Delete virtual machine VM_NAME"
#define ADD_DESC "Add one virtual machine with SCRIPTS and OPTIONS" #define ADD_DESC "Add one virtual machine with SCRIPTS and OPTIONS"
#define PAUSE_DESC "Block all vCPUs of virtual machine VM_NAME" #define PAUSE_DESC "Block all vCPUs of virtual machine VM_NAME"
@ -442,18 +442,34 @@ static int acrnctl_do_blkrescan(int argc, char *argv[])
static int acrnctl_do_stop(int argc, char *argv[]) static int acrnctl_do_stop(int argc, char *argv[])
{ {
struct vmmngr_struct *s; struct vmmngr_struct *s;
int force = 0; int i, force = 0;
const char *vmname = NULL;
s = vmmngr_find(argv[1]); for (i = 1; i < argc; i++) {
if (strcmp(argv[i], "--force") && strcmp(argv[i], "-f")) {
if (vmname == NULL)
vmname = argv[i];
} else {
force = 1;
}
}
if (!vmname) {
printf("Please give a VM name\n");
return -1;
}
s = vmmngr_find(vmname);
if (!s) { if (!s) {
printf("can't find %s\n", argv[1]); printf("can't find %s\n", vmname);
return -1; return -1;
} }
if (s->state == VM_CREATED) { if (s->state == VM_CREATED) {
printf("%s is already (%s)\n", argv[1], state_str[s->state]); printf("%s is already (%s)\n", vmname, state_str[s->state]);
return -1; return -1;
} }
return stop_vm(argv[1], force);
return stop_vm(vmname, force);
} }