Commit f2e29db1 authored by Fabiano Rosas's avatar Fabiano Rosas Committed by Michael Ellerman
Browse files

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: default avatarFabiano Rosas <farosas@linux.ibm.com>
Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20210811160134.904987-9-npiggin@gmail.com
parent 7c3ded57

arch/powerpc/kvm/book3s_hv_nested.c

+3 −3
Original line number Diff line number Diff line
@@ -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;