motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-05 16:53:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

NUMA: move numa related code to new file numa.c

Browse source 
Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Signed-off-by: Andre Przywara <andre.przywara@amd.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>

MST: comment tweaks
This commit is contained in:
Wanlong Gao 2014-05-14 17:43:05 +08:00 • committed by Michael S. Tsirkin
parent edd8db8705
commit 96d0e26c23
8 changed files with 192 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

139
vl.c
View file

@ -1275,102 +1275,6 @@ char *get_boot_devices_list(size_t *size, bool ignore_suffixes)
return list;
}
static void numa_node_parse_cpus(int nodenr, const char *cpus)
{
char *endptr;
unsigned long long value, endvalue;
/* Empty CPU range strings will be considered valid, they will simply
* not set any bit in the CPU bitmap.
*/
if (!*cpus) {
return;
}
if (parse_uint(cpus, &value, &endptr, 10) < 0) {
goto error;
}
if (*endptr == '-') {
if (parse_uint_full(endptr + 1, &endvalue, 10) < 0) {
goto error;
}
} else if (*endptr == '\0') {
endvalue = value;
} else {
goto error;
}
if (endvalue >= MAX_CPUMASK_BITS) {
endvalue = MAX_CPUMASK_BITS - 1;
fprintf(stderr,
"qemu: NUMA: A max of %d VCPUs are supported\n",
MAX_CPUMASK_BITS);
}
if (endvalue < value) {
goto error;
}
bitmap_set(node_cpumask[nodenr], value, endvalue-value+1);
return;
error:
fprintf(stderr, "qemu: Invalid NUMA CPU range: %s\n", cpus);
exit(1);
}
static void numa_add(const char *optarg)
{
char option[128];
char *endptr;
unsigned long long nodenr;
optarg = get_opt_name(option, 128, optarg, ',');
if (*optarg == ',') {
optarg++;
}
if (!strcmp(option, "node")) {
if (nb_numa_nodes >= MAX_NODES) {
fprintf(stderr, "qemu: too many NUMA nodes\n");
exit(1);
}
if (get_param_value(option, 128, "nodeid", optarg) == 0) {
nodenr = nb_numa_nodes;
} else {
if (parse_uint_full(option, &nodenr, 10) < 0) {
fprintf(stderr, "qemu: Invalid NUMA nodeid: %s\n", option);
exit(1);
}
}
if (nodenr >= MAX_NODES) {
fprintf(stderr, "qemu: invalid NUMA nodeid: %llu\n", nodenr);
exit(1);
}
if (get_param_value(option, 128, "mem", optarg) == 0) {
node_mem[nodenr] = 0;
} else {
int64_t sval;
sval = strtosz(option, &endptr);
if (sval < 0 || *endptr) {
fprintf(stderr, "qemu: invalid numa mem size: %s\n", optarg);
exit(1);
}
node_mem[nodenr] = sval;
}
if (get_param_value(option, 128, "cpus", optarg) != 0) {
numa_node_parse_cpus(nodenr, option);
}
nb_numa_nodes++;
} else {
fprintf(stderr, "Invalid -numa option: %s\n", option);
exit(1);
}
}
static QemuOptsList qemu_smp_opts = {
.name = "smp-opts",
.implied_opt_name = "cpus",
@ -4400,48 +4304,7 @@ int main(int argc, char **argv, char **envp)
default_drive(default_floppy, snapshot, IF_FLOPPY, 0, FD_OPTS);
default_drive(default_sdcard, snapshot, IF_SD, 0, SD_OPTS);
if (nb_numa_nodes > 0) {
int i;
if (nb_numa_nodes > MAX_NODES) {
nb_numa_nodes = MAX_NODES;
}
/* If no memory size if given for any node, assume the default case
* and distribute the available memory equally across all nodes
*/
for (i = 0; i < nb_numa_nodes; i++) {
if (node_mem[i] != 0)
break;
}
if (i == nb_numa_nodes) {
uint64_t usedmem = 0;
/* On Linux, the each node's border has to be 8MB aligned,
* the final node gets the rest.
*/
for (i = 0; i < nb_numa_nodes - 1; i++) {
node_mem[i] = (ram_size / nb_numa_nodes) & ~((1 << 23UL) - 1);
usedmem += node_mem[i];
}
node_mem[i] = ram_size - usedmem;
}
for (i = 0; i < nb_numa_nodes; i++) {
if (!bitmap_empty(node_cpumask[i], MAX_CPUMASK_BITS)) {
break;
}
}
/* assigning the VCPUs round-robin is easier to implement, guest OSes
* must cope with this anyway, because there are BIOSes out there in
* real machines which also use this scheme.
*/
if (i == nb_numa_nodes) {
for (i = 0; i < max_cpus; i++) {
set_bit(i, node_cpumask[i % nb_numa_nodes]);
}
}
}
set_numa_nodes();
if (qemu_opts_foreach(qemu_find_opts("mon"), mon_init_func, NULL, 1) != 0) {
exit(1);