falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

numa: do default mapping based on possible_cpus instead of node_cpu bitmaps 

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Message-Id: <1494415802-227633-8-git-send-email-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Igor Mammedov 2017-05-10 13:29:51 +02:00 committed by Eduardo Habkost
parent 7c88e65d9e
commit af9b20e8d2
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
numa.c
View File

@ -458,6 +458,7 @@ void numa_default_auto_assign_ram(MachineClass *mc, NodeInfo *nodes,
void parse_numa_opts(MachineState *ms) void parse_numa_opts(MachineState *ms)
{ {
int i; int i;
const CPUArchIdList *possible_cpus;
MachineClass *mc = MACHINE_GET_CLASS(ms); MachineClass *mc = MACHINE_GET_CLASS(ms);
for (i = 0; i < MAX_NODES; i++) { for (i = 0; i < MAX_NODES; i++) {
@ -519,18 +520,21 @@ void parse_numa_opts(MachineState *ms)
numa_set_mem_ranges(); numa_set_mem_ranges();
for (i = 0; i < nb_numa_nodes; i++) { /* assign CPUs to nodes using board provided default mapping */
if (!bitmap_empty(numa_info[i].node_cpu, max_cpus)) { if (!mc->cpu_index_to_instance_props || !mc->possible_cpu_arch_ids) {
error_report("default CPUs to NUMA node mapping isn't supported");
exit(1);
}
possible_cpus = mc->possible_cpu_arch_ids(ms);
for (i = 0; i < possible_cpus->len; i++) {
if (possible_cpus->cpus[i].props.has_node_id) {
break; break;
} }
} }
/* assign CPUs to nodes using board provided default mapping */ /* no CPUs are assigned to NUMA nodes */
if (!mc->cpu_index_to_instance_props) { if (i == possible_cpus->len) {
error_report("default CPUs to NUMA node mapping isn't supported");
exit(1);
}
if (i == nb_numa_nodes) {
for (i = 0; i < max_cpus; i++) { for (i = 0; i < max_cpus; i++) {
CpuInstanceProperties props; CpuInstanceProperties props;
/* fetch default mapping from board and enable it */ /* fetch default mapping from board and enable it */