KVM: PPC: Book3S HV Nested: save_hv_return_state does not require trap argument

vcpu is already anargument so vcpu->arch.trap can be used directly.

Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20210811160134.904987-9-npiggin@gmail.com

diff --git a/arch/powerpc/kvm/book3s_hv_nested.c b/arch/powerpc/kvm/book3s_hv_nested.c
index 5ad5014c6f68be7d3985e00b585609680f55c9b2..ed8a2c9f56299c19f464b95621d0780b8341f4a8 100644 (file)
--- a/arch/powerpc/kvm/book3s_hv_nested.c
+++ b/arch/powerpc/kvm/book3s_hv_nested.c
@@ -99,7 +99,7 @@ static void byteswap_hv_regs(struct hv_guest_state *hr)
        hr->dawrx1 = swab64(hr->dawrx1);
 }
 
-static void save_hv_return_state(struct kvm_vcpu *vcpu, int trap,
+static void save_hv_return_state(struct kvm_vcpu *vcpu,
                                 struct hv_guest_state *hr)
 {
        struct kvmppc_vcore *vc = vcpu->arch.vcore;
@@ -118,7 +118,7 @@ static void save_hv_return_state(struct kvm_vcpu *vcpu, int trap,
        hr->pidr = vcpu->arch.pid;
        hr->cfar = vcpu->arch.cfar;
        hr->ppr = vcpu->arch.ppr;
-       switch (trap) {
+       switch (vcpu->arch.trap) {
        case BOOK3S_INTERRUPT_H_DATA_STORAGE:
                hr->hdar = vcpu->arch.fault_dar;
                hr->hdsisr = vcpu->arch.fault_dsisr;
@@ -389,7 +389,7 @@ long kvmhv_enter_nested_guest(struct kvm_vcpu *vcpu)
        delta_spurr = vcpu->arch.spurr - l2_hv.spurr;
        delta_ic = vcpu->arch.ic - l2_hv.ic;
        delta_vtb = vc->vtb - l2_hv.vtb;
-       save_hv_return_state(vcpu, vcpu->arch.trap, &l2_hv);
+       save_hv_return_state(vcpu, &l2_hv);
 
        /* restore L1 state */
        vcpu->arch.nested = NULL;