superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

KVM: x86: Drop double-underscores from __kvm_set_memory_region() 

Now that there's no outer wrapper for __kvm_set_memory_region() and it's
static, drop its double-underscore prefix.

No functional change intended.

Cc: Tao Su <tao1.su@linux.intel.com>
Reviewed-by: Xiaoyao Li <xiaoyao.li@intel.com>
Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
Acked-by: Christoph Schlameuss <schlameuss@linux.ibm.com>
Link: https://lore.kernel.org/r/20250111002022.1230573-5-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
pull/1134/head
Sean Christopherson 2025-01-10 16:20:21 -08:00
parent 156bffdb2b
commit 344315e93d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/kvm/x86.c
View File

@ -12928,7 +12928,7 @@ static int kvm_alloc_memslot_metadata(struct kvm *kvm,
/* /*
* Clear out the previous array pointers for the KVM_MR_MOVE case. The * Clear out the previous array pointers for the KVM_MR_MOVE case. The
* old arrays will be freed by __kvm_set_memory_region() if installing * old arrays will be freed by kvm_set_memory_region() if installing
* the new memslot is successful. * the new memslot is successful.
*/ */
memset(&slot->arch, 0, sizeof(slot->arch)); memset(&slot->arch, 0, sizeof(slot->arch));

2
include/linux/kvm_host.h
View File

@ -1183,7 +1183,7 @@ struct kvm_memory_slot *kvm_vcpu_gfn_to_memslot(struct kvm_vcpu *vcpu, gfn_t gfn
* -- just change its flags * -- just change its flags
* *
* Since flags can be changed by some of these operations, the following * Since flags can be changed by some of these operations, the following
* differentiation is the best we can do for __kvm_set_memory_region(): * differentiation is the best we can do for kvm_set_memory_region():
*/ */
enum kvm_mr_change { enum kvm_mr_change {
KVM_MR_CREATE, KVM_MR_CREATE,

8
virt/kvm/kvm_main.c
View File

@ -1926,8 +1926,8 @@ static bool kvm_check_memslot_overlap(struct kvm_memslots *slots, int id,
return false; return false;
} }
static int __kvm_set_memory_region(struct kvm *kvm, static int kvm_set_memory_region(struct kvm *kvm,
const struct kvm_userspace_memory_region2 *mem) const struct kvm_userspace_memory_region2 *mem)
{ {
struct kvm_memory_slot *old, *new; struct kvm_memory_slot *old, *new;
struct kvm_memslots *slots; struct kvm_memslots *slots;
@ -2057,7 +2057,7 @@ int kvm_set_internal_memslot(struct kvm *kvm,
if (WARN_ON_ONCE(mem->slot < KVM_USER_MEM_SLOTS)) if (WARN_ON_ONCE(mem->slot < KVM_USER_MEM_SLOTS))
return -EINVAL; return -EINVAL;
return __kvm_set_memory_region(kvm, mem); return kvm_set_memory_region(kvm, mem);
} }
EXPORT_SYMBOL_GPL(kvm_set_internal_memslot); EXPORT_SYMBOL_GPL(kvm_set_internal_memslot);
@ -2068,7 +2068,7 @@ static int kvm_vm_ioctl_set_memory_region(struct kvm *kvm,
return -EINVAL; return -EINVAL;
guard(mutex)(&kvm->slots_lock); guard(mutex)(&kvm->slots_lock);
return __kvm_set_memory_region(kvm, mem); return kvm_set_memory_region(kvm, mem);
} }
#ifndef CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT #ifndef CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT