mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vl.c: Extract -numa "cpus" parsing to separate function

Browse Source 
This will make it easier to refactor that code later.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Eduardo Habkost 2013-02-04 16:27:51 -02:00 committed by Anthony Liguori
parent 5f1399651e
commit 845e5bf9cd
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
vl.c
View File

@ -1244,15 +1244,34 @@ char *get_boot_devices_list(size_t *size)
return list;
}
static void numa_node_parse_cpus(int nodenr, const char *cpus)
{
char *endptr;
unsigned long long value, endvalue;
value = strtoull(cpus, &endptr, 10);
if (*endptr == '-') {
endvalue = strtoull(endptr+1, &endptr, 10);
} else {
endvalue = value;
}
if (!(endvalue < MAX_CPUMASK_BITS)) {
endvalue = MAX_CPUMASK_BITS - 1;
fprintf(stderr,
"A max of %d CPUs are supported in a guest\n",
MAX_CPUMASK_BITS);
}
bitmap_set(node_cpumask[nodenr], value, endvalue-value+1);
}
static void numa_add(const char *optarg)
{
char option[128];
char *endptr;
unsigned long long value, endvalue;
unsigned long long nodenr;
value = endvalue = 0ULL;
optarg = get_opt_name(option, 128, optarg, ',');
if (*optarg == ',') {
optarg++;
@ -1290,21 +1309,7 @@ static void numa_add(const char *optarg)
node_mem[nodenr] = sval;
}
if (get_param_value(option, 128, "cpus", optarg) != 0) {
value = strtoull(option, &endptr, 10);
if (*endptr == '-') {
endvalue = strtoull(endptr+1, &endptr, 10);
} else {
endvalue = value;
}
if (!(endvalue < MAX_CPUMASK_BITS)) {
endvalue = MAX_CPUMASK_BITS - 1;
fprintf(stderr,
"A max of %d CPUs are supported in a guest\n",
MAX_CPUMASK_BITS);
}
bitmap_set(node_cpumask[nodenr], value, endvalue-value+1);
numa_node_parse_cpus(nodenr, option);
}
nb_numa_nodes++;
} else {