Rename __x86_set_memory_region() to x86_set_internal_memslot() and add double-underscores to the existing x86_set_internal_memslot(), so that the x86 APIs better align common KVM's kvm_set_internal_memslot(). No functional change intended. Signed-off-by: Sean Christopherson --- arch/x86/kvm/lapic.c | 6 +++--- arch/x86/kvm/vmx/vmx.c | 12 ++++++------ arch/x86/kvm/x86.c | 14 +++++++------- arch/x86/kvm/x86.h | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index c20e2a25834f..b4a7f02f5c48 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -2917,8 +2917,8 @@ int kvm_alloc_apic_access_page(struct kvm *kvm) kvm->arch.apic_access_memslot_inhibited) return 0; - hva = __x86_set_memory_region(kvm, APIC_ACCESS_PAGE_PRIVATE_MEMSLOT, - APIC_DEFAULT_PHYS_BASE, PAGE_SIZE); + hva = x86_set_internal_memslot(kvm, APIC_ACCESS_PAGE_PRIVATE_MEMSLOT, + APIC_DEFAULT_PHYS_BASE, PAGE_SIZE); if (IS_ERR(hva)) return PTR_ERR(hva); @@ -2943,7 +2943,7 @@ void kvm_inhibit_apic_access_page(struct kvm_vcpu *vcpu) if (!kvm->arch.apic_access_memslot_enabled) goto out; - p = __x86_set_memory_region(kvm, APIC_ACCESS_PAGE_PRIVATE_MEMSLOT, 0, 0); + p = x86_set_internal_memslot(kvm, APIC_ACCESS_PAGE_PRIVATE_MEMSLOT, 0, 0); if (IS_ERR(p)) { kvm_make_request(KVM_REQ_APICV_UPDATE, vcpu); goto out; diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 1f9e43c5b4c4..00fb9459de59 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -4055,10 +4055,10 @@ static int init_rmode_identity_map(struct kvm *kvm) if (!kvm_vmx->ept_identity_map_addr) kvm_vmx->ept_identity_map_addr = VMX_EPT_IDENTITY_PAGETABLE_ADDR; - uaddr = __x86_set_memory_region(kvm, - IDENTITY_PAGETABLE_PRIVATE_MEMSLOT, - kvm_vmx->ept_identity_map_addr, - PAGE_SIZE); + uaddr = x86_set_internal_memslot(kvm, + IDENTITY_PAGETABLE_PRIVATE_MEMSLOT, + kvm_vmx->ept_identity_map_addr, + PAGE_SIZE); if (IS_ERR(uaddr)) { r = PTR_ERR(uaddr); goto out; @@ -5295,8 +5295,8 @@ int vmx_set_tss_addr(struct kvm *kvm, unsigned int addr) return 0; mutex_lock(&kvm->slots_lock); - ret = __x86_set_memory_region(kvm, TSS_PRIVATE_MEMSLOT, addr, - PAGE_SIZE * 3); + ret = x86_set_internal_memslot(kvm, TSS_PRIVATE_MEMSLOT, addr, + PAGE_SIZE * 3); mutex_unlock(&kvm->slots_lock); if (IS_ERR(ret)) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 8cb58040dd81..85dd52c6beca 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -10007,8 +10007,8 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) return ret; } -static int x86_set_internal_memslot(struct kvm *kvm, int id, int as_id, - gpa_t gpa, struct file *f, u32 size) +static int __x86_set_internal_memslot(struct kvm *kvm, int id, int as_id, + gpa_t gpa, struct file *f, u32 size) { struct kvm_userspace_memory_region2 m; unsigned long hva; @@ -10038,7 +10038,7 @@ static int x86_set_internal_memslot(struct kvm *kvm, int id, int as_id, } /** - * __x86_set_memory_region: Setup KVM internal memory slot + * x86_set_internal_memslot: Setup KVM internal memory slot * * @kvm: the kvm pointer to the VM. * @id: the slot ID to setup. @@ -10059,7 +10059,7 @@ static int x86_set_internal_memslot(struct kvm *kvm, int id, int as_id, * address, i.e. its accessibility is not guaranteed, and must be * accessed via __copy_{to,from}_user(). */ -void __user * __x86_set_memory_region(struct kvm *kvm, int id, gpa_t gpa, +void __user *x86_set_internal_memslot(struct kvm *kvm, int id, gpa_t gpa, u32 size) { struct file *f __free(fput) = NULL; @@ -10081,12 +10081,12 @@ void __user * __x86_set_memory_region(struct kvm *kvm, int id, gpa_t gpa, } for (i = 0; i < kvm_arch_nr_memslot_as_ids(kvm); i++) { - r = x86_set_internal_memslot(kvm, id, i, gpa, f, size); + r = __x86_set_internal_memslot(kvm, id, i, gpa, f, size); if (!r) continue; for (i--; i >= 0 && size; i--) - x86_set_internal_memslot(kvm, id, i, gpa, NULL, 0); + __x86_set_internal_memslot(kvm, id, i, gpa, NULL, 0); return ERR_PTR_USR(r); } @@ -10097,7 +10097,7 @@ void __user * __x86_set_memory_region(struct kvm *kvm, int id, gpa_t gpa, return (void __user *)(slot ? slot->userspace_addr : 0); } -EXPORT_SYMBOL_FOR_KVM_INTERNAL(__x86_set_memory_region); +EXPORT_SYMBOL_FOR_KVM_INTERNAL(x86_set_internal_memslot); void kvm_arch_pre_destroy_vm(struct kvm *kvm) { diff --git a/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h index cfe96962a4e4..c467d7347145 100644 --- a/arch/x86/kvm/x86.h +++ b/arch/x86/kvm/x86.h @@ -529,8 +529,8 @@ static inline void kvm_inject_gp(struct kvm_vcpu *vcpu, u32 error_code) void kvm_inject_nmi(struct kvm_vcpu *vcpu); int kvm_get_nr_pending_nmis(struct kvm_vcpu *vcpu); -void __user *__x86_set_memory_region(struct kvm *kvm, int id, gpa_t gpa, - u32 size); +void __user *x86_set_internal_memslot(struct kvm *kvm, int id, gpa_t gpa, + u32 size); int memslot_rmap_alloc(struct kvm_memory_slot *slot, unsigned long npages); bool kvm_vcpu_is_reset_bsp(struct kvm_vcpu *vcpu); -- 2.56.0.385.gac671c819a-goog