Commit 3e51d435 authored by Marc Zyngier's avatar Marc Zyngier Committed by Christoffer Dall
Browse files

arm64: KVM: Move kvm_vcpu_get_condition out of emulate.c 



In order to make emulate.c more generic, move the arch-specific
manupulation bits out of emulate.c.

Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
parent cb96408d

arch/arm64/include/asm/kvm_emulate.h

+10 −0
Original line number Diff line number Diff line
@@ -147,6 +147,16 @@ static inline u32 kvm_vcpu_get_hsr(const struct kvm_vcpu *vcpu) 
	return vcpu->arch.fault.esr_el2;

}



static inline int kvm_vcpu_get_condition(const struct kvm_vcpu *vcpu)

{

	u32 esr = kvm_vcpu_get_hsr(vcpu);



	if (esr & ESR_ELx_CV)

		return (esr & ESR_ELx_COND_MASK) >> ESR_ELx_COND_SHIFT;



	return -1;

}



static inline unsigned long kvm_vcpu_get_hfar(const struct kvm_vcpu *vcpu)

{

	return vcpu->arch.fault.far_el2;

arch/arm64/kvm/emulate.c

+0 −11
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
 */



#include <linux/kvm_host.h>

#include <asm/esr.h>

#include <asm/kvm_emulate.h>



/*
@@ -52,16 +51,6 @@ static const unsigned short cc_map[16] = { 
	0			/* NV                     */

};



static int kvm_vcpu_get_condition(const struct kvm_vcpu *vcpu)

{

	u32 esr = kvm_vcpu_get_hsr(vcpu);



	if (esr & ESR_ELx_CV)

		return (esr & ESR_ELx_COND_MASK) >> ESR_ELx_COND_SHIFT;



	return -1;

}



/*

 * Check if a trapped instruction should have been executed or not.

 */