Browse Source

ARM: KVM: abstract HSR_SSE away

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <cdall@cs.columbia.edu>
Marc Zyngier 12 years ago
parent
commit
7c511b881f
2 changed files with 6 additions and 1 deletions
  1. 5 0
      arch/arm/include/asm/kvm_emulate.h
  2. 1 1
      arch/arm/kvm/mmio.c

+ 5 - 0
arch/arm/include/asm/kvm_emulate.h

@@ -100,4 +100,9 @@ static inline bool kvm_vcpu_dabt_iswrite(struct kvm_vcpu *vcpu)
 	return kvm_vcpu_get_hsr(vcpu) & HSR_WNR;
 }
 
+static inline bool kvm_vcpu_dabt_issext(struct kvm_vcpu *vcpu)
+{
+	return kvm_vcpu_get_hsr(vcpu) & HSR_SSE;
+}
+
 #endif /* __ARM_KVM_EMULATE_H__ */

+ 1 - 1
arch/arm/kvm/mmio.c

@@ -93,7 +93,7 @@ static int decode_hsr(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
 	}
 
 	is_write = kvm_vcpu_dabt_iswrite(vcpu);
-	sign_extend = kvm_vcpu_get_hsr(vcpu) & HSR_SSE;
+	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)) {