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

dm: acrn-tool: Add new parameter for acrnctl add

Browse Source 
This patch adds the "-C" parameter handing in acrnctl. The "-C"
parameter be introduced for acrn-dm QoS feature. By current acrnctl
implementation, it will dry run the launch_uos.sh script to obtain the
VM name which defined during script execution.
The patch will strip "-C" parameter during the script dry run to avoid
create unexpected container, and add the "-C" parameter to the arguments
file after the script dry run.

Tracked-On: #2020
Signed-off-by: Long Liu <long.liu@intel.com>
Acked-by: Yan, Like <like.yan@intel.com>
This commit is contained in:
Long Liu 2019-02-14 09:32:58 +08:00 committed by wenlingz
parent 2f7ed65f90
commit a0efd3e591
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -159,7 +159,7 @@ static inline int _get_vmname(const char *src, char *vmname, int max_len_vmname)
return 0; return 0;
} }
#define MAX_FILE_SIZE (4096 * 4) #define MAX_FILE_SIZE (4096 * 5)
#define FILE_NAME_LENGTH 128 #define FILE_NAME_LENGTH 128
#define TMP_FILE_SUFFIX ".acrnctl" #define TMP_FILE_SUFFIX ".acrnctl"
@ -175,7 +175,7 @@ static int acrnctl_do_add(int argc, char *argv[])
char fname[FILE_NAME_LENGTH + sizeof(TMP_FILE_SUFFIX)]; char fname[FILE_NAME_LENGTH + sizeof(TMP_FILE_SUFFIX)];
char cmd[128]; char cmd[128];
char args[128]; char args[128];
int p, i, len_cmd_out = 0; int p, i, len_cmd_out = 0, c_flag = 0;
char cmd_out[256]; char cmd_out[256];
char vmname[128]; char vmname[128];
size_t len = sizeof(cmd_out); size_t len = sizeof(cmd_out);
@ -193,6 +193,21 @@ static int acrnctl_do_add(int argc, char *argv[])
printf("Too many optional args: %s\n", args); printf("Too many optional args: %s\n", args);
return -1; return -1;
} }
/*
* If there's "-C" parameter in acrnctl add command
* check if the SoS support runC container at first, then
* strip "-C" and set the flag.
*/
if (strncmp(argv[i], "-C", 2) == 0) {
if (access("/sbin/runc", F_OK) != 0) {
printf("runC command not supproted\n");
return -1;
}
c_flag = 1;
continue;
}
p += snprintf(&args[p], sizeof(args) - p, " %s", argv[i]); p += snprintf(&args[p], sizeof(args) - p, " %s", argv[i]);
} }
args[p] = ' '; args[p] = ' ';
@ -352,6 +367,9 @@ static int acrnctl_do_add(int argc, char *argv[])
} }
system(cmd); system(cmd);
/* If c_flag have been seted, add stripped "-C" to args file */
if (c_flag)
strncpy(args + p + 1, "-C", 2);
if (snprintf(cmd, sizeof(cmd), "echo %s >%s/%s.args", args, if (snprintf(cmd, sizeof(cmd), "echo %s >%s/%s.args", args,
ACRN_CONF_PATH_ADD, vmname) >= sizeof(cmd)) { ACRN_CONF_PATH_ADD, vmname) >= sizeof(cmd)) {
printf("ERROR: cmd is truncated\n"); printf("ERROR: cmd is truncated\n");