ARM: KVM: abstract HSR_SSE away

[karo-tx-linux.git] / arch / arm / kvm / mmio.c

diff --git a/arch/arm/kvm/mmio.c b/arch/arm/kvm/mmio.c
index ce63f39071add5955f656f61618b235d88d7a9a8..058029c2d5040d8f5eeb01066ae426fbdc43ba93 100644 (file)
--- a/arch/arm/kvm/mmio.c
+++ b/arch/arm/kvm/mmio.c
@@ -92,8 +92,8 @@ static int decode_hsr(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
                return -EFAULT;
        }
 
-       is_write = kvm_vcpu_get_hsr(vcpu) & HSR_WNR;
-       sign_extend = kvm_vcpu_get_hsr(vcpu) & HSR_SSE;
+       is_write = kvm_vcpu_dabt_iswrite(vcpu);
+       sign_extend = kvm_vcpu_dabt_issext(vcpu);
        rt = (kvm_vcpu_get_hsr(vcpu) & HSR_SRT_MASK) >> HSR_SRT_SHIFT;
 
        if (kvm_vcpu_reg_is_pc(vcpu, rt)) {
@@ -130,7 +130,7 @@ int io_mem_abort(struct kvm_vcpu *vcpu, struct kvm_run *run,
         * space do its magic.
         */
 
-       if (kvm_vcpu_get_hsr(vcpu) & HSR_ISV) {
+       if (kvm_vcpu_dabt_isvalid(vcpu)) {
                ret = decode_hsr(vcpu, fault_ipa, &mmio);
                if (ret)
                        return ret;