From 1e6c90e511ff58e10e4f023d1db61c195f0f346c Mon Sep 17 00:00:00 2001
From: Marc Zyngier <marc.zyngier@arm.com>
Date: Tue, 18 Sep 2012 12:07:06 +0100
Subject: [PATCH] --- yaml --- r: 372081 b: refs/heads/master c:
 23b415d61a80c0c63f43dd2b3a08a1fa0b79b8ea h: refs/heads/master i:   372079:
 f7e2b605a2a1e532f5e9aef202160fff6f89ed65 v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/arm/include/asm/kvm_emulate.h | 6 ++++++
 trunk/arch/arm/kvm/arm.c                 | 3 +--
 trunk/arch/arm/kvm/coproc.c              | 2 +-
 trunk/arch/arm/kvm/mmio.c                | 2 +-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 0699c86cf0d5..66b0135c4683 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a7123377e7107a5f4f7ae198aa5b5000c9362871
+refs/heads/master: 23b415d61a80c0c63f43dd2b3a08a1fa0b79b8ea
diff --git a/trunk/arch/arm/include/asm/kvm_emulate.h b/trunk/arch/arm/include/asm/kvm_emulate.h
index e4a4fc2f9156..a9b853f35aed 100644
--- a/trunk/arch/arm/include/asm/kvm_emulate.h
+++ b/trunk/arch/arm/include/asm/kvm_emulate.h
@@ -136,4 +136,10 @@ static inline int kvm_vcpu_dabt_get_as(struct kvm_vcpu *vcpu)
 	}
 }
 
+/* This one is not specific to Data Abort */
+static inline bool kvm_vcpu_trap_il_is32bit(struct kvm_vcpu *vcpu)
+{
+	return kvm_vcpu_get_hsr(vcpu) & HSR_IL;
+}
+
 #endif /* __ARM_KVM_EMULATE_H__ */
diff --git a/trunk/arch/arm/kvm/arm.c b/trunk/arch/arm/kvm/arm.c
index 6626c7e62371..31616336255c 100644
--- a/trunk/arch/arm/kvm/arm.c
+++ b/trunk/arch/arm/kvm/arm.c
@@ -624,8 +624,7 @@ static int handle_exit(struct kvm_vcpu *vcpu, struct kvm_run *run,
 		 * that fail their condition code check"
 		 */
 		if (!kvm_condition_valid(vcpu)) {
-			bool is_wide = kvm_vcpu_get_hsr(vcpu) & HSR_IL;
-			kvm_skip_instr(vcpu, is_wide);
+			kvm_skip_instr(vcpu, kvm_vcpu_trap_il_is32bit(vcpu));
 			return 1;
 		}
 
diff --git a/trunk/arch/arm/kvm/coproc.c b/trunk/arch/arm/kvm/coproc.c
index b30591615da4..94eee8befc83 100644
--- a/trunk/arch/arm/kvm/coproc.c
+++ b/trunk/arch/arm/kvm/coproc.c
@@ -293,7 +293,7 @@ static int emulate_cp15(struct kvm_vcpu *vcpu,
 
 		if (likely(r->access(vcpu, params, r))) {
 			/* Skip instruction, since it was emulated */
-			kvm_skip_instr(vcpu, (kvm_vcpu_get_hsr(vcpu) >> 25) & 1);
+			kvm_skip_instr(vcpu, kvm_vcpu_trap_il_is32bit(vcpu));
 			return 1;
 		}
 		/* If access function fails, it should complain. */
diff --git a/trunk/arch/arm/kvm/mmio.c b/trunk/arch/arm/kvm/mmio.c
index 0b8f49985b70..02ca76555bd4 100644
--- a/trunk/arch/arm/kvm/mmio.c
+++ b/trunk/arch/arm/kvm/mmio.c
@@ -101,7 +101,7 @@ static int decode_hsr(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
 	 * The MMIO instruction is emulated and should not be re-executed
 	 * in the guest.
 	 */
-	kvm_skip_instr(vcpu, (kvm_vcpu_get_hsr(vcpu) >> 25) & 1);
+	kvm_skip_instr(vcpu, kvm_vcpu_trap_il_is32bit(vcpu));
 	return 0;
 }