From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57457) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WPa2o-0002fD-NQ for qemu-devel@nongnu.org; Mon, 17 Mar 2014 12:05:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WPa2i-0001A1-O9 for qemu-devel@nongnu.org; Mon, 17 Mar 2014 12:05:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:61324) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WPa2i-00019Y-GE for qemu-devel@nongnu.org; Mon, 17 Mar 2014 12:05:36 -0400 From: Laszlo Ersek Date: Mon, 17 Mar 2014 17:05:17 +0100 Message-Id: <1395072317-15679-3-git-send-email-lersek@redhat.com> In-Reply-To: <1395072317-15679-1-git-send-email-lersek@redhat.com> References: <1395072317-15679-1-git-send-email-lersek@redhat.com> Subject: [Qemu-devel] [for-2.1 PATCH v2 2/2] i386/acpi-build: support hotplug of VCPU with APIC ID 0xFF List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, afaerber@suse.de, ehabkost@redhat.com, imammedo@redhat.com, mst@redhat.com Building on the previous patch, raise the maximal count of processor objects / NTFY branches / CPON elements from 255 to 256. This allows the VCPU with APIC ID 0xFF to be hotplugged. Signed-off-by: Laszlo Ersek --- hw/i386/acpi-build.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 2bbefb5..c9fe07f 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -999,11 +999,16 @@ build_ssdt(GArray *table_data, GArray *linker, AcpiCpuInfo *cpu, AcpiPmInfo *pm, AcpiMiscInfo *misc, PcPciInfo *pci, PcGuestInfo *guest_info) { - int acpi_cpus = MIN(0xff, guest_info->apic_id_limit); + unsigned acpi_cpus = guest_info->apic_id_limit; int ssdt_start = table_data->len; uint8_t *ssdt_ptr; int i; + /* The current AML generator can cover the APIC ID range [0..255], + * inclusive, for VCPU hotplug. */ + QEMU_BUILD_BUG_ON(ACPI_CPU_HOTPLUG_ID_LIMIT > 256); + g_assert(acpi_cpus <= ACPI_CPU_HOTPLUG_ID_LIMIT); + /* Copy header and patch values in the S3_ / S4_ / S5_ packages */ ssdt_ptr = acpi_data_push(table_data, sizeof(ssdp_misc_aml)); memcpy(ssdt_ptr, ssdp_misc_aml, sizeof(ssdp_misc_aml)); -- 1.8.3.1