Commit 335869c3 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: selftests: Drop unused kvm_userspace_memory_region_find() helper 



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: default avatarSean Christopherson <seanjc@google.com>
Message-Id: <20231027182217.3615211-25-seanjc@google.com>
Reviewed-by: default avatarFuad Tabba <tabba@google.com>
Tested-by: default avatarFuad Tabba <tabba@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 89ea60c2

tools/testing/selftests/kvm/include/kvm_util_base.h

+0 −4
Original line number Diff line number Diff line
@@ -776,10 +776,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));				\

tools/testing/selftests/kvm/lib/kvm_util.c

+0 −29
Original line number Diff line number Diff line
@@ -590,35 +590,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)

{