|
@@ -1914,6 +1914,8 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
|
|
X86MachineState *x86ms = X86_MACHINE(machine);
|
|
X86MachineState *x86ms = X86_MACHINE(machine);
|
|
const CPUArchIdList *apic_ids = mc->possible_cpu_arch_ids(machine);
|
|
const CPUArchIdList *apic_ids = mc->possible_cpu_arch_ids(machine);
|
|
PCMachineState *pcms = PC_MACHINE(machine);
|
|
PCMachineState *pcms = PC_MACHINE(machine);
|
|
|
|
+ int nb_numa_nodes = machine->numa_state->num_nodes;
|
|
|
|
+ NodeInfo *numa_info = machine->numa_state->nodes;
|
|
ram_addr_t hotplugabble_address_space_size =
|
|
ram_addr_t hotplugabble_address_space_size =
|
|
object_property_get_int(OBJECT(pcms), PC_MACHINE_DEVMEM_REGION_SIZE,
|
|
object_property_get_int(OBJECT(pcms), PC_MACHINE_DEVMEM_REGION_SIZE,
|
|
NULL);
|
|
NULL);
|
|
@@ -1957,9 +1959,9 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
|
|
next_base = 0;
|
|
next_base = 0;
|
|
numa_start = table_data->len;
|
|
numa_start = table_data->len;
|
|
|
|
|
|
- for (i = 1; i < pcms->numa_nodes + 1; ++i) {
|
|
|
|
|
|
+ for (i = 1; i < nb_numa_nodes + 1; ++i) {
|
|
mem_base = next_base;
|
|
mem_base = next_base;
|
|
- mem_len = pcms->node_mem[i - 1];
|
|
|
|
|
|
+ mem_len = numa_info[i - 1].node_mem;
|
|
next_base = mem_base + mem_len;
|
|
next_base = mem_base + mem_len;
|
|
|
|
|
|
/* Cut out the 640K hole */
|
|
/* Cut out the 640K hole */
|
|
@@ -2007,7 +2009,7 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
|
|
}
|
|
}
|
|
|
|
|
|
slots = (table_data->len - numa_start) / sizeof *numamem;
|
|
slots = (table_data->len - numa_start) / sizeof *numamem;
|
|
- for (; slots < pcms->numa_nodes + 2; slots++) {
|
|
|
|
|
|
+ for (; slots < nb_numa_nodes + 2; slots++) {
|
|
numamem = acpi_data_push(table_data, sizeof *numamem);
|
|
numamem = acpi_data_push(table_data, sizeof *numamem);
|
|
build_srat_memory(numamem, 0, 0, 0, MEM_AFFINITY_NOFLAGS);
|
|
build_srat_memory(numamem, 0, 0, 0, MEM_AFFINITY_NOFLAGS);
|
|
}
|
|
}
|
|
@@ -2023,7 +2025,7 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
|
|
if (hotplugabble_address_space_size) {
|
|
if (hotplugabble_address_space_size) {
|
|
numamem = acpi_data_push(table_data, sizeof *numamem);
|
|
numamem = acpi_data_push(table_data, sizeof *numamem);
|
|
build_srat_memory(numamem, machine->device_memory->base,
|
|
build_srat_memory(numamem, machine->device_memory->base,
|
|
- hotplugabble_address_space_size, pcms->numa_nodes - 1,
|
|
|
|
|
|
+ hotplugabble_address_space_size, nb_numa_nodes - 1,
|
|
MEM_AFFINITY_HOTPLUGGABLE | MEM_AFFINITY_ENABLED);
|
|
MEM_AFFINITY_HOTPLUGGABLE | MEM_AFFINITY_ENABLED);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -2525,7 +2527,7 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
#endif
|
|
#endif
|
|
- if (pcms->numa_nodes) {
|
|
|
|
|
|
+ if (machine->numa_state->num_nodes) {
|
|
acpi_add_table(table_offsets, tables_blob);
|
|
acpi_add_table(table_offsets, tables_blob);
|
|
build_srat(tables_blob, tables->linker, machine);
|
|
build_srat(tables_blob, tables->linker, machine);
|
|
if (machine->numa_state->have_numa_distance) {
|
|
if (machine->numa_state->have_numa_distance) {
|