david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pc: acpi: create MADT.lapic entries only for valid lapics

Browse Source 
do not assume that all lapics in range 0..apic_id_limit
are valid and do not create lapic entries for not
possible lapics in MADT.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
This commit is contained in:
Igor Mammedov 2016-02-26 14:59:24 +01:00 committed by Michael S. Tsirkin
parent 5803fce389
commit 907e7c94d1
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hw/i386/acpi-build.c
View File

@ -362,9 +362,10 @@ build_fadt(GArray *table_data, GArray *linker, AcpiPmInfo *pm,
} }
static void static void
build_madt(GArray *table_data, GArray *linker, PCMachineState *pcms, build_madt(GArray *table_data, GArray *linker, PCMachineState *pcms)
AcpiCpuInfo *cpu)
{ {
MachineClass *mc = MACHINE_GET_CLASS(pcms);
CPUArchIdList *apic_ids = mc->possible_cpu_arch_ids(MACHINE(pcms));
int madt_start = table_data->len; int madt_start = table_data->len;
AcpiMultipleApicTable *madt; AcpiMultipleApicTable *madt;
@ -377,18 +378,22 @@ build_madt(GArray *table_data, GArray *linker, PCMachineState *pcms,
madt->local_apic_address = cpu_to_le32(APIC_DEFAULT_ADDRESS); madt->local_apic_address = cpu_to_le32(APIC_DEFAULT_ADDRESS);
madt->flags = cpu_to_le32(1); madt->flags = cpu_to_le32(1);
for (i = 0; i < pcms->apic_id_limit; i++) { for (i = 0; i < apic_ids->len; i++) {
AcpiMadtProcessorApic *apic = acpi_data_push(table_data, sizeof *apic); AcpiMadtProcessorApic *apic = acpi_data_push(table_data, sizeof *apic);
int apic_id = apic_ids->cpus[i].arch_id;
apic->type = ACPI_APIC_PROCESSOR; apic->type = ACPI_APIC_PROCESSOR;
apic->length = sizeof(*apic); apic->length = sizeof(*apic);
apic->processor_id = i; apic->processor_id = apic_id;
apic->local_apic_id = i; apic->local_apic_id = apic_id;
if (test_bit(i, cpu->found_cpus)) { if (apic_ids->cpus[i].cpu != NULL) {
apic->flags = cpu_to_le32(1); apic->flags = cpu_to_le32(1);
} else { } else {
apic->flags = cpu_to_le32(0); apic->flags = cpu_to_le32(0);
} }
} }
g_free(apic_ids);
io_apic = acpi_data_push(table_data, sizeof *io_apic); io_apic = acpi_data_push(table_data, sizeof *io_apic);
io_apic->type = ACPI_APIC_IO; io_apic->type = ACPI_APIC_IO;
io_apic->length = sizeof(*io_apic); io_apic->length = sizeof(*io_apic);
@ -2717,7 +2722,7 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine)
aml_len += tables_blob->len - fadt; aml_len += tables_blob->len - fadt;
acpi_add_table(table_offsets, tables_blob); acpi_add_table(table_offsets, tables_blob);
build_madt(tables_blob, tables->linker, pcms, &cpu); build_madt(tables_blob, tables->linker, pcms);
if (misc.has_hpet) { if (misc.has_hpet) {
acpi_add_table(table_offsets, tables_blob); acpi_add_table(table_offsets, tables_blob);