From ef90bb6db38a3c6abea733023ed16e33e6388c03 Mon Sep 17 00:00:00 2001 From: Li Fei1 Date: Tue, 9 Mar 2021 11:11:07 +0800 Subject: [PATCH] hv:pgtable: rename lookup_address to pgtable_lookup_entry lookup_address is used to lookup a pagetable entry by an address. So rename it to pgtable_lookup_entry to indicate this clearly. Tracked-On: #5830 Signed-off-by: Li Fei1 Reviewed-by: Jason Chen CJ --- hypervisor/arch/x86/guest/ept.c | 2 +- hypervisor/arch/x86/pagetable.c | 2 +- hypervisor/include/arch/x86/pgtable.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hypervisor/arch/x86/guest/ept.c b/hypervisor/arch/x86/guest/ept.c index 601872545..048681047 100644 --- a/hypervisor/arch/x86/guest/ept.c +++ b/hypervisor/arch/x86/guest/ept.c @@ -222,7 +222,7 @@ uint64_t local_gpa2hpa(struct acrn_vm *vm, uint64_t gpa, uint32_t *size) void *eptp; eptp = get_ept_entry(vm); - pgentry = lookup_address((uint64_t *)eptp, gpa, &pg_size, &vm->arch_vm.ept_pgtable); + pgentry = pgtable_lookup_entry((uint64_t *)eptp, gpa, &pg_size, &vm->arch_vm.ept_pgtable); if (pgentry != NULL) { hpa = (((*pgentry & (~EPT_PFN_HIGH_MASK)) & (~(pg_size - 1UL))) | (gpa & (pg_size - 1UL))); diff --git a/hypervisor/arch/x86/pagetable.c b/hypervisor/arch/x86/pagetable.c index 2f6f8d620..8a40fbc0e 100644 --- a/hypervisor/arch/x86/pagetable.c +++ b/hypervisor/arch/x86/pagetable.c @@ -485,7 +485,7 @@ void *pgtable_create_trusty_root(const struct pgtable *table, /** * @pre (pml4_page != NULL) && (pg_size != NULL) */ -const uint64_t *lookup_address(uint64_t *pml4_page, uint64_t addr, uint64_t *pg_size, const struct pgtable *table) +const uint64_t *pgtable_lookup_entry(uint64_t *pml4_page, uint64_t addr, uint64_t *pg_size, const struct pgtable *table) { const uint64_t *pret = NULL; bool present = true; diff --git a/hypervisor/include/arch/x86/pgtable.h b/hypervisor/include/arch/x86/pgtable.h index 4dda8fb7d..2cb569b51 100644 --- a/hypervisor/include/arch/x86/pgtable.h +++ b/hypervisor/include/arch/x86/pgtable.h @@ -310,7 +310,7 @@ void *pgtable_create_trusty_root(const struct pgtable *table, /** *@pre (pml4_page != NULL) && (pg_size != NULL) */ -const uint64_t *lookup_address(uint64_t *pml4_page, uint64_t addr, +const uint64_t *pgtable_lookup_entry(uint64_t *pml4_page, uint64_t addr, uint64_t *pg_size, const struct pgtable *table); void pgtable_add_map(uint64_t *pml4_page, uint64_t paddr_base,