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>

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 36b5d06e39045156ae4b249c692be8a736b944f3..82f389e3910d40e69cf3f41310cab10b02952884 100644 (file)
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -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
-        * 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.
         */
        memset(&slot->arch, 0, sizeof(slot->arch));

diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 8707d25a2e5ba19e8c570b0bf4c84acf86b77b94..dcb59d6e8acb96dbd607fbc6a981f32cd7fd3bab 100644 (file)
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -1183,7 +1183,7 @@ struct kvm_memory_slot *kvm_vcpu_gfn_to_memslot(struct kvm_vcpu *vcpu, gfn_t gfn
  *   -- just change its flags
  *
  * 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 {
        KVM_MR_CREATE,

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index e1be2e4e6c9f021fce03794fce17e3039f86e1c1..ecd4a66b22f3f9ea731de1bd26a4eb0dc4dfdff7 100644 (file)
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -1926,8 +1926,8 @@ static bool kvm_check_memslot_overlap(struct kvm_memslots *slots, int id,
        return false;
 }
 
-static int __kvm_set_memory_region(struct kvm *kvm,
-                                  const struct kvm_userspace_memory_region2 *mem)
+static int kvm_set_memory_region(struct kvm *kvm,
+                                const struct kvm_userspace_memory_region2 *mem)
 {
        struct kvm_memory_slot *old, *new;
        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))
                return -EINVAL;
 
-       return __kvm_set_memory_region(kvm, mem);
+       return kvm_set_memory_region(kvm, mem);
 }
 EXPORT_SYMBOL_GPL(kvm_set_internal_memslot);
 
@@ -2068,7 +2068,7 @@ static int kvm_vm_ioctl_set_memory_region(struct kvm *kvm,
                return -EINVAL;
 
        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