KVM: nVMX: Rename handle_vm{on,off}() to handle_vmx{on,off}()

Rename the exit handlers for VMXON and VMXOFF to match the instruction
names, the terms "vmon" and "vmoff" are not used anywhere in Intel's
documentation, nor are they used elsehwere in KVM.

Sadly, the exit reasons are exposed to userspace and so cannot be renamed
without breaking userspace. :-(

Fixes: 1eb91cc48533 ("KVM: nVMX: Implement VMXON and VMXOFF")
Signed-off-by: Sean Christopherson <seanjc@google.com>
Message-Id: <20220607213604.3346000-5-seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c
index 9c3350545b09d22da90a61f9ad042cf6ddb01c9b..1e760994d2073cd1126cdfc67b25e3762ed41b13 100644 (file)
--- a/arch/x86/kvm/vmx/nested.c
+++ b/arch/x86/kvm/vmx/nested.c
@@ -4942,7 +4942,7 @@ out_vmcs02:
 }
 
 /* Emulate the VMXON instruction. */
-static int handle_vmon(struct kvm_vcpu *vcpu)
+static int handle_vmxon(struct kvm_vcpu *vcpu)
 {
        int ret;
        gpa_t vmptr;
@@ -5039,7 +5039,7 @@ static inline void nested_release_vmcs12(struct kvm_vcpu *vcpu)
 }
 
 /* Emulate the VMXOFF instruction */
-static int handle_vmoff(struct kvm_vcpu *vcpu)
+static int handle_vmxoff(struct kvm_vcpu *vcpu)
 {
        if (!nested_vmx_check_permission(vcpu))
                return 1;
@@ -6816,8 +6816,8 @@ __init int nested_vmx_hardware_setup(int (*exit_handlers[])(struct kvm_vcpu *))
        exit_handlers[EXIT_REASON_VMREAD]       = handle_vmread;
        exit_handlers[EXIT_REASON_VMRESUME]     = handle_vmresume;
        exit_handlers[EXIT_REASON_VMWRITE]      = handle_vmwrite;
-       exit_handlers[EXIT_REASON_VMOFF]        = handle_vmoff;
-       exit_handlers[EXIT_REASON_VMON]         = handle_vmon;
+       exit_handlers[EXIT_REASON_VMOFF]        = handle_vmxoff;
+       exit_handlers[EXIT_REASON_VMON]         = handle_vmxon;
        exit_handlers[EXIT_REASON_INVEPT]       = handle_invept;
        exit_handlers[EXIT_REASON_INVVPID]      = handle_invvpid;
        exit_handlers[EXIT_REASON_VMFUNC]       = handle_vmfunc;