28 lines
1.3 KiB
Diff
28 lines
1.3 KiB
Diff
# HG changeset patch
|
|
# User Keir Fraser <keir.fraser@citrix.com>
|
|
# Date 1231755835 0
|
|
# Node ID 95d8788bf4be2e8b8d2b984e290f5e19eef1a16c
|
|
# Parent 59d511c4a8d8ba451afc6ebd88e049fa2addf9f5
|
|
hvmloader: Fix SMBIOS memory device length boundary condition.
|
|
|
|
dev_memsize ends up 0 when it shouldn't be on 16G boundary conditions.
|
|
|
|
Signed-off-by: Bill Rieske <brieske@novell.com>
|
|
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
|
|
|
|
diff -r 59d511c4a8d8 -r 95d8788bf4be tools/firmware/hvmloader/smbios.c
|
|
--- a/tools/firmware/hvmloader/smbios.c Mon Jan 12 10:17:12 2009 +0000
|
|
+++ b/tools/firmware/hvmloader/smbios.c Mon Jan 12 10:23:55 2009 +0000
|
|
@@ -118,8 +118,9 @@ write_smbios_tables(void *start,
|
|
do_struct(smbios_type_16_init(p, memsize, nr_mem_devs));
|
|
for ( i = 0; i < nr_mem_devs; i++ )
|
|
{
|
|
- uint32_t dev_memsize = ((i == (nr_mem_devs - 1))
|
|
- ? (memsize & 0x3fff) : 0x4000);
|
|
+ uint32_t dev_memsize = 0x4000; /* all but last covers 16GB */
|
|
+ if ( (i == (nr_mem_devs - 1)) && ((memsize & 0x3fff) != 0) )
|
|
+ dev_memsize = memsize & 0x3fff; /* last dev is <16GB */
|
|
do_struct(smbios_type_17_init(p, dev_memsize, i));
|
|
do_struct(smbios_type_19_init(p, dev_memsize, i));
|
|
do_struct(smbios_type_20_init(p, dev_memsize, i));
|