---

yaml --- r: 356843 b: refs/heads/master c: b8c649a h: refs/heads/master i: 356841: 0a99307 356839: 1458605 v: v3
git-mirror · Jan 10, 2013 · 12f23af · 12f23af
1 parent 40eb45e
commit 12f23af
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2be655004ddc36f2c5fc5e541d481dcd782ab83
+refs/heads/master: b8c649a99d582a6d8afd8457ba6145c624b8a76f
diff --git a/trunk/arch/powerpc/kvm/booke.c b/trunk/arch/powerpc/kvm/booke.c
@@ -581,6 +581,11 @@ int kvmppc_core_prepare_to_enter(struct kvm_vcpu *vcpu)
 
 	kvmppc_core_check_exceptions(vcpu);
 
+	if (vcpu->requests) {
+		/* Exception delivery raised request; start over */
+		return 1;
+	}
+
 	if (vcpu->arch.shared->msr & MSR_WE) {
 		local_irq_enable();
 		kvm_vcpu_block(vcpu);