From: Yosry Ahmed The assertions use 'hugepage' to describe a terminal EPT entry, but 'leaf' is more accruate as a PG_LEVEL_4K EPT entry is a leaf but not a hugepage. The distincion will be useful in coming changes that will pass the value around and 'leaf' is clearer than hugepage or page_size. Leave the EPT bit named page_size to keep it conforming to the manual. Signed-off-by: Yosry Ahmed --- tools/testing/selftests/kvm/lib/x86/vmx.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/kvm/lib/x86/vmx.c b/tools/testing/selftests/kvm/lib/x86/vmx.c index 04c4b97bcd1e7..673756b27e903 100644 --- a/tools/testing/selftests/kvm/lib/x86/vmx.c +++ b/tools/testing/selftests/kvm/lib/x86/vmx.c @@ -380,15 +380,15 @@ static void nested_create_pte(struct kvm_vm *vm, pte->address = vm_alloc_page_table(vm) >> vm->page_shift; } else { /* - * Entry already present. Assert that the caller doesn't want - * a hugepage at this level, and that there isn't a hugepage at - * this level. + * Entry already present. Assert that the caller doesn't want a + * leaf entry at this level, and that there isn't a leaf entry + * at this level. */ TEST_ASSERT(current_level != target_level, - "Cannot create hugepage at level: %u, nested_paddr: 0x%lx", + "Cannot create leaf entry at level: %u, nested_paddr: 0x%lx", current_level, nested_paddr); TEST_ASSERT(!pte->page_size, - "Cannot create page table at level: %u, nested_paddr: 0x%lx", + "Leaf entry already exists at level: %u, nested_paddr: 0x%lx", current_level, nested_paddr); } } -- 2.51.0.618.g983fd99d29-goog