From d6eb39daf477829779add758ea2a268d4503c818 Mon Sep 17 00:00:00 2001 From: Kaige Fu Date: Thu, 31 May 2018 10:35:50 +0800 Subject: [PATCH] tools: acrnctl: Add support for suspending vm Add command suspend to switch vm to suspend state. Signed-off-by: Kaige Fu Reviewed-by: Geoffroy Van Cutsem Reviewed-by: Yan, Like Acked-by: Eddie Dong --- tools/acrn-manager/README.rst | 1 + tools/acrn-manager/acrn_vm_ops.c | 20 ++++++++++++++++++++ tools/acrn-manager/acrnctl.c | 28 ++++++++++++++++++++++++++++ tools/acrn-manager/acrnctl.h | 1 + 4 files changed, 50 insertions(+) diff --git a/tools/acrn-manager/README.rst b/tools/acrn-manager/README.rst index 9e32d5811..592347c42 100644 --- a/tools/acrn-manager/README.rst +++ b/tools/acrn-manager/README.rst @@ -29,6 +29,7 @@ You can see the available ``acrnctl`` commands by running: add pause continue + suspend Use acrnctl [cmd] help for details Here are some usage examples: diff --git a/tools/acrn-manager/acrn_vm_ops.c b/tools/acrn-manager/acrn_vm_ops.c index 24126496a..56dd7a24d 100644 --- a/tools/acrn-manager/acrn_vm_ops.c +++ b/tools/acrn-manager/acrn_vm_ops.c @@ -240,3 +240,23 @@ int continue_vm(char *vmname) return ack.err; } + +int suspend_vm(char *vmname) +{ + struct req_dm_suspend req; + struct ack_dm_suspend ack; + + req.msg.magic = MNGR_MSG_MAGIC; + req.msg.msgid = DM_SUSPEND; + req.msg.timestamp = time(NULL); + req.msg.len = sizeof(req); + + send_msg(vmname, (struct mngr_msg *)&req, + (struct mngr_msg *)&ack, sizeof(ack)); + + if (ack.err) { + printf("Unable to suspend vm. errno(%d)\n", ack.err); + } + + return ack.err; +} diff --git a/tools/acrn-manager/acrnctl.c b/tools/acrn-manager/acrnctl.c index 6c05d2692..630aff34d 100644 --- a/tools/acrn-manager/acrnctl.c +++ b/tools/acrn-manager/acrnctl.c @@ -34,6 +34,7 @@ #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" struct acrnctl_cmd { const char *cmd; @@ -434,6 +435,32 @@ static int acrnctl_do_continue(int argc, char *argv[]) return 0; } +static int acrnctl_do_suspend(int argc, char *argv[]) +{ + struct vmmngr_struct *s; + int i; + + for (i = 1; i < argc; i++) { + s = vmmngr_find(argv[1]); + if (!s) { + printf("Can't find vm %s\n", argv[i]); + continue; + } + + /* Only send suspend cmd to acrn-dm now when VM_STARTED */ + switch (s->state) { + case VM_STARTED: + suspend_vm(argv[i]); + break; + default: + printf("%s current state %s, can't suspend\n", + argv[i], state_str[s->state]); + } + } + + return 0; +} + /* Default args validation function */ int df_valid_args(struct acrnctl_cmd *cmd, int argc, char *argv[]) { @@ -489,6 +516,7 @@ struct acrnctl_cmd acmds[] = { 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), }; #define NCMD (sizeof(acmds)/sizeof(struct acrnctl_cmd)) diff --git a/tools/acrn-manager/acrnctl.h b/tools/acrn-manager/acrnctl.h index be90549e0..ffcb9d9fe 100644 --- a/tools/acrn-manager/acrnctl.h +++ b/tools/acrn-manager/acrnctl.h @@ -61,5 +61,6 @@ int stop_vm(char *vmname); int start_vm(char *vmname); int pause_vm(char *vmname); int continue_vm(char *vmname); +int suspend_vm(char *vmname); #endif /* _ACRNCTL_H_ */