Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c088f8f0 authored by Christoffer Dall's avatar Christoffer Dall
Browse files

KVM: ARM: Reintroduce trace_kvm_hvc 



This one got lost in the move to handle_exit, so let's reintroduce it
using an accessor to the immediate value field like the other ones.

Signed-off-by: default avatarChristoffer Dall <cdall@cs.columbia.edu>
parent 3414bbff

arch/arm/include/asm/kvm_emulate.h

+5 −0
Original line number Diff line number Diff line
@@ -158,4 +158,9 @@ static inline u8 kvm_vcpu_trap_get_fault(struct kvm_vcpu *vcpu) 
	return kvm_vcpu_get_hsr(vcpu) & HSR_FSC_TYPE;

}



static inline u32 kvm_vcpu_hvc_get_imm(struct kvm_vcpu *vcpu)

{

	return kvm_vcpu_get_hsr(vcpu) & HSR_HVC_IMM_MASK;

}



#endif /* __ARM_KVM_EMULATE_H__ */

arch/arm/kvm/handle_exit.c

+5 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 
#include <asm/kvm_mmu.h>

#include <asm/kvm_psci.h>



#include "trace.h"



typedef int (*exit_handle_fn)(struct kvm_vcpu *, struct kvm_run *);



static int handle_svc_hyp(struct kvm_vcpu *vcpu, struct kvm_run *run)
@@ -35,6 +37,9 @@ static int handle_svc_hyp(struct kvm_vcpu *vcpu, struct kvm_run *run) 


static int handle_hvc(struct kvm_vcpu *vcpu, struct kvm_run *run)

{

	trace_kvm_hvc(*vcpu_pc(vcpu), *vcpu_reg(vcpu, 0),

		      kvm_vcpu_hvc_get_imm(vcpu));



	if (kvm_psci_call(vcpu))

		return 1;