summaryrefslogtreecommitdiff
path: root/drivers/kvm
diff options
context:
space:
mode:
authorHe, Qing <qing.he@intel.com>2007-08-30 09:04:26 (GMT)
committerAvi Kivity <avi@qumranet.com>2007-10-13 08:18:26 (GMT)
commit5cd4f6fd8506f59cb8a232f364c54f6bd8e5150a (patch)
treeb8ca584d9c8e308778b53457d57adadb462305ce /drivers/kvm
parenta3d7f85f471f889e4477863a7ca42828ae74e77d (diff)
downloadlinux-5cd4f6fd8506f59cb8a232f364c54f6bd8e5150a.tar.xz
KVM: disable tpr/cr8 sync when in-kernel APIC is used
Signed-off-by: Qing He <qing.he@intel.com> Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'drivers/kvm')
-rw-r--r--drivers/kvm/kvm_main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
index 8f8bfc91..02af24e 100644
--- a/drivers/kvm/kvm_main.c
+++ b/drivers/kvm/kvm_main.c
@@ -2005,7 +2005,8 @@ static int kvm_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
sigprocmask(SIG_SETMASK, &vcpu->sigset, &sigsaved);
/* re-sync apic's tpr */
- set_cr8(vcpu, kvm_run->cr8);
+ if (!irqchip_in_kernel(vcpu->kvm))
+ set_cr8(vcpu, kvm_run->cr8);
if (vcpu->pio.cur_count) {
r = complete_pio(vcpu);