From 798325ed3856bc1e2f2b640b7e0db60044fdddf9 Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Fri, 14 Mar 2014 16:33:53 -0300 Subject: acpi: Don't use MAX_CPUMASK_BITS for APIC ID bitmap 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 Reviewed-by: Laszlo Ersek Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/i386/acpi-build.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'hw/i386') diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 4d781a168..41f3d8a42 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); } -- cgit v1.2.3