From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59903) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1abQbC-0003rH-Ur for qemu-devel@nongnu.org; Thu, 03 Mar 2016 05:35:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1abQb8-0002wo-SE for qemu-devel@nongnu.org; Thu, 03 Mar 2016 05:35:14 -0500 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:36484) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1abQb8-0002wj-Kc for qemu-devel@nongnu.org; Thu, 03 Mar 2016 05:35:10 -0500 Received: by mail-wm0-x244.google.com with SMTP id l68so3321927wml.3 for ; Thu, 03 Mar 2016 02:35:10 -0800 (PST) References: <1456495168-144510-1-git-send-email-imammedo@redhat.com> <1456495168-144510-7-git-send-email-imammedo@redhat.com> From: Marcel Apfelbaum Message-ID: <56D8135A.8080407@gmail.com> Date: Thu, 3 Mar 2016 12:35:06 +0200 MIME-Version: 1.0 In-Reply-To: <1456495168-144510-7-git-send-email-imammedo@redhat.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v4 06/10] pc: acpi: create MADT.lapic entries only for valid lapics Reply-To: marcel@redhat.com List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Igor Mammedov , qemu-devel@nongnu.org Cc: marcel@redhat.com, ehabkost@redhat.com, mst@redhat.com On 02/26/2016 03:59 PM, Igor Mammedov wrote: > 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 > --- > hw/i386/acpi-build.c | 19 ++++++++++++------- > 1 file changed, 12 insertions(+), 7 deletions(-) > > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index 54d2f92..c06f3f5 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -362,9 +362,10 @@ build_fadt(GArray *table_data, GArray *linker, AcpiPmInfo *pm, > } > > static void > -build_madt(GArray *table_data, GArray *linker, PCMachineState *pcms, > - AcpiCpuInfo *cpu) > +build_madt(GArray *table_data, GArray *linker, PCMachineState *pcms) > { > + MachineClass *mc = MACHINE_GET_CLASS(pcms); > + CPUArchIdList *apic_ids = mc->possible_cpu_arch_ids(MACHINE(pcms)); > int madt_start = table_data->len; > > 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->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); > + int apic_id = apic_ids->cpus[i].arch_id; > + > apic->type = ACPI_APIC_PROCESSOR; > apic->length = sizeof(*apic); > - apic->processor_id = i; > - apic->local_apic_id = i; > - if (test_bit(i, cpu->found_cpus)) { > + apic->processor_id = apic_id; > + apic->local_apic_id = apic_id; > + if (apic_ids->cpus[i].cpu != NULL) { > apic->flags = cpu_to_le32(1); > } else { > apic->flags = cpu_to_le32(0); > } > } > + g_free(apic_ids); > + > io_apic = acpi_data_push(table_data, sizeof *io_apic); > io_apic->type = ACPI_APIC_IO; > io_apic->length = sizeof(*io_apic); > @@ -2648,7 +2653,7 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) > aml_len += tables_blob->len - fadt; > > 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) { > acpi_add_table(table_offsets, tables_blob); > Looks OK to me. Reviewed-by: Marcel Apfelbaum Thanks, Marcel