From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55872) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bBQQX-0006Xu-DA for qemu-devel@nongnu.org; Fri, 10 Jun 2016 13:41:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bBQQS-0000R1-No for qemu-devel@nongnu.org; Fri, 10 Jun 2016 13:41:01 -0400 From: Andrew Jones Date: Fri, 10 Jun 2016 19:40:14 +0200 Message-Id: <1465580427-13596-4-git-send-email-drjones@redhat.com> In-Reply-To: <1465580427-13596-1-git-send-email-drjones@redhat.com> References: <1465580427-13596-1-git-send-email-drjones@redhat.com> Subject: [Qemu-devel] [PATCH RFC 03/16] hw/smbios/smbios: fix number of sockets calculation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org, qemu-arm@nongnu.org Cc: imammedo@redhat.com, ehabkost@redhat.com, pbonzini@redhat.com, peter.maydell@linaro.org, david@gibson.dropbear.id.au, dgibson@redhat.com, agraf@suse.de The specification "sect. 7.5 Processor Information (Type 4)" says "NOTE One structure is provided for each processor instance in a system. For example, a system that supports up to two processors includes two Processor Information structures - even if only one processor is currently installed..." We should use max_cpus in the calculation. The rounding is still necessary, since smp_cores and smp_threads may have been calculated based on smp_cpus, rather than max_cpus. The rounding is safe, because smp_parse will fail when the result produces a topology supporting more cpus than max_cpus. Signed-off-by: Andrew Jones --- hw/smbios/smbios.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c index cb8a1111029cf..cf18ecfd8599c 100644 --- a/hw/smbios/smbios.c +++ b/hw/smbios/smbios.c @@ -881,7 +881,7 @@ void smbios_get_tables(const struct smbios_phys_mem_area *mem_array, smbios_build_type_2_table(); smbios_build_type_3_table(); - smbios_smp_sockets = DIV_ROUND_UP(smp_cpus, smp_cores * smp_threads); + smbios_smp_sockets = DIV_ROUND_UP(max_cpus, smp_cores * smp_threads); assert(smbios_smp_sockets >= 1); for (i = 0; i < smbios_smp_sockets; i++) { -- 2.4.11