From 580253c4e3fcd0d60e73ed85c71a754e3dbdb3f7 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@qumranet.com>
Date: Thu, 6 Dec 2007 16:32:45 +0200
Subject: [PATCH] --- yaml --- r: 80815 b: refs/heads/master c:
 e5314067f6a77688a3d36548e7618430ce4a6236 h: refs/heads/master i:   80813:
 a938108e9c442540223d151038239bf19d4408ac   80811:
 b17a85631bb5387726026385eb96af49de02d7ce   80807:
 d02315aba8875fcc93e8c5db0df857e3d2475432   80799:
 cdf5cabdae0607b2875cc440ca85548c361c7c3a v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/kvm/vmx.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3eb6b847297e..2714894a2fc4 100644
--- 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
index 3b44573c326e..83084348581a 100644
--- 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;
 		};