From fd044fdc4603f3d228d6bec5495b6e97c7b410cf Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Mon, 13 Aug 2012 01:24:01 +0200
Subject: [PATCH] --- yaml --- r: 343469 b: refs/heads/master c:
 3766a4c693358cff33441310413e3776dbbf8ef0 h: refs/heads/master i:   343467:
 106e3744275e97d628d9417256dc852cd0b923f2 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/powerpc/kvm/book3s_pr.c | 2 --
 trunk/arch/powerpc/kvm/booke.c     | 2 --
 trunk/arch/powerpc/kvm/powerpc.c   | 3 +++
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 04957650f1a5..21d5ef596540 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd2be6836ee493d41fe42367a2b129aa771185c1
+refs/heads/master: 3766a4c693358cff33441310413e3776dbbf8ef0
diff --git a/trunk/arch/powerpc/kvm/book3s_pr.c b/trunk/arch/powerpc/kvm/book3s_pr.c
index e737db8a5ca7..1ff0d6ccc589 100644
--- a/trunk/arch/powerpc/kvm/book3s_pr.c
+++ b/trunk/arch/powerpc/kvm/book3s_pr.c
@@ -867,8 +867,6 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,
 			run->exit_reason = KVM_EXIT_INTR;
 			r = -EINTR;
 		} else {
-			/* Going back to guest */
-			kvm_guest_enter();
 			kvmppc_lazy_ee_enable();
 		}
 	}
diff --git a/trunk/arch/powerpc/kvm/booke.c b/trunk/arch/powerpc/kvm/booke.c
index 2bd190c488ef..5e8dc1909130 100644
--- a/trunk/arch/powerpc/kvm/booke.c
+++ b/trunk/arch/powerpc/kvm/booke.c
@@ -954,8 +954,6 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,
 			r = (-EINTR << 2) | RESUME_HOST | (r & RESUME_FLAG_NV);
 			kvmppc_account_exit(vcpu, SIGNAL_EXITS);
 		} else {
-			/* Going back to guest */
-			kvm_guest_enter();
 			kvmppc_lazy_ee_enable();
 		}
 	}
diff --git a/trunk/arch/powerpc/kvm/powerpc.c b/trunk/arch/powerpc/kvm/powerpc.c
index 266549979e9f..6646574bf930 100644
--- a/trunk/arch/powerpc/kvm/powerpc.c
+++ b/trunk/arch/powerpc/kvm/powerpc.c
@@ -101,12 +101,15 @@ int kvmppc_prepare_to_enter(struct kvm_vcpu *vcpu)
 			/* Got an interrupt in between, try again */
 			local_irq_enable();
 			local_irq_disable();
+			kvm_guest_exit();
 			continue;
 		}
 
 		trace_hardirqs_on();
 #endif
 
+		kvm_guest_enter();
+
 		/* Going into guest context! Yay! */
 		vcpu->mode = IN_GUEST_MODE;
 		smp_wmb();