aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/kvm
diff options
context:
space:
mode:
authorGleb Natapov <gleb@redhat.com>2009-05-11 13:35:54 +0300
committerAvi Kivity <avi@redhat.com>2009-06-10 11:48:59 +0300
commit8db3baa2db34035b2ddb7d0e8b186eb92a056532 (patch)
tree8b208b113eb934b7123f8579f5535bb69ade1c7e /arch/x86/kvm
parent36752c9b91f75aa3ff0f214a89f13d806cb2f61f (diff)
KVM: Disable CR8 intercept if tpr patching is active
Signed-off-by: Gleb Natapov <gleb@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm')
-rw-r--r--arch/x86/kvm/x86.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index beb806b03a2..249540f9851 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -3142,7 +3142,10 @@ static void update_cr8_intercept(struct kvm_vcpu *vcpu)
if (!kvm_x86_ops->update_cr8_intercept)
return;
- max_irr = kvm_lapic_find_highest_irr(vcpu);
+ if (!vcpu->arch.apic->vapic_addr)
+ max_irr = kvm_lapic_find_highest_irr(vcpu);
+ else
+ max_irr = -1;
if (max_irr != -1)
max_irr >>= 4;
@@ -3249,10 +3252,8 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
kvm_x86_ops->enable_irq_window(vcpu);
if (kvm_lapic_enabled(vcpu)) {
- if (!vcpu->arch.apic->vapic_addr)
- update_cr8_intercept(vcpu);
- else
- kvm_lapic_sync_to_vapic(vcpu);
+ update_cr8_intercept(vcpu);
+ kvm_lapic_sync_to_vapic(vcpu);
}
up_read(&vcpu->kvm->slots_lock);