---

yaml --- r: 80815 b: refs/heads/master c: e531406 h: refs/heads/master i: 80813: a938108 80811: b17a856 80807: d02315a 80799: cdf5cab v: v3
git-mirror · Jan 30, 2008 · 580253c · 580253c
1 parent e1bc4b8
commit 580253c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e934c9c1c8742872a53efb84966d9c1d7b8c8e24
+refs/heads/master: e5314067f6a77688a3d36548e7618430ce4a6236
diff --git a/trunk/drivers/kvm/vmx.c b/trunk/drivers/kvm/vmx.c
@@ -1973,6 +1973,8 @@ static int handle_cr(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
 			vcpu_load_rsp_rip(vcpu);
 			set_cr8(vcpu, vcpu->regs[reg]);
 			skip_emulated_instruction(vcpu);
+			if (irqchip_in_kernel(vcpu->kvm))
+				return 1;
 			kvm_run->exit_reason = KVM_EXIT_SET_TPR;
 			return 0;
 		};