kvm: bios: rename memory extent variables
These better reflect what they actually store
Signed-off-by: Alex Williamson <[EMAIL PROTECTED]>
---
bios/rombios32.c | 39 ++++++++++++++++++++-------------------
1 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/bios/rombios32.c b/bios/rombios32.c
index c57e967..41025a0 100755
--- a/bios/rombios32.c
+++ b/bios/rombios32.c
@@ -415,8 +415,8 @@ int smp_cpus;
uint32_t cpuid_signature;
uint32_t cpuid_features;
uint32_t cpuid_ext_features;
-unsigned long ram_size;
-uint64_t above4g_ram_size;
+unsigned long low_ram_size;
+uint64_t mem_top;
uint8_t bios_uuid[16];
#ifdef BX_USE_EBDA_TABLES
unsigned long ebda_cur_addr;
@@ -504,12 +504,12 @@ void setup_mtrr(void)
return;
u.val = 0;
for (i = 0; i < 8; ++i)
- if (ram_size >= 65536 * (i + 1))
+ if (low_ram_size >= 65536 * (i + 1))
u.valb[i] = 6;
wrmsr_smp(MSR_MTRRfix64K_00000, u.val);
u.val = 0;
for (i = 0; i < 8; ++i)
- if (ram_size >= 65536 * 8 + 16384 * (i + 1))
+ if (low_ram_size >= 65536 * 8 + 16384 * (i + 1))
u.valb[i] = 6;
wrmsr_smp(MSR_MTRRfix16K_80000, u.val);
wrmsr_smp(MSR_MTRRfix16K_A0000, 0);
@@ -523,17 +523,17 @@ void setup_mtrr(void)
wrmsr_smp(MSR_MTRRfix4K_F8000, 0);
vbase = 0;
--vcnt; /* leave one mtrr for VRAM */
- for (i = 0; i < vcnt && vbase < ram_size; ++i) {
+ for (i = 0; i < vcnt && vbase < low_ram_size; ++i) {
vmask = (1ull << 40) - 1;
- while (vbase + vmask + 1 > ram_size)
+ while (vbase + vmask + 1 > low_ram_size)
vmask >>= 1;
wrmsr_smp(MTRRphysBase_MSR(i), vbase | 6);
wrmsr_smp(MTRRphysMask_MSR(i), (~vmask & 0xfffffff000ull) | 0x800);
vbase += vmask + 1;
}
- for (vbase = 1ull << 32; i < vcnt && vbase < above4g_ram_size; ++i) {
+ for (vbase = 1ull << 32; i < vcnt && vbase < mem_top; ++i) {
vmask = (1ull << 40) - 1;
- while (vbase + vmask + 1 > above4g_ram_size)
+ while (vbase + vmask + 1 > mem_top)
vmask >>= 1;
wrmsr_smp(MTRRphysBase_MSR(i), vbase | 6);
wrmsr_smp(MTRRphysMask_MSR(i), (~vmask & 0xfffffff000ull) | 0x800);
@@ -545,23 +545,23 @@ void setup_mtrr(void)
void ram_probe(void)
{
if (cmos_readb(0x34) | cmos_readb(0x35))
- ram_size = (cmos_readb(0x34) | (cmos_readb(0x35) << 8)) * 65536 +
+ low_ram_size = (cmos_readb(0x34) | (cmos_readb(0x35) << 8)) * 65536 +
16 * 1024 * 1024;
else
- ram_size = (cmos_readb(0x17) | (cmos_readb(0x18) << 8)) * 1024;
+ low_ram_size = (cmos_readb(0x17) | (cmos_readb(0x18) << 8)) * 1024;
if (cmos_readb(0x5b) | cmos_readb(0x5c) | cmos_readb(0x5d))
- above4g_ram_size = ((uint64_t)cmos_readb(0x5b) << 16) |
+ mem_top = ((uint64_t)cmos_readb(0x5b) << 16) |
((uint64_t)cmos_readb(0x5c) << 24) | ((uint64_t)cmos_readb(0x5d) <<
32);
- if (above4g_ram_size)
- above4g_ram_size += 1ull << 32;
+ if (mem_top)
+ mem_top += 1ull << 32;
#ifdef BX_USE_EBDA_TABLES
ebda_cur_addr = ((*(uint16_t *)(0x40e)) << 4) + 0x380;
#endif
- BX_INFO("ram_size=0x%08lx\n", ram_size);
- BX_INFO("top of ram %ldMB\n", above4g_ram_size >> 20);
+ BX_INFO("low_ram_size=0x%08lx\n", low_ram_size);
+ BX_INFO("top of ram %ldMB\n", mem_top >> 20);
setup_mtrr();
}
@@ -969,7 +969,7 @@ void pci_bios_init(void)
{
pci_bios_io_addr = 0xc000;
pci_bios_mem_addr = 0xf0000000;
- pci_bios_bigmem_addr = ram_size;
+ pci_bios_bigmem_addr = low_ram_size;
if (pci_bios_bigmem_addr < 0x90000000)
pci_bios_bigmem_addr = 0x90000000;
@@ -1039,7 +1039,8 @@ static void mptable_init(void)
int mp_config_table_size;
#ifdef BX_USE_EBDA_TABLES
- mp_config_table = (uint8_t *)(ram_size - ACPI_DATA_SIZE -
MPTABLE_MAX_SIZE);
+ mp_config_table = (uint8_t *)(low_ram_size - ACPI_DATA_SIZE -
+ MPTABLE_MAX_SIZE);
#else
bios_table_cur_addr = align(bios_table_cur_addr, 16);
mp_config_table = (uint8_t *)bios_table_cur_addr;
@@ -1427,7 +1428,7 @@ void acpi_bios_init(void)
bios_table_cur_addr += sizeof(*rsdp);
#endif
- addr = base_addr = ram_size - ACPI_DATA_SIZE;
+ addr = base_addr = low_ram_size - ACPI_DATA_SIZE;
rsdt_addr = addr;
rsdt = (void *)(addr);
addr += sizeof(*rsdt);
@@ -2021,7 +2022,7 @@ void smbios_init(void)
{
unsigned cpu_num, nr_structs = 0, max_struct_size = 0;
char *start, *p, *q;
- int memsize = ram_size / (1024 * 1024);
+ int memsize = low_ram_size / (1024 * 1024);
#ifdef BX_USE_EBDA_TABLES
ebda_cur_addr = align(ebda_cur_addr, 16);
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
