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

tools: acrn-manager: fix the possibility of creating directory at will by no permission process

Browse Source 
There are several duplicate definitions for check_dir, it can check or create directory at will. However, only acrnd and dm monitor can create the directory. This commit fixs the possibility of creating directory at will by no permission process, which adds a param flags to conctrl if it should create the directory. By the way, this commit collates related MACRO into the same file , deletes the duplicate definitions in another files and fixs some format issues.

Tracked-On: #2886
Signed-off-by: Mao Jiang <maox.jiang@intel.com>
Acked-by: Yan, Like <like.yan@intel.com>
This commit is contained in:
Jiang,Mao
2019-04-16 12:16:04 +08:00
committed by ACRN System Integration
parent 16a2af5715
commit e50c0c88fb
7 changed files with 83 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tools/acrn-manager/acrnctl.c
View File

@@ -86,7 +86,7 @@ static int check_name(const char *name)
return -1;
if (strnlen(name, MAX_VM_OS_NAME_LEN) >= MAX_VM_OS_NAME_LEN) {
printf("(%s) size exceed MAX_VM_OS_NAME_LEN:%u\n", name,MAX_VM_OS_NAME_LEN);
printf("(%s) size exceed MAX_VM_OS_NAME_LEN:%u\n", name, MAX_VM_OS_NAME_LEN);
return -1;
}
@@ -425,7 +425,7 @@ static int acrnctl_do_stop(int argc, char *argv[])
return -1;
}
if (s->state == VM_CREATED) {
printf("%s is already (%s)\n", argv[1],state_str[s->state]);
printf("%s is already (%s)\n", argv[1], state_str[s->state]);
return -1;
}
return stop_vm(argv[1]);
@@ -490,15 +490,15 @@ static int acrnctl_do_del(int argc, char *argv[])
return -1;
}
if (s->state != VM_CREATED) {
printf("can't delete %s(%s)\n", argv[1],state_str[s->state]);
printf("can't delete %s(%s)\n", argv[1], state_str[s->state]);
return -1;
}
if (snprintf(cmd, sizeof(cmd), "rm -f %s/%s.sh",ACRN_CONF_PATH_ADD, argv[1]) >= sizeof(cmd)) {
if (snprintf(cmd, sizeof(cmd), "rm -f %s/%s.sh", ACRN_CONF_PATH_ADD, argv[1]) >= sizeof(cmd)) {
printf("WARN: cmd is truncated\n");
return -1;
}
system(cmd);
if (snprintf(cmd, sizeof(cmd), "rm -f %s/%s.args",ACRN_CONF_PATH_ADD, argv[1]) >= sizeof(cmd)) {
if (snprintf(cmd, sizeof(cmd), "rm -f %s/%s.args", ACRN_CONF_PATH_ADD, argv[1]) >= sizeof(cmd)) {
printf("WARN: cmd is truncated\n");
return -1;
}
@@ -547,7 +547,7 @@ static int acrnctl_do_pause(int argc, char *argv[])
ret = pause_vm(argv[1]);
break;
default:
printf("%s current state %s, can't pause\n",argv[1], state_str[s->state]);
printf("%s current state %s, can't pause\n", argv[1], state_str[s->state]);
}
return ret;
@@ -573,7 +573,7 @@ static int acrnctl_do_continue(int argc, char *argv[])
ret = continue_vm(argv[1]);
break;
default:
printf("%s current state %s, can't continue\n",argv[1], state_str[s->state]);
printf("%s current state %s, can't continue\n", argv[1], state_str[s->state]);
}
return ret;
@@ -596,7 +596,7 @@ static int acrnctl_do_suspend(int argc, char *argv[])
ret = suspend_vm(argv[1]);
break;
default:
printf("%s current state %s, can't suspend\n",argv[1], state_str[s->state]);
printf("%s current state %s, can't suspend\n", argv[1], state_str[s->state]);
}
return ret;
@@ -626,7 +626,7 @@ static int acrnctl_do_resume(int argc, char *argv[])
printf("resume %s reason(0x%x\n", argv[1], reason);
break;
default:
printf("%s current state %s, can't resume\n",argv[1], state_str[s->state]);
printf("%s current state %s, can't resume\n", argv[1], state_str[s->state]);
}
return ret;
@@ -677,13 +677,13 @@ static int acrnctl_do_reset(int argc, char *argv[])
break;
}
if (wait_vm_stop(argv[1], STOP_TIMEOUT)) {
printf("Failed to stop %s in %u sec, reset failed\n",argv[1], STOP_TIMEOUT);
printf("Failed to stop %s in %u sec, reset failed\n", argv[1], STOP_TIMEOUT);
break;
}
ret = start_vm(argv[1]);
break;
default:
printf("%s current state: %s, can't reset\n",argv[1], state_str[s->state]);
printf("%s current state: %s, can't reset\n", argv[1], state_str[s->state]);
}
return ret;
}