KVM: x86: Rename reexecute_instruction()=>kvm_unprotect_and_retry_on_failure()

Rename reexecute_instruction() to kvm_unprotect_and_retry_on_failure() to
make the intent and purpose of the helper much more obvious.

No functional change intended.

Reviewed-by: Yuan Yao <yuan.yao@intel.com>
Link: https://lore.kernel.org/r/20240831001538.336683-20-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 843ddb982b35c90928d4ce0f733e2450ff1847ad..cd9725df368092f09b1de579deadb4c15c668a3a 100644 (file)
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -8861,8 +8861,9 @@ static int handle_emulation_failure(struct kvm_vcpu *vcpu, int emulation_type)
        return 1;
 }
 
-static bool reexecute_instruction(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa,
-                                 int emulation_type)
+static bool kvm_unprotect_and_retry_on_failure(struct kvm_vcpu *vcpu,
+                                              gpa_t cr2_or_gpa,
+                                              int emulation_type)
 {
        if (!(emulation_type & EMULTYPE_ALLOW_RETRY_PF))
                return false;
@@ -9129,8 +9130,8 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa,
                                kvm_queue_exception(vcpu, UD_VECTOR);
                                return 1;
                        }
-                       if (reexecute_instruction(vcpu, cr2_or_gpa,
-                                                 emulation_type))
+                       if (kvm_unprotect_and_retry_on_failure(vcpu, cr2_or_gpa,
+                                                              emulation_type))
                                return 1;
 
                        if (ctxt->have_exception &&
@@ -9216,7 +9217,8 @@ restart:
                return 1;
 
        if (r == EMULATION_FAILED) {
-               if (reexecute_instruction(vcpu, cr2_or_gpa, emulation_type))
+               if (kvm_unprotect_and_retry_on_failure(vcpu, cr2_or_gpa,
+                                                      emulation_type))
                        return 1;
 
                return handle_emulation_failure(vcpu, emulation_type);