Commit 744c6d47 authored by Eduardo Habkost's avatar Eduardo Habkost Committed by Michael S. Tsirkin
Browse files

smbios: Fix dimm size calculation when RAM is multiple of 16GB 



The Memory Device size calculation logic is broken when the RAM size is
a multiple of 16GB, making the size of the last entry be 0 instead of
16GB. Fix the logic to handle that case correctly.

Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 09852232

hw/i386/smbios.c

+2 −1
Original line number Diff line number Diff line
@@ -850,7 +850,8 @@ void smbios_get_tables(uint8_t **tables, size_t *tables_len, 
        }



#define MAX_DIMM_SZ (16ll * ONE_GB)

#define GET_DIMM_SZ ((i < dimm_cnt - 1) ? MAX_DIMM_SZ : ram_size % MAX_DIMM_SZ)

#define GET_DIMM_SZ ((i < dimm_cnt - 1) ? MAX_DIMM_SZ \

                                        : ((ram_size - 1) % MAX_DIMM_SZ) + 1)



        dimm_cnt = QEMU_ALIGN_UP(ram_size, MAX_DIMM_SZ) / MAX_DIMM_SZ;