Re: [Qemu-arm] [PATCH RFC 03/16] hw/smbios/smbios: fix number of sockets calculation

[Igor Mammedov]

On Fri, 10 Jun 2016 19:40:14 +0200
Andrew Jones <address@hidden> wrote:

> 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 <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>

> ---
>  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++) {