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

Tools: cleanup acrnctl support pause/continue cmd 

The 'pause/continue' acrnctl cmd is never used and their action are not
defined for ACRN VMs. should be removed.

Tracked-On: #4790
Signed-off-by: Tao Yuhong <yuhong.tao@intel.com>
Reviewed-by: Jason Chen CJ <jason.cj.chen@intel.com>
Reviewed-by: Yan, Like <like.yan@intel.com>
This commit is contained in:
yuhong.tao@intel.com 2020-05-09 09:56:05 +00:00 committed by wenlingz
parent bc14dfb0bd
commit bd5e6cec50
2 changed files with 0 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
misc/acrn-manager/acrn_vm_ops.c
View File

@ -22,7 +22,6 @@ const char *state_str[] = {
[VM_STATE_UNKNOWN] = "unknown",
[VM_CREATED] = "stopped",
[VM_STARTED] = "started",
[VM_PAUSED] = "paused",
[VM_SUSPENDED] = "suspended",
[VM_UNTRACKED] = "untracked",
};
@ -388,41 +387,6 @@ int stop_vm(const char *vmname, int force)
return ack.data.err;
}
int pause_vm(const char *vmname)
{
struct mngr_msg req;
struct mngr_msg ack;
req.magic = MNGR_MSG_MAGIC;
req.msgid = DM_PAUSE;
req.timestamp = time(NULL);
send_msg(vmname, &req, &ack);
if (ack.data.err) {
printf("Unable to pause vm. errno(%d)\n", ack.data.err);
}
return ack.data.err;
}
int continue_vm(const char *vmname)
{
struct mngr_msg req;
struct mngr_msg ack;
req.magic = MNGR_MSG_MAGIC;
req.msgid = DM_CONTINUE;
req.timestamp = time(NULL);
send_msg(vmname, &req, &ack);
if (ack.data.err) {
printf("Unable to continue vm. errno(%d)\n", ack.data.err);
}
return ack.data.err;
}
int suspend_vm(const char *vmname)
{
struct mngr_msg req;

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

@ -32,8 +32,6 @@
#define STOP_DESC "Stop virtual machine VM_NAME, [--force/-f, force to stop VM]"
#define DEL_DESC "Delete virtual machine VM_NAME"
#define ADD_DESC "Add one virtual machine with SCRIPTS and OPTIONS"
#define PAUSE_DESC "Block all vCPUs of virtual machine VM_NAME"
#define CONTINUE_DESC "Start virtual machine from pause state"
#define SUSPEND_DESC "Switch virtual machine to suspend state"
#define RESUME_DESC "Resume virtual machine from suspend state"
#define RESET_DESC "Stop and then start virtual machine VM_NAME"
@ -572,55 +570,6 @@ static int acrnctl_do_start(int argc, char *argv[])
}
static int acrnctl_do_pause(int argc, char *argv[])
{
struct vmmngr_struct *s;
int ret = -1;
s = vmmngr_find(argv[1]);
if (!s) {
printf("Can't find vm %s\n", argv[1]);
return ret;
}
/* Send pause cmd to arcn-dm only when vm is in VM_STARTED */
switch (s->state) {
case VM_STARTED:
ret = pause_vm(argv[1]);
break;
default:
printf("%s current state %s, can't pause\n", argv[1], state_str[s->state]);
}
return ret;
}
static int acrnctl_do_continue(int argc, char *argv[])
{
struct vmmngr_struct *s;
int ret = -1;
s = vmmngr_find(argv[1]);
if (!s) {
printf("Can't find vm %s\n", argv[1]);
return ret;
}
/* Per current implemention, we can't know if vm is in paused
state. Send continue cmd to acrn-dm when VM_STARTED and will
correct it later when we have a way to check if vm has been
paused */
switch (s->state) {
case VM_STARTED:
ret = continue_vm(argv[1]);
break;
default:
printf("%s current state %s, can't continue\n", argv[1], state_str[s->state]);
}
return ret;
}
static int acrnctl_do_suspend(int argc, char *argv[])
{
struct vmmngr_struct *s;
@ -795,8 +744,6 @@ struct acrnctl_cmd acmds[] = {
ACMD("stop", acrnctl_do_stop, STOP_DESC, df_valid_args),
ACMD("del", acrnctl_do_del, DEL_DESC, df_valid_args),
ACMD("add", acrnctl_do_add, ADD_DESC, valid_add_args),
ACMD("pause", acrnctl_do_pause, PAUSE_DESC, df_valid_args),
ACMD("continue", acrnctl_do_continue, CONTINUE_DESC, df_valid_args),
ACMD("suspend", acrnctl_do_suspend, SUSPEND_DESC, df_valid_args),
ACMD("resume", acrnctl_do_resume, RESUME_DESC, df_valid_args),
ACMD("reset", acrnctl_do_reset, RESET_DESC, df_valid_args),