From 960238cdcbfbf9017a42981e4790744820bc3b21 Mon Sep 17 00:00:00 2001 From: Victor Sun Date: Mon, 15 Nov 2021 11:11:46 +0800 Subject: [PATCH] HV: fix build issue on RELEASE version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The HV will be built failed with below compiler message: common/efi_mmap.c: In function ‘init_efi_mmap_entries’: common/efi_mmap.c:41:11: error: unused variable ‘efi_memdesc_nr’ [-Werror=unused-variable] uint32_t efi_memdesc_nr = uefi_info->memmap_size / uefi_info->memdesc_size; ^~~~~~~~~~~~~~ cc1: all warnings being treated as errors The root cause is ASSERT() api is for DEBUG only so efi_memdesc_nr is not used in RELEASE code. The patch fix this issue by removing efi_memdesc_nr declaration; Tracked-On: #6834 Signed-off-by: Victor Sun --- hypervisor/common/efi_mmap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hypervisor/common/efi_mmap.c b/hypervisor/common/efi_mmap.c index 35781df05..df8e88f93 100644 --- a/hypervisor/common/efi_mmap.c +++ b/hypervisor/common/efi_mmap.c @@ -38,9 +38,8 @@ void init_efi_mmap_entries(struct efi_info *uefi_info) void *efi_memmap = (void *)((uint64_t)uefi_info->memmap | ((uint64_t)uefi_info->memmap_hi << 32U)); struct efi_memory_desc *efi_memdesc = (struct efi_memory_desc *)efi_memmap; uint32_t entry = 0U; - uint32_t efi_memdesc_nr = uefi_info->memmap_size / uefi_info->memdesc_size; - ASSERT(efi_memdesc_nr <= MAX_EFI_MMAP_ENTRIES); + ASSERT((uefi_info->memmap_size / uefi_info->memdesc_size) <= MAX_EFI_MMAP_ENTRIES); while ((void *)efi_memdesc < (efi_memmap + uefi_info->memmap_size)) { hv_memdesc[entry] = *efi_memdesc;