On Thu, 7 May 2026 at 21:23, Ackerley Tng via B4 Relay <[email protected]> wrote: > > From: Sean Christopherson <[email protected]> > > Rename local variables and function parameters for the guest memory file > descriptor and its offset to use a "gmem_" prefix instead of > "guest_memfd_". > > No functional change intended. > > Signed-off-by: Sean Christopherson <[email protected]> > Signed-off-by: Ackerley Tng <[email protected]>
Reviewed-by: Fuad Tabba <[email protected]> Cheers, /fuad > --- > tools/testing/selftests/kvm/include/kvm_util.h | 6 +++--- > tools/testing/selftests/kvm/lib/kvm_util.c | 26 > +++++++++++++------------- > 2 files changed, 16 insertions(+), 16 deletions(-) > > diff --git a/tools/testing/selftests/kvm/include/kvm_util.h > b/tools/testing/selftests/kvm/include/kvm_util.h > index 2ecaaa0e99654..f19383376ee8e 100644 > --- a/tools/testing/selftests/kvm/include/kvm_util.h > +++ b/tools/testing/selftests/kvm/include/kvm_util.h > @@ -690,17 +690,17 @@ int __vm_set_user_memory_region(struct kvm_vm *vm, u32 > slot, u32 flags, > gpa_t gpa, u64 size, void *hva); > void vm_set_user_memory_region2(struct kvm_vm *vm, u32 slot, u32 flags, > gpa_t gpa, u64 size, void *hva, > - u32 guest_memfd, u64 guest_memfd_offset); > + u32 gmem_fd, u64 gmem_offset); > int __vm_set_user_memory_region2(struct kvm_vm *vm, u32 slot, u32 flags, > gpa_t gpa, u64 size, void *hva, > - u32 guest_memfd, u64 guest_memfd_offset); > + u32 gmem_fd, u64 gmem_offset); > > void vm_userspace_mem_region_add(struct kvm_vm *vm, > enum vm_mem_backing_src_type src_type, > gpa_t gpa, u32 slot, u64 npages, u32 flags); > void vm_mem_add(struct kvm_vm *vm, enum vm_mem_backing_src_type src_type, > gpa_t gpa, u32 slot, u64 npages, u32 flags, > - int guest_memfd_fd, u64 guest_memfd_offset); > + int gmem_fd, u64 gmem_offset); > > #ifndef vm_arch_has_protected_memory > static inline bool vm_arch_has_protected_memory(struct kvm_vm *vm) > diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c > b/tools/testing/selftests/kvm/lib/kvm_util.c > index df73b23a4c66a..11da9b7546d03 100644 > --- a/tools/testing/selftests/kvm/lib/kvm_util.c > +++ b/tools/testing/selftests/kvm/lib/kvm_util.c > @@ -947,7 +947,7 @@ void vm_set_user_memory_region(struct kvm_vm *vm, u32 > slot, u32 flags, > > int __vm_set_user_memory_region2(struct kvm_vm *vm, u32 slot, u32 flags, > gpa_t gpa, u64 size, void *hva, > - u32 guest_memfd, u64 guest_memfd_offset) > + u32 gmem_fd, u64 gmem_offset) > { > struct kvm_userspace_memory_region2 region = { > .slot = slot, > @@ -955,8 +955,8 @@ int __vm_set_user_memory_region2(struct kvm_vm *vm, u32 > slot, u32 flags, > .guest_phys_addr = gpa, > .memory_size = size, > .userspace_addr = (uintptr_t)hva, > - .guest_memfd = guest_memfd, > - .guest_memfd_offset = guest_memfd_offset, > + .guest_memfd = gmem_fd, > + .guest_memfd_offset = gmem_offset, > }; > > TEST_REQUIRE_SET_USER_MEMORY_REGION2(); > @@ -966,10 +966,10 @@ int __vm_set_user_memory_region2(struct kvm_vm *vm, u32 > slot, u32 flags, > > void vm_set_user_memory_region2(struct kvm_vm *vm, u32 slot, u32 flags, > gpa_t gpa, u64 size, void *hva, > - u32 guest_memfd, u64 guest_memfd_offset) > + u32 gmem_fd, u64 gmem_offset) > { > int ret = __vm_set_user_memory_region2(vm, slot, flags, gpa, size, > hva, > - guest_memfd, > guest_memfd_offset); > + gmem_fd, gmem_offset); > > TEST_ASSERT(!ret, "KVM_SET_USER_MEMORY_REGION2 failed, errno = %d > (%s)", > errno, strerror(errno)); > @@ -979,7 +979,7 @@ void vm_set_user_memory_region2(struct kvm_vm *vm, u32 > slot, u32 flags, > /* FIXME: This thing needs to be ripped apart and rewritten. */ > void vm_mem_add(struct kvm_vm *vm, enum vm_mem_backing_src_type src_type, > gpa_t gpa, u32 slot, u64 npages, u32 flags, > - int guest_memfd, u64 guest_memfd_offset) > + int gmem_fd, u64 gmem_offset) > { > int ret; > struct userspace_mem_region *region; > @@ -1055,12 +1055,12 @@ void vm_mem_add(struct kvm_vm *vm, enum > vm_mem_backing_src_type src_type, > region->mmap_size += alignment; > > if (flags & KVM_MEM_GUEST_MEMFD) { > - if (guest_memfd < 0) { > - u32 guest_memfd_flags = 0; > + if (gmem_fd < 0) { > + u32 gmem_flags = 0; > > - TEST_ASSERT(!guest_memfd_offset, > + TEST_ASSERT(!gmem_offset, > "Offset must be zero when creating new > guest_memfd"); > - guest_memfd = vm_create_guest_memfd(vm, mem_size, > guest_memfd_flags); > + gmem_fd = vm_create_guest_memfd(vm, mem_size, > gmem_flags); > } else { > /* > * Install a unique fd for each memslot so that the fd > @@ -1068,11 +1068,11 @@ void vm_mem_add(struct kvm_vm *vm, enum > vm_mem_backing_src_type src_type, > * needing to track if the fd is owned by the > framework > * or by the caller. > */ > - guest_memfd = kvm_dup(guest_memfd); > + gmem_fd = kvm_dup(gmem_fd); > } > > - region->region.guest_memfd = guest_memfd; > - region->region.guest_memfd_offset = guest_memfd_offset; > + region->region.guest_memfd = gmem_fd; > + region->region.guest_memfd_offset = gmem_offset; > } else { > region->region.guest_memfd = -1; > } > > -- > 2.54.0.563.g4f69b47b94-goog > >
