From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52895) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRiJK-0000jt-Nz for qemu-devel@nongnu.org; Fri, 05 Feb 2016 10:28:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aRiJH-0002Bo-HD for qemu-devel@nongnu.org; Fri, 05 Feb 2016 10:28:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35120) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRiJH-0002Bk-9G for qemu-devel@nongnu.org; Fri, 05 Feb 2016 10:28:35 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id DE15FC815 for ; Fri, 5 Feb 2016 15:28:34 +0000 (UTC) Date: Fri, 5 Feb 2016 13:28:31 -0200 From: Eduardo Habkost Message-ID: <20160205152831.GR26314@thinpad.lan.raisama.net> References: <1454586455-10202-1-git-send-email-imammedo@redhat.com> <1454586455-10202-6-git-send-email-imammedo@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1454586455-10202-6-git-send-email-imammedo@redhat.com> Subject: Re: [Qemu-devel] [PATCH 6/9] pc: acpi: create MADT.lapic entries only for valid lapics List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Igor Mammedov Cc: pbonzini@redhat.com, qemu-devel@nongnu.org, mst@redhat.com On Thu, Feb 04, 2016 at 12:47:32PM +0100, 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 Reviewed-by: Eduardo Habkost But there's one minor suggestion below: > --- > hw/i386/acpi-build.c | 21 ++++++++++++++------- > 1 file changed, 14 insertions(+), 7 deletions(-) > > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index df13c7d..9eeeffa 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -361,9 +361,11 @@ build_fadt(GArray *table_data, GArray *linker, AcpiPmInfo *pm, > } > > static void > -build_madt(GArray *table_data, GArray *linker, AcpiCpuInfo *cpu, > - PcGuestInfo *guest_info) > +build_madt(GArray *table_data, GArray *linker, > + MachineState *machine, PcGuestInfo *guest_info) > { > + MachineClass *mc = MACHINE_GET_CLASS(machine); > + GArray *apic_id_list = mc->possible_cpu_arch_ids(); > int madt_start = table_data->len; > > AcpiMultipleApicTable *madt; > @@ -376,18 +378,23 @@ build_madt(GArray *table_data, GArray *linker, AcpiCpuInfo *cpu, > madt->local_apic_address = cpu_to_le32(APIC_DEFAULT_ADDRESS); > madt->flags = cpu_to_le32(1); > > - for (i = 0; i < guest_info->apic_id_limit; i++) { > + for (i = 0; i < apic_id_list->len; i++) { > AcpiMadtProcessorApic *apic = acpi_data_push(table_data, sizeof *apic); > + CPUArchId id = FETCH_CPU_ARCH_ID(apic_id_list, i); > + int apic_id = id.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 (id.cpu != NULL) { This seems to be the only place where CPUArchId.cpu is being used (see my previous suggestion about making possible_cpu_arch_ids() return just an uint64_t list). Also, using the existing found_cpus bitmap is more efficient than making multiple calls to qemu_get_cpu_by_arch_id(). I wouldn't mind keeping the bitmap. > apic->flags = cpu_to_le32(1); > } else { > apic->flags = cpu_to_le32(0); > } > } > + g_array_free(apic_id_list, true); > + > io_apic = acpi_data_push(table_data, sizeof *io_apic); > io_apic->type = ACPI_APIC_IO; > io_apic->length = sizeof(*io_apic); > @@ -2659,7 +2666,7 @@ void acpi_build(PcGuestInfo *guest_info, AcpiBuildTables *tables) > aml_len += tables_blob->len - fadt; > > acpi_add_table(table_offsets, tables_blob); > - build_madt(tables_blob, tables->linker, &cpu, guest_info); > + build_madt(tables_blob, tables->linker, machine, guest_info); > > if (misc.has_hpet) { > acpi_add_table(table_offsets, tables_blob); > -- > 1.8.3.1 > -- Eduardo