ARM: KVM: abstract fault decoding away

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>

diff --git a/arch/arm/include/asm/kvm_emulate.h b/arch/arm/include/asm/kvm_emulate.h
index 539f83ac167f60a6b7ab73778ac699963050a436..021a59c46ddae731c39b1b0894d24505b558aa44 100644 (file)
--- a/arch/arm/include/asm/kvm_emulate.h
+++ b/arch/arm/include/asm/kvm_emulate.h
@@ -147,4 +147,9 @@ static inline u8 kvm_vcpu_trap_get_class(struct kvm_vcpu *vcpu)
        return kvm_vcpu_get_hsr(vcpu) >> HSR_EC_SHIFT;
 }
 
+static inline u8 kvm_vcpu_trap_get_fault(struct kvm_vcpu *vcpu)
+{
+       return kvm_vcpu_get_hsr(vcpu) & HSR_FSC_TYPE;
+}
+
 #endif /* __ARM_KVM_EMULATE_H__ */

diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c
index 41fa75df107fba964975bf24cc965ae2445c6324..e00f28d2670c49f967f3cbec0de13b36cec0a3c8 100644 (file)
--- a/arch/arm/kvm/mmu.c
+++ b/arch/arm/kvm/mmu.c
@@ -601,7 +601,7 @@ int kvm_handle_guest_abort(struct kvm_vcpu *vcpu, struct kvm_run *run)
                              kvm_vcpu_get_hfar(vcpu), fault_ipa);
 
        /* Check the stage-2 fault is trans. fault or write fault */
-       fault_status = (kvm_vcpu_get_hsr(vcpu) & HSR_FSC_TYPE);
+       fault_status = kvm_vcpu_trap_get_fault(vcpu);
        if (fault_status != FSC_FAULT && fault_status != FSC_PERM) {
                kvm_err("Unsupported fault status: EC=%#lx DFCS=%#lx\n",
                        hsr_ec, fault_status);