Re: [PATCH] hw/smbios/smbios: Use MachineState::ram_size instead of global one

[Igor Mammedov <imammedo@redhat.com>]

On Thu,  9 Jan 2020 00:31:38 +0100
Philippe Mathieu-Daudé <philmd@redhat.com> wrote:

> The smbios_get_tables() function has access the a machine state.
> Use the field instead of accessing the global ram_size variable.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>

> ---
>  hw/smbios/smbios.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c
> index 11d476c4a2..ded5f1f4e2 100644
> --- a/hw/smbios/smbios.c
> +++ b/hw/smbios/smbios.c
> @@ -630,7 +630,7 @@ static void smbios_build_type_11_table(void)
>  
>  #define MAX_T16_STD_SZ 0x80000000 /* 2T in Kilobytes */
>  
> -static void smbios_build_type_16_table(unsigned dimm_cnt)
> +static void smbios_build_type_16_table(ram_addr_t ram_size, unsigned dimm_cnt)
>  {
>      uint64_t size_kb;
>  
> @@ -847,6 +847,7 @@ void smbios_get_tables(MachineState *ms,
>                         uint8_t **anchor, size_t *anchor_len)
>  {
>      unsigned i, dimm_cnt;
> +    ram_addr_t ram_size = ms->ram_size;
>  
>      if (smbios_legacy) {
>          *tables = *anchor = NULL;
> @@ -876,7 +877,7 @@ void smbios_get_tables(MachineState *ms,
>  
>          dimm_cnt = QEMU_ALIGN_UP(ram_size, MAX_DIMM_SZ) / MAX_DIMM_SZ;
>  
> -        smbios_build_type_16_table(dimm_cnt);
> +        smbios_build_type_16_table(ram_size, dimm_cnt);
>  
>          for (i = 0; i < dimm_cnt; i++) {
>              smbios_build_type_17_table(i, GET_DIMM_SZ);