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

HV: shell: rename sos_console to vm_console

Browse Source 
Change sos_console to vm_console, as this command is used to switch
console between VMs.

Tracked-On: #2987
Signed-off-by: Conghui Chen <conghui.chen@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Conghui Chen 2019-04-16 06:32:38 +08:00 committed by ACRN System Integration
parent 2362e58509
commit 1234f4f7b1
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hypervisor/debug/shell.c
View File

@ -37,7 +37,7 @@ static int32_t shell_list_vm(__unused int32_t argc, __unused char **argv);
static int32_t shell_list_vcpu(__unused int32_t argc, __unused char **argv); static int32_t shell_list_vcpu(__unused int32_t argc, __unused char **argv);
static int32_t shell_vcpu_dumpreg(int32_t argc, char **argv); static int32_t shell_vcpu_dumpreg(int32_t argc, char **argv);
static int32_t shell_dumpmem(int32_t argc, char **argv); static int32_t shell_dumpmem(int32_t argc, char **argv);
static int32_t shell_to_sos_console(int32_t argc, char **argv); static int32_t shell_to_vm_console(int32_t argc, char **argv);
static int32_t shell_show_cpu_int(__unused int32_t argc, __unused char **argv); static int32_t shell_show_cpu_int(__unused int32_t argc, __unused char **argv);
static int32_t shell_show_ptdev_info(__unused int32_t argc, __unused char **argv); static int32_t shell_show_ptdev_info(__unused int32_t argc, __unused char **argv);
static int32_t shell_show_vioapic_info(int32_t argc, char **argv); static int32_t shell_show_vioapic_info(int32_t argc, char **argv);
@ -80,10 +80,10 @@ static struct shell_cmd shell_cmds[] = {
.fcn = shell_dumpmem, .fcn = shell_dumpmem,
}, },
{ {
.str = SHELL_CMD_SOS_CONSOLE, .str = SHELL_CMD_VM_CONSOLE,
.cmd_param = SHELL_CMD_SOS_CONSOLE_PARAM, .cmd_param = SHELL_CMD_VM_CONSOLE_PARAM,
.help_str = SHELL_CMD_SOS_CONSOLE_HELP, .help_str = SHELL_CMD_VM_CONSOLE_HELP,
.fcn = shell_to_sos_console, .fcn = shell_to_vm_console,
}, },
{ {
.str = SHELL_CMD_INTERRUPT, .str = SHELL_CMD_INTERRUPT,
@ -842,7 +842,7 @@ static int32_t shell_dumpmem(int32_t argc, char **argv)
return 0; return 0;
} }
static int32_t shell_to_sos_console(__unused int32_t argc, __unused char **argv) static int32_t shell_to_vm_console(__unused int32_t argc, __unused char **argv)
{ {
char temp_str[TEMP_STR_SIZE]; char temp_str[TEMP_STR_SIZE];
uint16_t vm_id = 0U; uint16_t vm_id = 0U;

6
hypervisor/debug/shell_priv.h
View File

@ -55,9 +55,9 @@ struct shell {
#define SHELL_CMD_DUMPMEM_HELP "Dump host memory, starting at a given address, and for a given length (in "\ #define SHELL_CMD_DUMPMEM_HELP "Dump host memory, starting at a given address, and for a given length (in "\
"bytes)" "bytes)"
#define SHELL_CMD_SOS_CONSOLE "sos_console" #define SHELL_CMD_VM_CONSOLE "vm_console"
#define SHELL_CMD_SOS_CONSOLE_PARAM NULL #define SHELL_CMD_VM_CONSOLE_PARAM "<vm id>"
#define SHELL_CMD_SOS_CONSOLE_HELP "Switch to the SOS's console. Use [Ctrl+Spacebar] to return to the ACRN shell "\ #define SHELL_CMD_VM_CONSOLE_HELP "Switch to the VM's console. Use [Ctrl+Spacebar] to return to the ACRN shell "\
"console" "console"
#define SHELL_CMD_INTERRUPT "int" #define SHELL_CMD_INTERRUPT "int"