From 68ea2cc62ef9a6519966fa833aa441b45e5be7b0 Mon Sep 17 00:00:00 2001 From: Vijay Dhanraj Date: Tue, 10 Dec 2019 16:54:07 -0800 Subject: [PATCH] acrn-config: Fix ve820 table generation when guest memory size is >512MB This patch fixes an issue with generation of guest ve820 when the size of the memory is >512MB. The issue is primarily with respect to converting between hex and int. Tracked-On: #4219 Signed-off-by: Vijay Dhanraj Acked-by: Victor Sun --- misc/acrn-config/board_config/ve820_c.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/misc/acrn-config/board_config/ve820_c.py b/misc/acrn-config/board_config/ve820_c.py index e2bfa7f04..56680b362 100644 --- a/misc/acrn-config/board_config/ve820_c.py +++ b/misc/acrn-config/board_config/ve820_c.py @@ -48,9 +48,9 @@ def ve820_per_launch(config, hpa_size, hpa2_size): #HPA2 is always allocated in >4G space. high_mem_hpa2_len.append(int(hpa2_size[i], 16)) if (high_mem_hpa_len[i] != 0) and (high_mem_hpa2_len[i] != 0): - high_mem_hpa2_addr.append(hex(FOUR_GBYTE) + high_mem_hpa_len[i]) + high_mem_hpa2_addr.append(FOUR_GBYTE + high_mem_hpa_len[i]) else: - high_mem_hpa2_addr.append(hex(FOUR_GBYTE)) + high_mem_hpa2_addr.append(FOUR_GBYTE) if (high_mem_hpa_len[i] != 0) and (high_mem_hpa2_len[i] != 0): print("#define VM{}_VE820_ENTRIES_{}\t{}U".format(i, board_name, 7), file=config) @@ -113,9 +113,9 @@ def ve820_per_launch(config, hpa_size, hpa2_size): print("", file=config) print("\t{\t/* HPA2 after high mem*/", file=config) print("\t\t.baseaddr = {}UL,\t/* {}GB */".format( - hex(high_mem_hpa2_addr[i]), int(high_mem_hpa2_addr[i], 16) / 1024 / 1024 / 1024), file=config) + hex(high_mem_hpa2_addr[i]), high_mem_hpa2_addr[i] / 1024 / 1024 / 1024), file=config) print("\t\t.length = {}UL,\t/* {}MB */".format( - hex(high_mem_hpa_len[i]), high_mem_hpa_len[i] / 1024 / 1024), file=config) + hex(high_mem_hpa2_len[i]), high_mem_hpa2_len[i] / 1024 / 1024), file=config) print("\t\t.type = E820_TYPE_RAM", file=config) print("\t},", file=config) print("", file=config)