@@ -95,4 +95,9 @@ static inline bool kvm_vcpu_dabt_isvalid(struct kvm_vcpu *vcpu)
return !!(kvm_vcpu_get_hsr(vcpu) & HSR_ISV);
}
+static inline bool kvm_vcpu_dabt_iswrite(struct kvm_vcpu *vcpu)
+{
+ return !!(kvm_vcpu_get_hsr(vcpu) & HSR_WNR);
+}
+
#endif /* __ARM_KVM_EMULATE_H__ */
@@ -92,7 +92,7 @@ static int decode_hsr(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
return -EFAULT;
}
- is_write = kvm_vcpu_get_hsr(vcpu) & HSR_WNR;
+ is_write = kvm_vcpu_dabt_iswrite(vcpu);
sign_extend = kvm_vcpu_get_hsr(vcpu) & HSR_SSE;
rt = (kvm_vcpu_get_hsr(vcpu) & HSR_SRT_MASK) >> HSR_SRT_SHIFT;
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> --- arch/arm/include/asm/kvm_emulate.h | 5 +++++ arch/arm/kvm/mmio.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)