From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54515) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WOXOX-00048e-KM for qemu-devel@nongnu.org; Fri, 14 Mar 2014 15:03:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WOXOR-0003Yt-BA for qemu-devel@nongnu.org; Fri, 14 Mar 2014 15:03:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:62287) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WOXOR-0003Ym-1x for qemu-devel@nongnu.org; Fri, 14 Mar 2014 15:03:43 -0400 Message-ID: <5323528B.6000300@redhat.com> Date: Fri, 14 Mar 2014 20:03:39 +0100 From: Laszlo Ersek MIME-Version: 1.0 References: <1394823137-4369-1-git-send-email-ehabkost@redhat.com> <1394823137-4369-5-git-send-email-ehabkost@redhat.com> In-Reply-To: <1394823137-4369-5-git-send-email-ehabkost@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v3 4/7] acpi: Don't use MAX_CPUMASK_BITS for APIC ID bitmap List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost , qemu-devel@nongnu.org Cc: Igor Mammedov , =?ISO-8859-1?Q?Andreas_F=E4rber?= , "Michael S. Tsirkin" On 03/14/14 19:52, Eduardo Habkost wrote: > MAX_CPUMASK_BITS is a limit for max_cpus and CPU indexes, not for APIC > IDs. > > ACPI_CPU_HOTPLUG_ID_LIMIT is the right macro for the limit on APIC IDs > on the ACPI and CPU hotplug code. > > There are no functional changes introduced by this patch, as > MAX_CPUMASK_BITS + 1 == 255 + 1 == 256 == ACPI_CPU_HOTPLUG_ID_LIMIT. > > Signed-off-by: Eduardo Habkost > --- > hw/i386/acpi-build.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index b667d31..749af1e 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -52,7 +52,7 @@ > #include "qom/qom-qobject.h" > > typedef struct AcpiCpuInfo { > - DECLARE_BITMAP(found_cpus, MAX_CPUMASK_BITS + 1); > + DECLARE_BITMAP(found_cpus, ACPI_CPU_HOTPLUG_ID_LIMIT); > } AcpiCpuInfo; > > typedef struct AcpiMcfgInfo { > @@ -117,7 +117,7 @@ int acpi_add_cpu_info(Object *o, void *opaque) > > if (object_dynamic_cast(o, TYPE_CPU)) { > apic_id = object_property_get_int(o, "apic-id", NULL); > - assert(apic_id <= MAX_CPUMASK_BITS); > + assert(apic_id < ACPI_CPU_HOTPLUG_ID_LIMIT); > > set_bit(apic_id, cpu->found_cpus); > } > Reviewed-by: Laszlo Ersek