Drop a local "esr" variable in kvm_handle_guest_abort() that's used as a
very temporary scratch variable when injecting nested stage-2 faults, to
avoid creating a shadow of the function's overall "esr", which holds the
original state provided by hardware.
No functional change intended.
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
arch/arm64/kvm/mmu.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c
index 1c78864767c5..dc3aa58e2ea5 100644
--- a/arch/arm64/kvm/mmu.c
+++ b/arch/arm64/kvm/mmu.c
@@ -1904,19 +1904,15 @@ int kvm_handle_guest_abort(struct kvm_vcpu *vcpu)
*/
if (kvm_is_nested_s2_mmu(vcpu->kvm,vcpu->arch.hw_mmu) &&
vcpu->arch.hw_mmu->nested_stage2_enabled) {
- u32 esr;
-
ret = kvm_walk_nested_s2(vcpu, fault_ipa, &nested_trans);
if (ret) {
- esr = kvm_s2_trans_esr(&nested_trans);
- kvm_inject_s2_fault(vcpu, esr);
+ kvm_inject_s2_fault(vcpu, kvm_s2_trans_esr(&nested_trans));
goto out_unlock;
}
ret = kvm_s2_handle_perm_fault(vcpu, &nested_trans);
if (ret) {
- esr = kvm_s2_trans_esr(&nested_trans);
- kvm_inject_s2_fault(vcpu, esr);
+ kvm_inject_s2_fault(vcpu, kvm_s2_trans_esr(&nested_trans));
goto out_unlock;
}
--
2.51.0.261.g7ce5a0a67e-goog