From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53748) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wk6r6-0004V1-Ig for qemu-devel@nongnu.org; Tue, 13 May 2014 03:10:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wk6qu-0002ux-Dt for qemu-devel@nongnu.org; Tue, 13 May 2014 03:10:28 -0400 From: "Li, Zhen-Hua" Date: Tue, 13 May 2014 15:09:14 +0800 Message-Id: <1399964954-10842-5-git-send-email-zhen-hual@hp.com> In-Reply-To: <1399964954-10842-1-git-send-email-zhen-hual@hp.com> References: <1399964954-10842-1-git-send-email-zhen-hual@hp.com> Subject: [Qemu-devel] [PATCH 4/4] Support more than 255 cpus: runtime check List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, qemu-trivial@nongnu.org, qemu-stable@nongnu.org Cc: "Li, ZhenHua" From: "Li, ZhenHua" There is some runtime check for max cpu count. Make them support 4096 cpus. Signed-off-by: Li, ZhenHua --- hw/i386/acpi-build.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index c98df88..5c3bf10 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -272,7 +272,7 @@ static void GCC_FMT_ATTR(2, 3) build_append_nameseg(GArray *array, const char *format, ...) { /* It would be nicer to use g_string_vprintf but it's only there in 2.22 */ - char s[] = "XXXX"; + char s[] = "XXXXXX"; int len; va_list args; @@ -280,7 +280,7 @@ build_append_nameseg(GArray *array, const char *format, ...) len = vsnprintf(s, sizeof s, format, args); va_end(args); - assert(len == 4); + assert(len == 4 || len == 5 || len == 6); g_array_append_vals(array, s, len); } @@ -680,7 +680,7 @@ build_append_notify_method(GArray *device, const char *name, for (i = 0; i < count; i++) { GArray *target = build_alloc_array(); build_append_nameseg(target, format, i); - assert(i < 256); /* Fits in 1 byte */ + assert(i < 4096); /* Fits in 1 byte */ build_append_notify_target_ifequal(method, target, i, 1); build_free_array(target); } @@ -1006,7 +1006,7 @@ build_ssdt(GArray *table_data, GArray *linker, /* 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); + QEMU_BUILD_BUG_ON(ACPI_CPU_HOTPLUG_ID_LIMIT > 4096); g_assert(acpi_cpus <= ACPI_CPU_HOTPLUG_ID_LIMIT); /* Copy header and patch values in the S3_ / S4_ / S5_ packages */ -- 2.0.0-rc0