From 665c2ee93f3d0c2872d55c2a4e911d1e1b7e3f3b Mon Sep 17 00:00:00 2001 From: Kaige Fu Date: Thu, 31 May 2018 10:30:25 +0800 Subject: [PATCH] tools: acrnctl: Add support for continuing vm Add command continue to start vm from pause 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 | 31 +++++++++++++++++++++++++++++++ tools/acrn-manager/acrnctl.h | 1 + 4 files changed, 53 insertions(+) diff --git a/tools/acrn-manager/README.rst b/tools/acrn-manager/README.rst index c2fef697c..9e32d5811 100644 --- a/tools/acrn-manager/README.rst +++ b/tools/acrn-manager/README.rst @@ -28,6 +28,7 @@ You can see the available ``acrnctl`` commands by running: del add pause + continue 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 98a474f7c..24126496a 100644 --- a/tools/acrn-manager/acrn_vm_ops.c +++ b/tools/acrn-manager/acrn_vm_ops.c @@ -220,3 +220,23 @@ int pause_vm(char *vmname) return ack.err; } + +int continue_vm(char *vmname) +{ + struct req_dm_continue req; + struct ack_dm_continue ack; + + req.msg.magic = MNGR_MSG_MAGIC; + req.msg.msgid = DM_CONTINUE; + 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 continue vm. errno(%d)\n", ack.err); + } + + return ack.err; +} diff --git a/tools/acrn-manager/acrnctl.c b/tools/acrn-manager/acrnctl.c index f9d0b7ef2..6c05d2692 100644 --- a/tools/acrn-manager/acrnctl.c +++ b/tools/acrn-manager/acrnctl.c @@ -33,6 +33,7 @@ #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" struct acrnctl_cmd { const char *cmd; @@ -404,6 +405,35 @@ static int acrnctl_do_pause(int argc, char *argv[]) return 0; } +static int acrnctl_do_continue(int argc, char *argv[]) +{ + struct vmmngr_struct *s; + int i; + + for (i = 1; i < argc; i++) { + s = vmmngr_find(argv[i]); + if (!s) { + printf("Can't find vm %s\n", argv[i]); + continue; + } + + /* 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: + continue_vm(argv[i]); + break; + default: + printf("%s current state %s, can't continue\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[]) { @@ -458,6 +488,7 @@ struct acrnctl_cmd acmds[] = { 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), }; #define NCMD (sizeof(acmds)/sizeof(struct acrnctl_cmd)) diff --git a/tools/acrn-manager/acrnctl.h b/tools/acrn-manager/acrnctl.h index 9b133fdb7..be90549e0 100644 --- a/tools/acrn-manager/acrnctl.h +++ b/tools/acrn-manager/acrnctl.h @@ -60,5 +60,6 @@ int list_vm(void); int stop_vm(char *vmname); int start_vm(char *vmname); int pause_vm(char *vmname); +int continue_vm(char *vmname); #endif /* _ACRNCTL_H_ */