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

hv: renmae guest_no to vm_id in shell_to_sos_console()

Browse Source 
This commit renmaes guest_no in shell_to_sos_console() to vm_id, which is commonly used in ACRN.

Tracked-On: #2520
Signed-off-by: Yan, Like <like.yan@intel.com>
This commit is contained in:
Yan, Like 2019-04-02 09:46:53 +08:00 committed by ACRN System Integration
parent ab62261a57
commit 275625af16
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hypervisor/debug/shell.c
View File

@ -837,7 +837,7 @@ static int32_t shell_dumpmem(int32_t argc, char **argv)
static int32_t shell_to_sos_console(__unused int32_t argc, __unused char **argv) static int32_t shell_to_sos_console(__unused int32_t argc, __unused char **argv)
{ {
char temp_str[TEMP_STR_SIZE]; char temp_str[TEMP_STR_SIZE];
uint16_t guest_no = 0U; uint16_t vm_id = 0U;
struct acrn_vm *vm; struct acrn_vm *vm;
struct acrn_vuart *vu; struct acrn_vuart *vu;
@ -845,21 +845,21 @@ static int32_t shell_to_sos_console(__unused int32_t argc, __unused char **argv)
struct acrn_vm_config *vm_config; struct acrn_vm_config *vm_config;
if (argc == 2U) { if (argc == 2U) {
guest_no = sanitize_vmid(strtol_deci(argv[1])); vm_id = sanitize_vmid(strtol_deci(argv[1]));
} }
vuart_vmid = guest_no; vuart_vmid = vm_id;
#endif #endif
/* Get the virtual device node */ /* Get the virtual device node */
vm = get_vm_from_vmid(guest_no); vm = get_vm_from_vmid(vm_id);
if (vm == NULL) { if (vm == NULL) {
return -EINVAL; return -EINVAL;
} }
#ifdef CONFIG_PARTITION_MODE #ifdef CONFIG_PARTITION_MODE
vm_config = get_vm_config(guest_no); vm_config = get_vm_config(vm_id);
if (vm_config != NULL && vm_config->vm_vuart == false) { if (vm_config != NULL && vm_config->vm_vuart == false) {
snprintf(temp_str, TEMP_STR_SIZE, "No vUART configured for vm%d\n", guest_no); snprintf(temp_str, TEMP_STR_SIZE, "No vUART configured for vm%d\n", vm_id);
shell_puts(temp_str); shell_puts(temp_str);
return 0; return 0;
} }
@ -871,9 +871,7 @@ static int32_t shell_to_sos_console(__unused int32_t argc, __unused char **argv)
*/ */
vu->active = true; vu->active = true;
/* Output that switching to SOS shell */ /* Output that switching to SOS shell */
snprintf(temp_str, TEMP_STR_SIZE, snprintf(temp_str, TEMP_STR_SIZE, "\r\n----- Entering Guest %d Shell -----\r\n", vm_id);
"\r\n----- Entering Guest %d Shell -----\r\n",
guest_no);
shell_puts(temp_str); shell_puts(temp_str);