Re: [Qemu-devel] [PATCH v3 4/7] acpi: Don't use MAX_CPUMASK_BITS for APIC ID bitmap

[Laszlo Ersek]

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 <address@hidden>
> ---
>  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 <address@hidden>