Commit 2876624e authored by Sean Christopherson's avatar Sean Christopherson

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: default avatarYuan Yao <yuan.yao@intel.com>
Link: https://lore.kernel.org/r/20240831001538.336683-20-seanjc@google.comSigned-off-by: default avatarSean Christopherson <seanjc@google.com>
parent 4df68566
...@@ -8861,8 +8861,9 @@ static int handle_emulation_failure(struct kvm_vcpu *vcpu, int emulation_type) ...@@ -8861,8 +8861,9 @@ static int handle_emulation_failure(struct kvm_vcpu *vcpu, int emulation_type)
return 1; return 1;
} }
static bool reexecute_instruction(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, static bool kvm_unprotect_and_retry_on_failure(struct kvm_vcpu *vcpu,
int emulation_type) gpa_t cr2_or_gpa,
int emulation_type)
{ {
if (!(emulation_type & EMULTYPE_ALLOW_RETRY_PF)) if (!(emulation_type & EMULTYPE_ALLOW_RETRY_PF))
return false; return false;
...@@ -9129,8 +9130,8 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, ...@@ -9129,8 +9130,8 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa,
kvm_queue_exception(vcpu, UD_VECTOR); kvm_queue_exception(vcpu, UD_VECTOR);
return 1; return 1;
} }
if (reexecute_instruction(vcpu, cr2_or_gpa, if (kvm_unprotect_and_retry_on_failure(vcpu, cr2_or_gpa,
emulation_type)) emulation_type))
return 1; return 1;
if (ctxt->have_exception && if (ctxt->have_exception &&
...@@ -9216,7 +9217,8 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, ...@@ -9216,7 +9217,8 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa,
return 1; return 1;
if (r == EMULATION_FAILED) { 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 1;
return handle_emulation_failure(vcpu, emulation_type); return handle_emulation_failure(vcpu, emulation_type);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment