[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/16] smbios: Fix dimm size calculation when RAM is
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 12/16] smbios: Fix dimm size calculation when RAM is multiple of 16GB |
Date: |
Tue, 27 Jan 2015 15:14:29 +0200 |
From: Eduardo Habkost <address@hidden>
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: Eduardo Habkost <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
---
hw/i386/smbios.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/hw/i386/smbios.c b/hw/i386/smbios.c
index 024e594..ae7032a 100644
--- a/hw/i386/smbios.c
+++ b/hw/i386/smbios.c
@@ -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;
--
MST
- [Qemu-devel] [PULL 00/16] pci, pc, virtio fixes and cleanups, Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 02/16] Add some trace calls to pci.c., Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 01/16] ich9: add disable_s3, disable_s4, s4_val properties, Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 05/16] acpi-test: update expected DSDT, Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 06/16] acpi: update generated hex files, Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 04/16] pc: acpi: fix WindowsXP BSOD when memory hotplug is enabled, Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 14/16] pc: Fix DIMMs capacity calculation, Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 15/16] pc-dimm: Make pc_existing_dimms_capacity global, Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 16/16] pc-dimm: Add Error argument to pc_existing_dimms_capacity, Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 11/16] bios-linker-loader: move source to common location, Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 12/16] smbios: Fix dimm size calculation when RAM is multiple of 16GB,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 09/16] virtio: fix feature bit checks, Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 03/16] pci: Split pcie_host_mmcfg_map(), Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 13/16] smbios: Don't report unknown CPU speed (fix SVVP regression), Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 10/16] bios-linker-loader: move header to common location, Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 07/16] acpi: build_append_nameseg(): add padding if necessary, Michael S. Tsirkin, 2015/01/27
- [Qemu-devel] [PULL 08/16] bios-tables-test: split piix4 and q35 tests, Michael S. Tsirkin, 2015/01/27
- Re: [Qemu-devel] [PULL 00/16] pci, pc, virtio fixes and cleanups, Peter Maydell, 2015/01/27