Commit 5b78077a authored by Marc Zyngier's avatar Marc Zyngier
Browse files

KVM: arm64: debug: Drop useless vpcu parameter 



As part of the ongoing spring cleanup, remove the now useless
vcpu parameter that is passed around (host and guest contexts
give us everything we need).

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parent 2c3db77c

arch/arm64/kvm/hyp/include/hyp/debug-sr.h

+8 −10
Original line number Diff line number Diff line
@@ -88,8 +88,7 @@ 
	default:	write_debug(ptr[0], reg, 0);			\

	}



static inline void __debug_save_state(struct kvm_vcpu *vcpu,

				      struct kvm_guest_debug_arch *dbg,

static void __debug_save_state(struct kvm_guest_debug_arch *dbg,

			       struct kvm_cpu_context *ctxt)

{

	u64 aa64dfr0;
@@ -107,8 +106,7 @@ static inline void __debug_save_state(struct kvm_vcpu *vcpu, 
	ctxt_sys_reg(ctxt, MDCCINT_EL1) = read_sysreg(mdccint_el1);

}



static inline void __debug_restore_state(struct kvm_vcpu *vcpu,

					 struct kvm_guest_debug_arch *dbg,

static void __debug_restore_state(struct kvm_guest_debug_arch *dbg,

				  struct kvm_cpu_context *ctxt)

{

	u64 aa64dfr0;
@@ -142,8 +140,8 @@ static inline void __debug_switch_to_guest_common(struct kvm_vcpu *vcpu) 
	host_dbg = &vcpu->arch.host_debug_state.regs;

	guest_dbg = kern_hyp_va(vcpu->arch.debug_ptr);



	__debug_save_state(vcpu, host_dbg, host_ctxt);

	__debug_restore_state(vcpu, guest_dbg, guest_ctxt);

	__debug_save_state(host_dbg, host_ctxt);

	__debug_restore_state(guest_dbg, guest_ctxt);

}



static inline void __debug_switch_to_host_common(struct kvm_vcpu *vcpu)
@@ -161,8 +159,8 @@ static inline void __debug_switch_to_host_common(struct kvm_vcpu *vcpu) 
	host_dbg = &vcpu->arch.host_debug_state.regs;

	guest_dbg = kern_hyp_va(vcpu->arch.debug_ptr);



	__debug_save_state(vcpu, guest_dbg, guest_ctxt);

	__debug_restore_state(vcpu, host_dbg, host_ctxt);

	__debug_save_state(guest_dbg, guest_ctxt);

	__debug_restore_state(host_dbg, host_ctxt);



	vcpu->arch.flags &= ~KVM_ARM64_DEBUG_DIRTY;

}