On 7/19/23 01:45, Sean Christopherson wrote:
Drop kvm_userspace_memory_region_find(), it's unused and a terrible API
(probably why it's unused).  If anything outside of kvm_util.c needs to
get at the memslot, userspace_mem_region_find() can be exposed to give
others full access to all memory region/slot information.

Signed-off-by: Sean Christopherson <sea...@google.com>
---
  .../selftests/kvm/include/kvm_util_base.h     |  4 ---
  tools/testing/selftests/kvm/lib/kvm_util.c    | 29 -------------------
  2 files changed, 33 deletions(-)

diff --git a/tools/testing/selftests/kvm/include/kvm_util_base.h 
b/tools/testing/selftests/kvm/include/kvm_util_base.h
index 07732a157ccd..6aeb008dd668 100644
--- a/tools/testing/selftests/kvm/include/kvm_util_base.h
+++ b/tools/testing/selftests/kvm/include/kvm_util_base.h
@@ -753,10 +753,6 @@ vm_adjust_num_guest_pages(enum vm_guest_mode mode, 
unsigned int num_guest_pages)
        return n;
  }
-struct kvm_userspace_memory_region *
-kvm_userspace_memory_region_find(struct kvm_vm *vm, uint64_t start,
-                                uint64_t end);
-
  #define sync_global_to_guest(vm, g) ({                                \
        typeof(g) *_p = addr_gva2hva(vm, (vm_vaddr_t)&(g)); \
        memcpy(_p, &(g), sizeof(g));                                \
diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c 
b/tools/testing/selftests/kvm/lib/kvm_util.c
index 9741a7ff6380..45d21e052db0 100644
--- a/tools/testing/selftests/kvm/lib/kvm_util.c
+++ b/tools/testing/selftests/kvm/lib/kvm_util.c
@@ -586,35 +586,6 @@ userspace_mem_region_find(struct kvm_vm *vm, uint64_t 
start, uint64_t end)
        return NULL;
  }
-/*
- * KVM Userspace Memory Region Find
- *
- * Input Args:
- *   vm - Virtual Machine
- *   start - Starting VM physical address
- *   end - Ending VM physical address, inclusive.
- *
- * Output Args: None
- *
- * Return:
- *   Pointer to overlapping region, NULL if no such region.
- *
- * Public interface to userspace_mem_region_find. Allows tests to look up
- * the memslot datastructure for a given range of guest physical memory.
- */
-struct kvm_userspace_memory_region *
-kvm_userspace_memory_region_find(struct kvm_vm *vm, uint64_t start,
-                                uint64_t end)
-{
-       struct userspace_mem_region *region;
-
-       region = userspace_mem_region_find(vm, start, end);
-       if (!region)
-               return NULL;
-
-       return &region->region;
-}
-
  __weak void vcpu_arch_free(struct kvm_vcpu *vcpu)
  {

Will queue this.

Paolo

Reply via email to